Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve #6192

Browse source
This commit is contained in:
syuilo 2020-03-28 18:07:41 +09:00
parent 9ea1ed8559
commit 614a1d74dd
21 changed files with 229 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/server/api/authenticate.ts
View file

@ -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];
}
}
};