neil/silverbullet
1
0
Fork 0
Code

Replace unauthorized status with a redirect

Browse Source
This commit is contained in:
Zef Hemel 2023-07-04 16:53:39 +02:00
parent 5ff9a5692b
commit f39ab26cea
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/spaces/http_space_primitives.ts
View File

@ -21,13 +21,13 @@ export class HttpSpacePrimitives implements SpacePrimitives {
options.headers = { ...options.headers, ...{ "X-Sync-Mode": "true" } }; options.headers = { ...options.headers, ...{ "X-Sync-Mode": "true" } };
} }
const result = await fetch(url, { ...options }); const result = await fetch(url, {
if ( ...options,
this.getRealStatus(result) === 401 });
) { if (result.redirected) {
// Invalid credentials, reloading the browser should trigger authentication // Got a redirect, we'll assume this is due to invalid credentials and redirecting to an auth page
console.log("Going to redirect after", url); console.log("Got a redirect via the API so will redirect to URL", url);
location.href = "/.auth?refer=" + location.pathname; location.href = result.url;
throw new Error("Invalid credentials"); throw new Error("Invalid credentials");
} }
return result; return result;

9
server/http_server.ts
View File

@ -218,8 +218,7 @@ export class HttpServer {
} }
return; return;
} else { } else {
response.status = 401; response.redirect("/.auth");
response.body = "Unauthorized";
return; return;
} }
} else { } else {
@ -232,8 +231,7 @@ export class HttpServer {
if (!excludedPaths.includes(request.url.pathname)) { if (!excludedPaths.includes(request.url.pathname)) {
const authCookie = await cookies.get("auth"); const authCookie = await cookies.get("auth");
if (!authCookie) { if (!authCookie) {
response.status = 401; response.redirect("/.auth");
response.body = "Unauthorized, please authenticate";
return; return;
} }
const [username, hashedPassword] = authCookie.split(":"); const [username, hashedPassword] = authCookie.split(":");
@ -243,8 +241,7 @@ export class HttpServer {
hashedPassword, hashedPassword,
) )
) { ) {
response.status = 401; response.redirect("/.auth");
response.body = "Invalid username/password, please reauthenticate";
return; return;
} }
} }