From 614a1d74ddf388dcb82f69722c96696ad530602d Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 28 Mar 2020 18:07:41 +0900 Subject: Resolve #6192 --- src/server/api/authenticate.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/server/api/authenticate.ts') diff --git a/src/server/api/authenticate.ts b/src/server/api/authenticate.ts index 32ad3b4019..c3e277e8de 100644 --- a/src/server/api/authenticate.ts +++ b/src/server/api/authenticate.ts @@ -2,12 +2,9 @@ import isNativeToken from './common/is-native-token'; import { User } from '../../models/entities/user'; import { Users, AccessTokens, Apps } from '../../models'; import { ensure } from '../../prelude/ensure'; +import { AccessToken } from '../../models/entities/access-token'; -type App = { - permission: string[]; -}; - -export default async (token: string): Promise<[User | null | undefined, App | null | undefined]> => { +export default async (token: string): Promise<[User | null | undefined, AccessToken | null | undefined]> => { if (token == null) { return [null, null]; } @@ -45,12 +42,11 @@ export default async (token: string): Promise<[User | null | undefined, App | nu .findOne(accessToken.appId).then(ensure); return [user, { + id: accessToken.id, permission: app.permission - }]; + } as AccessToken]; } else { - return [user, { - permission: accessToken.permission - }]; + return [user, accessToken]; } } }; -- cgit v1.2.3-freya