X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Foauth%2Foauth-token.ts;h=759aa27797aa16efb555a1d7b7fa85c1299dbf55;hb=1b952dd4266b0da4887701e0ce0860faded96768;hp=dc8bcd872aa15b416cfd26c875d086acb93eb884;hpb=72c7248b6fdcdb2175e726ff51b42e7555f2bd84;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/models/oauth/oauth-token.ts b/server/models/oauth/oauth-token.ts
index dc8bcd872..759aa2779 100644
--- a/server/models/oauth/oauth-token.ts
+++ b/server/models/oauth/oauth-token.ts
@@ -1,182 +1,172 @@
-import * as Sequelize from 'sequelize'
-
-import { logger } from '../../helpers'
-
-import { addMethodsToModel } from '../utils'
-import {
-  OAuthTokenInstance,
-  OAuthTokenAttributes,
-
-  OAuthTokenMethods,
-  OAuthTokenInfo
-} from './oauth-token-interface'
+import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
+import { logger } from '../../helpers/logger'
+import { AccountModel } from '../account/account'
+import { UserModel } from '../account/user'
+import { OAuthClientModel } from './oauth-client'
+
+export type OAuthTokenInfo = {
+  refreshToken: string
+  refreshTokenExpiresAt: Date,
+  client: {
+    id: number
+  },
+  user: {
+    id: number
+  }
+}
 
