yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix optional authentication (#6134)

Browse Source
This commit is contained in:
Nam Vu
2023-11-15 19:32:01 -05:00
committed by GitHub
parent 2c870f0dbb
commit 68a3d327f6
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/middlewares/authentication.ts
View File

@@ -57,14 +57,14 @@ export default function auth(options: AuthenticationOptions = {}) {
token = ctx.cookies.get("accessToken");
}
if (!token && options.optional !== true) {
throw AuthenticationError("Authentication required");
}
try {
if (!token) {
throw AuthenticationError("Authentication required");
}
let user: User | null;
let type: AuthenticationType;
let user: User | null;
let type: AuthenticationType;
if (token) {
if (ApiKey.match(String(token))) {
type = AuthenticationType.API;
let apiKey;
@@ -146,8 +146,12 @@ export default function auth(options: AuthenticationOptions = {}) {
getRootSpanFromRequestContext(ctx)
);
}
} else {
ctx.state.auth = {};
} catch (err) {
if (options.optional) {
ctx.state.auth = {};
} else {
throw err;
}
}
return next();