Alternative fix for issue highlighted in PR #337 by @kontaxis

dullage · dullage · commit 76ea8f08a76f · 2025-10-17T12:38:49.000+01:00
diff --git a/client/api.js b/client/api.js
@@ -48,8 +48,8 @@ export async function getConfig() {
   try {
     const response = await api.get("api/config");
     return response.data;
-  } catch (error) {
-    return Promise.reject(error);
+  } catch (response) {
+    return Promise.reject(response);
   }
 }
 
@@ -65,6 +65,15 @@ export async function getToken(username, password, totp) {
   }
 }
 
+export async function authCheck() {
+  try {
+    const response = await api.get("api/auth-check");
+    return response.data;
+  } catch (response) {
+    return Promise.reject(response);
+  }
+}
+
 export async function getNotes(term, sort, order, limit) {
   try {
     const response = await api.get("api/search", {
diff --git a/client/router.js b/client/router.js
@@ -2,6 +2,8 @@ import * as constants from "./constants.js";
 
 import { createRouter, createWebHistory } from "vue-router";
 
+import { authCheck } from "./api.js";
+
 const router = createRouter({
   history: createWebHistory(""),
   routes: [
@@ -39,6 +41,27 @@ const router = createRouter({
   ],
 });
 
+// Check the user is authenticated on first navigation (unless going to login)
+let authChecked = false;
+router.beforeEach(async (to) => {
+  if (authChecked || to.name === "login") {
+    return;
+  }
+  try {
+    await authCheck();
+    return;
+  } catch (error) {
+    if (error.response && error.response.status === 401) {
+      return {
+        name: "login",
+        query: { [constants.params.redirect]: to.fullPath },
+      };
+    }
+  } finally {
+    authChecked = true;
+  }
+});
+
 router.afterEach((to) => {
   let title = "flatnotes";
   if (to.name === "note") {
diff --git a/server/main.py b/server/main.py
@@ -42,7 +42,7 @@ def root(title: str = ""):
 # endregion
 
 
-# region Login
+# region Auth
 if global_config.auth_type not in [AuthType.NONE, AuthType.READ_ONLY]:
 
     @router.post("/api/token", response_model=Token)
@@ -55,6 +55,13 @@ def token(data: Login):
             )
 
 
+@router.get("/api/auth-check", dependencies=auth_deps)
+def auth_check() -> str:
+    """A lightweight endpoint that simply returns 'OK' if the user is
+    authenticated."""
+    return "OK"
+
+
 # endregion
 
 

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ export async function getConfig() {`
`48`	`48`	`try {`
`49`	`49`	`const response = await api.get("api/config");`
`50`	`50`	`return response.data;`
`51`		`- } catch (error) {`
`52`		`- return Promise.reject(error);`
	`51`	`+ } catch (response) {`
	`52`	`+ return Promise.reject(response);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`@@ -65,6 +65,15 @@ export async function getToken(username, password, totp) {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
	`68`	`+export async function authCheck() {`
	`69`	`+ try {`
	`70`	`+ const response = await api.get("api/auth-check");`
	`71`	`+ return response.data;`
	`72`	`+ } catch (response) {`
	`73`	`+ return Promise.reject(response);`
	`74`	`+ }`
	`75`	`+}`
	`76`	`+`
`68`	`77`	`export async function getNotes(term, sort, order, limit) {`
`69`	`78`	`try {`
`70`	`79`	`const response = await api.get("api/search", {`