-import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
-import { logger } from '../../helpers'
-import { AccountModel } from '../account/account'
+import {
+ AfterDestroy,
+ AfterUpdate,
+ AllowNull,
+ BelongsTo,
+ Column,
+ CreatedAt,
+ ForeignKey,
+ Model,
+ Scopes,
+ 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'
export type OAuthTokenInfo = {
refreshToken: string
}
enum ScopeNames {
- WITH_ACCOUNT = 'WITH_ACCOUNT'
+ WITH_USER = 'WITH_USER'
}
-@Scopes({
- [ScopeNames.WITH_ACCOUNT]: {
+@Scopes(() => ({
+ [ScopeNames.WITH_USER]: {
include: [
{
- model: () => UserModel,
+ model: UserModel.unscoped(),
+ required: true,
include: [
{
- model: () => AccountModel,
- required: true
+ attributes: [ 'id' ],
+ model: AccountModel.unscoped(),
+ required: true,
+ include: [
+ {
+ attributes: [ 'id', 'url' ],
+ model: ActorModel.unscoped(),
+ required: true
+ }
+ ]
}
]
}
]
}
-})
+}))
@Table({
tableName: 'oAuthToken',
indexes: [
})
OAuthClients: OAuthClientModel[]
+ @AfterUpdate
+ @AfterDestroy
+ static removeTokenCache (token: OAuthTokenModel) {
+ return clearCacheByToken(token.accessToken)
+ }
+
static getByRefreshTokenAndPopulateClient (refreshToken: string) {
const query = {
where: {
} as OAuthTokenInfo
})
.catch(err => {
- logger.info('getRefreshToken error.', err)
+ logger.error('getRefreshToken error.', { err })
throw err
})
}
}
}
- return OAuthTokenModel.scope(ScopeNames.WITH_ACCOUNT).findOne(query).then(token => {
- if (token) token['user'] = token.User
+ return OAuthTokenModel.scope(ScopeNames.WITH_USER)
+ .findOne(query)
+ .then(token => {
+ if (token) token[ 'user' ] = token.User
- return token
- })
+ return token
+ })
}
static getByRefreshTokenAndPopulateUser (refreshToken: string) {
}
}
- return OAuthTokenModel.scope(ScopeNames.WITH_ACCOUNT)
+ return OAuthTokenModel.scope(ScopeNames.WITH_USER)
.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)
+ }
}