Fix lint

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

diff --git a/server/lib/oauth-model.ts b/server/lib/oauth-model.ts
index 7cf42e94c284ed9b7a169403bdf5efcea91e291a..769ea126a1b15a40cc2971317ee31c9b18a41a35 100644 (file)
--- a/server/lib/oauth-model.ts
+++ b/server/lib/oauth-model.ts
@@ -27,26 +27,19 @@ function getRefreshToken (refreshToken: string) {
 function getUser (username: string, password: string) {
   logger.debug('Getting User (username: ' + username + ', password: ' + password + ').')
 
-  return db.User.getByUsername(username).then(function (user) {
+  return db.User.getByUsername(username).then(user => {
     if (!user) return null
 
-    // We need to return a promise
-    return new Promise(function (resolve, reject) {
-      return user.isPasswordMatch(password, function (err, isPasswordMatch) {
-        if (err) return reject(err)
+    return user.isPasswordMatch(password).then(passwordMatch => {
+      if (passwordMatch === false) return null
 
-        if (isPasswordMatch === true) {
-          return resolve(user)
-        }
-
-        return resolve(null)
-      })
+      return user
     })
   })
 }
 
 function revokeToken (token: TokenInfo) {
-  return db.OAuthToken.getByRefreshTokenAndPopulateUser(token.refreshToken).then(function (tokenDB) {
+  return db.OAuthToken.getByRefreshTokenAndPopulateUser(token.refreshToken).then(tokenDB => {
     if (tokenDB) tokenDB.destroy()
 
     /*
@@ -75,13 +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
-  }).catch(function (err) {
-    throw err
+    return tokenToReturn
   })
 }