Client: explain to user we don't want scheme when making friends

[github/Chocobozzz/PeerTube.git] / server / models / oauth / oauth-token.ts

diff --git a/server/models/oauth/oauth-token.ts b/server/models/oauth/oauth-token.ts
index a0a13aab73ca455c22e1f2415c3a881854d0ba56..e3de9468e1536738da90ecd827e638868350a7b4 100644 (file)
--- a/server/models/oauth/oauth-token.ts
+++ b/server/models/oauth/oauth-token.ts
@@ -98,24 +98,27 @@ getByRefreshTokenAndPopulateClient = function (refreshToken: string) {
     include: [ OAuthToken['sequelize'].models.OAuthClient ]
   }
 
-  return OAuthToken.findOne(query).then(function (token) {
-    if (!token) return null
-
-    const tokenInfos: OAuthTokenInfo = {
-      refreshToken: token.refreshToken,
-      refreshTokenExpiresAt: token.refreshTokenExpiresAt,
-      client: {
-        id: token['client'].id
-      },
-      user: {
-        id: token['user']
+  return OAuthToken.findOne(query)
+    .then(token => {
+      if (!token) return null
+
+      const tokenInfos: OAuthTokenInfo = {
+        refreshToken: token.refreshToken,
+        refreshTokenExpiresAt: token.refreshTokenExpiresAt,
+        client: {
+          id: token.oAuthClientId
+        },
+        user: {
+          id: token.userId
+        }
       }
-    }
 
-    return tokenInfos
-  }).catch(function (err) {
-    logger.info('getRefreshToken error.', err)
-  })
+      return tokenInfos
+    })
+    .catch(err => {
+      logger.info('getRefreshToken error.', err)
+      throw err
+    })
 }
 
 getByTokenAndPopulateUser = function (bearerToken: string) {
@@ -126,7 +129,7 @@ getByTokenAndPopulateUser = function (bearerToken: string) {
     include: [ OAuthToken['sequelize'].models.User ]
   }
 
-  return OAuthToken.findOne(query).then(function (token) {
+  return OAuthToken.findOne(query).then(token => {
     if (token) token['user'] = token.User
 
     return token
@@ -141,7 +144,7 @@ getByRefreshTokenAndPopulateUser = function (refreshToken: string) {
     include: [ OAuthToken['sequelize'].models.User ]
   }
 
-  return OAuthToken.findOne(query).then(function (token) {
+  return OAuthToken.findOne(query).then(token => {
     token['user'] = token.User
 
     return token