Fix tests

[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 995fa33d5926b93e024e287b408b0af6bca569c3..4c53848dc4aa77220659d436d0b55ad12910b8e4 100644 (file)
--- a/server/models/oauth/oauth-token.ts
+++ b/server/models/oauth/oauth-token.ts
@@ -1,8 +1,9 @@
 import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
-import { logger } from '../../helpers'
+import { logger } from '../../helpers/logger'
 import { AccountModel } from '../account/account'
 import { UserModel } from '../account/user'
 import { OAuthClientModel } from './oauth-client'
+import { Transaction } from 'sequelize'
 
 export type OAuthTokenInfo = {
   refreshToken: string
@@ -125,7 +126,7 @@ export class OAuthTokenModel extends Model<OAuthTokenModel> {
         } as OAuthTokenInfo
       })
       .catch(err => {
-        logger.info('getRefreshToken error.', err)
+        logger.error('getRefreshToken error.', { err })
         throw err
       })
   }
@@ -154,9 +155,23 @@ export class OAuthTokenModel extends Model<OAuthTokenModel> {
     return OAuthTokenModel.scope(ScopeNames.WITH_ACCOUNT)
       .findOne(query)
       .then(token => {
-        token['user'] = token.User
-
-        return token
+        if (token) {
+          token['user'] = token.User
+          return token
+        } else {
+          return new OAuthTokenModel()
+        }
       })
   }
+
+  static deleteUserToken (userId: number, t?: Transaction) {
+    const query = {
+      where: {
+        userId
+      },
+      transaction: t
+    }
+
+    return OAuthTokenModel.destroy(query)
+  }
 }