X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Foauth-model.ts;h=dce71e83bb4e4677b2ec042b6284911b93f0af72;hb=d7a7c248b36af5f9cf7375ba62720e4a1530eca6;hp=2d7e56756a2f9d1d9077d273fe3933a35a8aefdb;hpb=e6d4b0ff2404dcf0b3a755c3fcc415ffeb6e754d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/oauth-model.ts b/server/lib/oauth-model.ts
index 2d7e56756..dce71e83b 100644
--- a/server/lib/oauth-model.ts
+++ b/server/lib/oauth-model.ts
@@ -1,6 +1,7 @@
-import { OAuthClientInstance, UserInstance } from '../models'
-import { database as db } from '../initializers/database'
 import { logger } from '../helpers'
+import { UserModel } from '../models/account/user'
+import { OAuthClientModel } from '../models/oauth/oauth-client'
+import { OAuthTokenModel } from '../models/oauth/oauth-token'
 
 type TokenInfo = { accessToken: string, refreshToken: string, accessTokenExpiresAt: Date, refreshTokenExpiresAt: Date }
 
@@ -9,54 +10,51 @@ type TokenInfo = { accessToken: string, refreshToken: string, accessTokenExpires
 function getAccessToken (bearerToken: string) {
   logger.debug('Getting access token (bearerToken: ' + bearerToken + ').')
 
-  return db.OAuthToken.getByTokenAndPopulateUser(bearerToken)
+  return OAuthTokenModel.getByTokenAndPopulateUser(bearerToken)
 }
 
 function getClient (clientId: string, clientSecret: string) {
   logger.debug('Getting Client (clientId: ' + clientId + ', clientSecret: ' + clientSecret + ').')
 
-  return db.OAuthClient.getByIdAndSecret(clientId, clientSecret)
+  return OAuthClientModel.getByIdAndSecret(clientId, clientSecret)
 }
 
 function getRefreshToken (refreshToken: string) {
   logger.debug('Getting RefreshToken (refreshToken: ' + refreshToken + ').')
 
-  return db.OAuthToken.getByRefreshTokenAndPopulateClient(refreshToken)
+  return OAuthTokenModel.getByRefreshTokenAndPopulateClient(refreshToken)
 }
 
-function getUser (username: string, password: string) {
-  logger.debug('Getting User (username: ' + username + ', password: ' + password + ').')
+async function getUser (username: string, password: string) {
+  logger.debug('Getting User (username: ' + username + ', password: ******).')
 
-  return db.User.getByUsername(username).then(function (user) {
-    if (!user) return null
+  const user = await UserModel.getByUsername(username)
+  if (!user) return null
 
-    return user.isPasswordMatch(password).then(passwordMatch => {
-      if (passwordMatch === false) return null
+  const passwordMatch = await user.isPasswordMatch(password)
+  if (passwordMatch === false) return null
 
-      return user
-    })
-  })
+  return user
 }
 
-function revokeToken (token: TokenInfo) {
-  return db.OAuthToken.getByRefreshTokenAndPopulateUser(token.refreshToken).then(function (tokenDB) {
-    if (tokenDB) tokenDB.destroy()
-
-    /*
-      * Thanks to https://github.com/manjeshpv/node-oauth2-server-implementation/blob/master/components/oauth/mongo-models.js
-      * "As per the discussion we need set older date
-      * revokeToken will expected return a boolean in future version
-      * https://github.com/oauthjs/node-oauth2-server/pull/274
-      * https://github.com/oauthjs/node-oauth2-server/issues/290"
-    */
-    const expiredToken = tokenDB
-    expiredToken.refreshTokenExpiresAt = new Date('2015-05-28T06:59:53.000Z')
-
-    return expiredToken
-  })
+async function revokeToken (tokenInfo: TokenInfo) {
+  const token = await OAuthTokenModel.getByRefreshTokenAndPopulateUser(tokenInfo.refreshToken)
+  if (token) token.destroy()
+
+  /*
+    * Thanks to https://github.com/manjeshpv/node-oauth2-server-implementation/blob/master/components/oauth/mongo-models.js
+    * "As per the discussion we need set older date
+    * revokeToken will expected return a boolean in future version
+    * https://github.com/oauthjs/node-oauth2-server/pull/274
+    * https://github.com/oauthjs/node-oauth2-server/issues/290"
+  */
+  const expiredToken = token
+  expiredToken.refreshTokenExpiresAt = new Date('2015-05-28T06:59:53.000Z')
+
+  return expiredToken
 }
 
-function saveToken (token: TokenInfo, client: OAuthClientInstance, user: UserInstance) {
+async function saveToken (token: TokenInfo, client: OAuthClientModel, user: UserModel) {
   logger.debug('Saving token ' + token.accessToken + ' for client ' + client.id + ' and user ' + user.id + '.')
 
   const tokenToCreate = {
@@ -68,11 +66,10 @@ function saveToken (token: TokenInfo, client: OAuthClientInstance, user: UserIns
     userId: user.id
   }
 
-  return db.OAuthToken.create(tokenToCreate).then(tokenCreated => {
-    const tokenToReturn = Object.assign(tokenCreated, { client, user })
+  const tokenCreated = await OAuthTokenModel.create(tokenToCreate)
+  const tokenToReturn = Object.assign(tokenCreated, { client, user })
 
-    return tokenToReturn
-  })
+  return tokenToReturn
 }
 
 // ---------------------------------------------------------------------------