Move models to typescript-sequelize

1 files changed, 129 insertions, 130 deletions

diff --git a/server/models/oauth/oauth-token.ts b/server/models/oauth/oauth-token.ts
index a82bff130..0d21c42fd 100644
--- a/server/models/oauth/oauth-token.ts
+++ b/server/models/oauth/oauth-token.ts
@@ -1,164 +1,163 @@
-import * as Sequelize from 'sequelize'
-
+import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
 import { logger } from '../../helpers'
+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
+  }
+}
 
-import { addMethodsToModel } from '../utils'
-import { OAuthTokenAttributes, OAuthTokenInfo, OAuthTokenInstance, OAuthTokenMethods } from './oauth-token-interface'
-
-let OAuthToken: Sequelize.Model<OAuthTokenInstance, OAuthTokenAttributes>
-let getByRefreshTokenAndPopulateClient: OAuthTokenMethods.GetByRefreshTokenAndPopulateClient
-let getByTokenAndPopulateUser: OAuthTokenMethods.GetByTokenAndPopulateUser
-let getByRefreshTokenAndPopulateUser: OAuthTokenMethods.GetByRefreshTokenAndPopulateUser
-
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  OAuthToken = sequelize.define<OAuthTokenInstance, OAuthTokenAttributes>('OAuthToken',
+@Table({
+  tableName: 'oAuthToken',
+  indexes: [
     {
-      accessToken: {
-        type: DataTypes.STRING,
-        allowNull: false
-      },
-      accessTokenExpiresAt: {
-        type: DataTypes.DATE,
-        allowNull: false
-      },
-      refreshToken: {
-        type: DataTypes.STRING,
-        allowNull: false
-      },
-      refreshTokenExpiresAt: {
-        type: DataTypes.DATE,
-        allowNull: false
-      }
+      fields: [ 'refreshToken' ],
+      unique: true
     },
     {
-      indexes: [
-        {
-          fields: [ 'refreshToken' ],
-          unique: true
-        },
-        {
-          fields: [ 'accessToken' ],
-          unique: true
-        },
-        {
-          fields: [ 'userId' ]
-        },
-        {
-          fields: [ 'oAuthClientId' ]
-        }
-      ]
+      fields: [ 'accessToken' ],
+      unique: true
+    },
+    {
+      fields: [ 'userId' ]
+    },
+    {
+      fields: [ 'oAuthClientId' ]
     }
-  )
+  ]
+})
+export class OAuthTokenModel extends Model<OAuthTokenModel> {
 
-  const classMethods = [
-    associate,
+  @AllowNull(false)
+  @Column
+  accessToken: string
 
-    getByRefreshTokenAndPopulateClient,
-    getByTokenAndPopulateUser,
-    getByRefreshTokenAndPopulateUser
-  ]
-  addMethodsToModel(OAuthToken, classMethods)
+  @AllowNull(false)
+  @Column
+  accessTokenExpiresAt: Date
 
-  return OAuthToken
-}
+  @AllowNull(false)
+  @Column
+  refreshToken: string
 
-// ---------------------------------------------------------------------------
+  @AllowNull(false)
+  @Column
+  refreshTokenExpiresAt: Date
 
-function associate (models) {
-  OAuthToken.belongsTo(models.User, {
+  @CreatedAt
+  createdAt: Date
+
+  @UpdatedAt
+  updatedAt: Date
+
+  @ForeignKey(() => UserModel)
+  @Column
+  userId: number
+
+  @BelongsTo(() => UserModel, {
     foreignKey: {
-      name: 'userId',
       allowNull: false
     },
     onDelete: 'cascade'
   })
+  User: UserModel
 
-  OAuthToken.belongsTo(models.OAuthClient, {
+  @ForeignKey(() => OAuthClientModel)
+  @Column
+  oAuthClientId: number
+
+  @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
+      },
+      include: [
+        {
+          model: UserModel,
+          include: [
+            {
+              model: AccountModel,
+              required: true
+            }
+          ]
         }
-      }
+      ]
+    }
 
-      return tokenInfos
-    })
-    .catch(err => {
-      logger.info('getRefreshToken error.', err)
-      throw err
-    })
-}
+    return OAuthTokenModel.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.Account,
-            required: true
-          }
-        ]
-      }
-    ]
+      return token
+    })
   }
 
-  return OAuthToken.findOne(query).then(token => {
-    if (token) token['user'] = token.User
+  static getByRefreshTokenAndPopulateUser (refreshToken: string) {
+    const query = {
+      where: {
+        refreshToken: refreshToken
+      },
+      include: [
+        {
+          model: UserModel,
+          include: [
+            {
+              model: AccountModel,
+              required: true
+            }
+          ]
+        }
+      ]
+    }
 
-    return token
-  })
-}
+    return OAuthTokenModel.findOne(query).then(token => {
+      token['user'] = token.User
 
-getByRefreshTokenAndPopulateUser = function (refreshToken: string) {
-  const query = {
-    where: {
-      refreshToken: refreshToken
-    },
-    include: [
-      {
-        model: OAuthToken['sequelize'].models.User,
-        include: [
-          {
-            model: OAuthToken['sequelize'].models.Account,
-            required: true
-          }
-        ]
-      }
-    ]
+      return token
+    })
   }
-
-  return OAuthToken.findOne(query).then(token => {
-    token['user'] = token.User
-
-    return token
-  })
 }