-let OAuthToken: Sequelize.Model<OAuthTokenInstance, OAuthTokenAttributes>
-let getByRefreshTokenAndPopulateClient: OAuthTokenMethods.GetByRefreshTokenAndPopulateClient
-let getByTokenAndPopulateUser: OAuthTokenMethods.GetByTokenAndPopulateUser
-let getByRefreshTokenAndPopulateUser: OAuthTokenMethods.GetByRefreshTokenAndPopulateUser
-let removeByUserId: OAuthTokenMethods.RemoveByUserId
+enum ScopeNames {
+  WITH_ACCOUNT = 'WITH_ACCOUNT'
+}
 
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  OAuthToken = sequelize.define<OAuthTokenInstance, OAuthTokenAttributes>('OAuthToken',
-    {
-      accessToken: {
-        type: DataTypes.STRING,
-        allowNull: false
-      },
-      accessTokenExpiresAt: {
-        type: DataTypes.DATE,
-        allowNull: false
-      },
-      refreshToken: {
-        type: DataTypes.STRING,
-        allowNull: false
-      },
-      refreshTokenExpiresAt: {
-        type: DataTypes.DATE,
-        allowNull: false
+@Scopes({
+  [ScopeNames.WITH_ACCOUNT]: {
+    include: [
+      {
+        model: () => UserModel,
+        include: [
+          {
+            model: () => AccountModel,
+            required: true
+          }
+        ]
       }
+    ]
+  }
+})
+@Table({
+  tableName: 'oAuthToken',
+  indexes: [
+    {
+      fields: [ 'refreshToken' ],
+      unique: true
+    },
+    {
+      fields: [ 'accessToken' ],
+      unique: true
+    },
+    {
+      fields: [ 'userId' ]
     },
     {
-      indexes: [
-        {
-          fields: [ 'refreshToken' ],
-          unique: true
-        },
-        {
-          fields: [ 'accessToken' ],
-          unique: true
-        },
-        {
-          fields: [ 'userId' ]
-        },
-        {
-          fields: [ 'oAuthClientId' ]
-        }
-      ]
+      fields: [ 'oAuthClientId' ]
     }
-  )
+  ]
+})
+export class OAuthTokenModel extends Model<OAuthTokenModel> {
 
-  const classMethods = [
-    associate,
+  @AllowNull(false)
+  @Column
+  accessToken: string
 
-    getByRefreshTokenAndPopulateClient,
-    getByTokenAndPopulateUser,
-    getByRefreshTokenAndPopulateUser,
-    removeByUserId
-  ]
-  addMethodsToModel(OAuthToken, classMethods)
+  @AllowNull(false)
+  @Column
+  accessTokenExpiresAt: Date
 
-  return OAuthToken
-}
+  @AllowNull(false)
+  @Column
+  refreshToken: string
+
+  @AllowNull(false)
+  @Column
+  refreshTokenExpiresAt: Date
 
-// ---------------------------------------------------------------------------
+  @CreatedAt
+  createdAt: Date
 
-function associate (models) {
-  OAuthToken.belongsTo(models.User, {
+  @UpdatedAt
+  updatedAt: Date
+
+  @ForeignKey(() => UserModel)
+  @Column
+  userId: number
+
+  @BelongsTo(() => UserModel, {
     foreignKey: {
-      name: 'userId',
       allowNull: false
     },
     onDelete: 'cascade'
   })
+  User: UserModel
+
+  @ForeignKey(() => OAuthClientModel)
+  @Column
+  oAuthClientId: number
 
-  OAuthToken.belongsTo(models.OAuthClient, {
+  @BelongsTo(() => OAuthClientModel, {
     foreignKey: {
-      name: 'oAuthClientId',
       allowNull: false
     },
     onDelete: 'cascade'
   })
-}
+  OAuthClients: OAuthClientModel[]
 
-getByRefreshTokenAndPopulateClient = function (refreshToken: string) {
-  const query = {
-    where: {
-      refreshToken: refreshToken
-    },
-    include: [ OAuthToken['sequelize'].models.OAuthClient ]
+  static getByRefreshTokenAndPopulateClient (refreshToken: string) {
+    const query = {
+      where: {
+        refreshToken: refreshToken
+      },
+      include: [ OAuthClientModel ]
+    }
+
+    return OAuthTokenModel.findOne(query)
+      .then(token => {
+        if (!token) return null
+
+        return {
+          refreshToken: token.refreshToken,
+          refreshTokenExpiresAt: token.refreshTokenExpiresAt,
+          client: {
+            id: token.oAuthClientId
+          },
+          user: {
+            id: token.userId
+          }
+        } as OAuthTokenInfo
+      })
+      .catch(err => {
+        logger.info('getRefreshToken error.', { err })
+        throw err
+      })
   }
 
-  return OAuthToken.findOne(query)
-    .then(token => {
-      if (!token) return null
-
-      const tokenInfos: OAuthTokenInfo = {
-        refreshToken: token.refreshToken,
-        refreshTokenExpiresAt: token.refreshTokenExpiresAt,
-        client: {
-          id: token.oAuthClientId
-        },
-        user: {
-          id: token.userId
-        }
+  static getByTokenAndPopulateUser (bearerToken: string) {
+    const query = {
+      where: {
+        accessToken: bearerToken
       }
+    }
 
-      return tokenInfos
-    })
-    .catch(err => {
-      logger.info('getRefreshToken error.', err)
-      throw err
-    })
-}
+    return OAuthTokenModel.scope(ScopeNames.WITH_ACCOUNT).findOne(query).then(token => {
+      if (token) token['user'] = token.User
 
-getByTokenAndPopulateUser = function (bearerToken: string) {
-  const query = {
-    where: {
-      accessToken: bearerToken
-    },
-    include: [
-      {
-        model: OAuthToken['sequelize'].models.User,
-        include: [
-          {
-            model: OAuthToken['sequelize'].models.Author,
-            required: true
-          }
-        ]
-      }
-    ]
+      return token
+    })
   }
 
-  return OAuthToken.findOne(query).then(token => {
-    if (token) token['user'] = token.User
-
-    return token
-  })
-}
-
-getByRefreshTokenAndPopulateUser = function (refreshToken: string) {
-  const query = {
-    where: {
-      refreshToken: refreshToken
-    },
-    include: [
-      {
-        model: OAuthToken['sequelize'].models.User,
-        include: [
-          {
-            model: OAuthToken['sequelize'].models.Author,
-            required: true
-          }
-        ]
+  static getByRefreshTokenAndPopulateUser (refreshToken: string) {
+    const query = {
+      where: {
+        refreshToken: refreshToken
       }
-    ]
-  }
+    }
 
-  return OAuthToken.findOne(query).then(token => {
-    token['user'] = token.User
+    return OAuthTokenModel.scope(ScopeNames.WITH_ACCOUNT)
+      .findOne(query)
+      .then(token => {
+        token['user'] = token.User
 
-    return token
-  })
-}
+        return token
+      })
+  }
 
-removeByUserId = function (userId: number) {
-  const query = {
-    where: {
-      userId: userId
+  static deleteUserToken (userId: number) {
+    const query = {
+      where: {
+        userId
+      }
     }
-  }
 
-  return OAuthToken.destroy(query)
+    return OAuthTokenModel.destroy(query)
+  }
 }