oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

API AuthenticateでDB接続エラーなどが発生するとログアウトさせられてしまうのを修正 Fix #7603 (#7604)

Browse source
This commit is contained in:
MeiMei 2021-07-18 00:53:16 +09:00 • committed by GitHub
parent 6d1d7b5366
commit 62dede02ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,14 @@ import { Cache } from '@/misc/cache';
// ref. https://github.com/typeorm/typeorm/blob/master/docs/caching.md
const cache = new Cache<User>(1000 * 60 * 60);
export default async (token: string): Promise<[User | null | undefined, AccessToken | null | undefined]> => {
export class AuthenticationError extends Error {
constructor(message: string) {
super(message);
this.name = 'AuthenticationError';
}
}
export default async (token: string): Promise<[User | null | undefined, App | null | undefined]> => {
if (token == null) {
return [null, null];
}
@ -24,7 +31,7 @@ export default async (token: string): Promise<[User | null | undefined, AccessTo
.findOne({ token });
if (user == null) {
throw new Error('user not found');
throw new AuthenticationError('user not found');
}
cache.set(token, user);
@ -41,7 +48,7 @@ export default async (token: string): Promise<[User | null | undefined, AccessTo
});
if (accessToken == null) {
throw new Error('invalid signature');
throw new AuthenticationError('invalid signature');
}
AccessTokens.update(accessToken.id, {