Cleanup models

[github/Chocobozzz/PeerTube.git] / server / models / oauth / oauth-token-interface.ts

diff --git a/server/models/oauth/oauth-token-interface.ts b/server/models/oauth/oauth-token-interface.ts
index f2ddafa5475368503a3f41b9fec43e04089dc30a..47d95d5fc51cfa5570ea28f90d875fab96901e20 100644 (file)
--- a/server/models/oauth/oauth-token-interface.ts
+++ b/server/models/oauth/oauth-token-interface.ts
@@ -1,7 +1,7 @@
-import * as Sequelize from 'sequelize'
 import * as Promise from 'bluebird'
+import * as Sequelize from 'sequelize'
 
-import { UserModel } from '../user'
+import { UserModel } from '../account/user-interface'
 
 export type OAuthTokenInfo = {
   refreshToken: string
@@ -18,15 +18,12 @@ export namespace OAuthTokenMethods {
   export type GetByRefreshTokenAndPopulateClient = (refreshToken: string) => Promise<OAuthTokenInfo>
   export type GetByTokenAndPopulateUser = (bearerToken: string) => Promise<OAuthTokenInstance>
   export type GetByRefreshTokenAndPopulateUser = (refreshToken: string) => Promise<OAuthTokenInstance>
-
-  export type RemoveByUserId = (userId) => Promise<number>
 }
 
 export interface OAuthTokenClass {
   getByRefreshTokenAndPopulateClient: OAuthTokenMethods.GetByRefreshTokenAndPopulateClient
   getByTokenAndPopulateUser: OAuthTokenMethods.GetByTokenAndPopulateUser
   getByRefreshTokenAndPopulateUser: OAuthTokenMethods.GetByRefreshTokenAndPopulateUser
-  removeByUserId: OAuthTokenMethods.RemoveByUserId
 }
 
 export interface OAuthTokenAttributes {
@@ -35,6 +32,8 @@ export interface OAuthTokenAttributes {
   refreshToken: string
   refreshTokenExpiresAt: Date
 
+  userId?: number
+  oAuthClientId?: number
   User?: UserModel
 }