i updated version numbers until it built properly.

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

diff --git a/server/lib/oauth-model.js b/server/lib/oauth-model.js
index 6dab02fca80e1d882d6710d899bffe9c42f06d65..d011c4b7232fa63aea1ba498a2f0ff78e05ab742 100644 (file)
--- a/server/lib/oauth-model.js
+++ b/server/lib/oauth-model.js
@@ -8,12 +8,12 @@ const User = mongoose.model('User')
 
 // See https://github.com/oauthjs/node-oauth2-server/wiki/Model-specification for the model specifications
 const OAuthModel = {
-  getAccessToken: getAccessToken,
-  getClient: getClient,
-  getRefreshToken: getRefreshToken,
-  getUser: getUser,
-  revokeToken: revokeToken,
-  saveToken: saveToken
+  getAccessToken,
+  getClient,
+  getRefreshToken,
+  getUser,
+  revokeToken,
+  saveToken
 }
 
 // ---------------------------------------------------------------------------
@@ -32,7 +32,7 @@ function getClient (clientId, clientSecret) {
   return OAuthClient.getByIdAndSecret(mongoId, clientSecret)
 }
 
-function getRefreshToken (refreshToken, callback) {
+function getRefreshToken (refreshToken) {
   logger.debug('Getting RefreshToken (refreshToken: ' + refreshToken + ').')
 
   return OAuthToken.getByRefreshTokenAndPopulateClient(refreshToken)
@@ -60,7 +60,7 @@ function getUser (username, password) {
 }
 
 function revokeToken (token) {
-  return OAuthToken.getByRefreshToken(token.refreshToken).then(function (tokenDB) {
+  return OAuthToken.getByRefreshTokenAndPopulateUser(token.refreshToken).then(function (tokenDB) {
     if (tokenDB) tokenDB.remove()
 
     /*
@@ -72,6 +72,7 @@ function revokeToken (token) {
     */
     const expiredToken = tokenDB
     expiredToken.refreshTokenExpiresAt = new Date('2015-05-28T06:59:53.000Z')
+
     return expiredToken
   })
 }