yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 18:29:27 +02:00
Code Issues Releases Wiki Activity

Upgrade sequelize to v6

Browse source
This commit is contained in:
Chocobozzz 2020-12-08 14:30:29 +01:00 • committed by Chocobozzz
parent 6c8c15f914
commit b49f22d8f9
75 changed files with 436 additions and 498 deletions
Download patch file Download diff file Expand all files Collapse all files

21
server/models/oauth/oauth-token.ts
View file

@ -1,3 +1,4 @@
import { Transaction } from 'sequelize'
import {
AfterDestroy,
AfterUpdate,
@ -11,15 +12,13 @@ import {
Table,
UpdatedAt
} from 'sequelize-typescript'
import { logger } from '../../helpers/logger'
import { UserModel } from '../account/user'
import { OAuthClientModel } from './oauth-client'
import { Transaction } from 'sequelize'
import { AccountModel } from '../account/account'
import { ActorModel } from '../activitypub/actor'
import { clearCacheByToken } from '../../lib/oauth-model'
import * as Bluebird from 'bluebird'
import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token'
import { logger } from '../../helpers/logger'
import { clearCacheByToken } from '../../lib/oauth-model'
import { AccountModel } from '../account/account'
import { UserModel } from '../account/user'
import { ActorModel } from '../activitypub/actor'
import { OAuthClientModel } from './oauth-client'
export type OAuthTokenInfo = {
refreshToken: string
@ -80,7 +79,7 @@ enum ScopeNames {
}
]
})
export class OAuthTokenModel extends Model<OAuthTokenModel> {
export class OAuthTokenModel extends Model {
@AllowNull(false)
@Column
@ -174,7 +173,7 @@ export class OAuthTokenModel extends Model<OAuthTokenModel> {
})
}
static getByTokenAndPopulateUser (bearerToken: string): Bluebird<MOAuthTokenUser> {
static getByTokenAndPopulateUser (bearerToken: string): Promise<MOAuthTokenUser> {
const query = {
where: {
accessToken: bearerToken
@ -190,7 +189,7 @@ export class OAuthTokenModel extends Model<OAuthTokenModel> {
})
}
static getByRefreshTokenAndPopulateUser (refreshToken: string): Bluebird<MOAuthTokenUser> {
static getByRefreshTokenAndPopulateUser (refreshToken: string): Promise<MOAuthTokenUser> {
const query = {
where: {
refreshToken