natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

improve authentication errors

This commit is contained in:
Johann150 2022-07-18 17:42:14 +02:00
parent 29f7eb4482
commit 4ca48908be
No known key found for this signature in database
GPG Key ID: 9EE6577A2A06F8F1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/backend/src/server/api/api-handler.ts
View File

@ -81,11 +81,15 @@ export default (endpoint: IEndpoint, ctx: Koa.Context) => new Promise<void>((res
} }
}).catch(e => { }).catch(e => {
if (e instanceof AuthenticationError) { if (e instanceof AuthenticationError) {
reply(403, new ApiError({ ctx.response.status = 403;
message: 'Authentication failed. Please ensure your token is correct.', ctx.response.set('WWW-Authenticate', 'Bearer');
ctx.response.body = {
message: 'Authentication failed: ' + e.message,
code: 'AUTHENTICATION_FAILED', code: 'AUTHENTICATION_FAILED',
id: 'b0a7f5f8-dc2f-4171-b91f-de88ad238e14', id: 'b0a7f5f8-dc2f-4171-b91f-de88ad238e14',
})); kind: 'client',
};
res();
} else { } else {
reply(500, new ApiError()); reply(500, new ApiError());
} }

4
packages/backend/src/server/api/authenticate.ts
View File

@ -42,7 +42,7 @@ export default async (authorization: string | null | undefined, bodyToken: strin
() => Users.findOneBy({ token }) as Promise<ILocalUser | null>); () => Users.findOneBy({ token }) as Promise<ILocalUser | null>);
if (user == null) { if (user == null) {
throw new AuthenticationError('user not found'); throw new AuthenticationError('unknown token');
} }
return [user, null]; return [user, null];
@ -56,7 +56,7 @@ export default async (authorization: string | null | undefined, bodyToken: strin
}); });
if (accessToken == null) { if (accessToken == null) {
throw new AuthenticationError('invalid signature'); throw new AuthenticationError('unknown token');
} }
AccessTokens.update(accessToken.id, { AccessTokens.update(accessToken.id, {