Merge branch 'release/v1.2.0'

[github/Chocobozzz/PeerTube.git] / server / lib / oauth-model.ts

diff --git a/server/lib/oauth-model.ts b/server/lib/oauth-model.ts
index 5cbe60b82c626ca8148ee5545d2da7a05c90fcf3..2cd2ae97cf6c9978837f4ac054d4d968a64e205b 100644 (file)
--- a/server/lib/oauth-model.ts
+++ b/server/lib/oauth-model.ts
@@ -1,3 +1,4 @@
+import * as Bluebird from 'bluebird'
 import { AccessDeniedError } from 'oauth2-server'
 import { logger } from '../helpers/logger'
 import { UserModel } from '../models/account/user'
@@ -37,7 +38,7 @@ function clearCacheByToken (token: string) {
 function getAccessToken (bearerToken: string) {
   logger.debug('Getting access token (bearerToken: ' + bearerToken + ').')
 
-  if (accessTokenCache[bearerToken] !== undefined) return accessTokenCache[bearerToken]
+  if (accessTokenCache[bearerToken] !== undefined) return Bluebird.resolve(accessTokenCache[bearerToken])
 
   return OAuthTokenModel.getByTokenAndPopulateUser(bearerToken)
     .then(tokenModel => {