1 files changed, 3 insertions, 4 deletions

diff --git a/server/lib/oauth-model.ts b/server/lib/oauth-model.ts
index f34c9c667..2d7e56756 100644
--- a/server/lib/oauth-model.ts
+++ b/server/lib/oauth-model.ts
@@ -68,11 +68,10 @@ function saveToken (token: TokenInfo, client: OAuthClientInstance, user: UserIns
     userId: user.id
   }
 
-  return db.OAuthToken.create(tokenToCreate).then(function (tokenCreated: any) {
-    tokenCreated.client = client
-    tokenCreated.user = user
+  return db.OAuthToken.create(tokenToCreate).then(tokenCreated => {
+    const tokenToReturn = Object.assign(tokenCreated, { client, user })
 
-    return tokenCreated
+    return tokenToReturn
   })
 }