refactor: Resolve type error in router.ts

surajshetty3416 · surajshetty3416 · commit 00a35dd22aaf · 2024-05-27T14:06:34.000+05:30
diff --git a/frontend/src/router.ts b/frontend/src/router.ts
@@ -1,10 +1,9 @@
 import { createResource } from "frappe-ui";
-import { createRouter, createWebHistory } from "vue-router";
+import { NavigationGuardNext, RouteLocationNormalized, createRouter, createWebHistory } from "vue-router";
 
-// Hack, TODO: Check authentication
 let hasPermission: null | boolean = null;
 
-function validatePermission(next: CallableFunction) {
+function validatePermission(next: NavigationGuardNext) {
 	if (hasPermission) {
 		next();
 	} else {
@@ -13,7 +12,11 @@ function validatePermission(next: CallableFunction) {
 	}
 }
 
-const validateVisit = function (to: string, from: string, next: CallableFunction) {
+const validateVisit = function (
+	to: RouteLocationNormalized,
+	from: RouteLocationNormalized,
+	next: NavigationGuardNext
+) {
 	if (document.cookie.includes("user_id") && !document.cookie.includes("user_id=Guest")) {
 		if (hasPermission === null) {
 			createResource({
@@ -25,15 +28,19 @@ const validateVisit = function (to: string, from: string, next: CallableFunction
 					docname: null,
 					perm_type: "write",
 				})
-				.then((res: any) => {
-					hasPermission = res.has_permission as boolean;
+				.then((res: { has_permission: boolean }) => {
+					hasPermission = res.has_permission;
+					validatePermission(next);
+				})
+				.catch(() => {
+					hasPermission = false;
 					validatePermission(next);
 				});
 		} else {
 			validatePermission(next);
 		}
 	} else {
-		window.location.href = "/login";
+		validatePermission(next);
 	}
 };
 
