yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 19:42:24 +02:00
Code Issues Releases Wiki Activity

Limit associations fetch when loading token

Browse source
This commit is contained in:
Chocobozzz 2018-09-20 10:13:13 +02:00
parent fcc7c06037
commit 91411dba92
No known key found for this signature in database
GPG key ID: 583A612D890159BE
11 changed files with 75 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,10 @@
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'
import { Transaction } from 'sequelize'
import { AccountModel } from '../account/account'
import { ActorModel } from '../activitypub/actor'
export type OAuthTokenInfo = {
refreshToken: string
@ -17,18 +18,27 @@ export type OAuthTokenInfo = {
}
enum ScopeNames {
WITH_ACCOUNT = 'WITH_ACCOUNT'
WITH_USER = 'WITH_USER'
}
@Scopes({
[ScopeNames.WITH_ACCOUNT]: {
[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' ],
model: () => ActorModel.unscoped(),
required: true
}
]
}
]
}
@ -138,7 +148,7 @@ export class OAuthTokenModel extends Model<OAuthTokenModel> {
}
}
return OAuthTokenModel.scope(ScopeNames.WITH_ACCOUNT).findOne(query).then(token => {
return OAuthTokenModel.scope(ScopeNames.WITH_USER).findOne(query).then(token => {
if (token) token['user'] = token.User
return token
@ -152,7 +162,7 @@ export class OAuthTokenModel extends Model<OAuthTokenModel> {
}
}
return OAuthTokenModel.scope(ScopeNames.WITH_ACCOUNT)
return OAuthTokenModel.scope(ScopeNames.WITH_USER)
.findOne(query)
.then(token => {
if (token) {