fix(rbac): check

imjulianeral · Sep 2, 2021 · 46dab1d · 46dab1d
1 parent 19f16ec
commit 46dab1d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/example/ts-fire-example/components/router/Shield.tsx b/example/ts-fire-example/components/router/Shield.tsx
@@ -43,7 +43,7 @@ export function Shield({ children }: Props) {
         accessRoute: '/dashboard',
       },
     },
-    userRole: value?.role as string,
+    userRole: value?.role ?? 'USER',
   }
 
   if (error) return <p>{error}</p>

diff --git a/example/ts-fire-example/package-lock.json b/example/ts-fire-example/package-lock.json
diff --git a/example/ts-fire-example/package.json b/example/ts-fire-example/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "firebase": "^8.7.0",
     "next": "11.0.1",
-    "next-shield": "^2.0.6",
+    "next-shield": "^2.0.7",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-firebase-hooks": "^3.0.4",

diff --git a/src/components/NextShield.tsx b/src/components/NextShield.tsx
@@ -66,20 +66,18 @@ export function NextShield<
   const access = getAccessRoute(RBAC, userRole, accessRoute, loginRoute)
 
   useEffect(() => {
-    if (!isAuth && !isLoading && pathIsPrivate) {
-      console.log({
-        userRole,
-        access,
-        isAuth,
-        isLoading,
-        loginRoute,
-        pathIsPrivate,
-        pathIsPublic,
-        pathIsHybrid,
-        pathIsAuthorized,
-      })
-      replace(loginRoute)
-    }
+    console.log({
+      userRole,
+      access,
+      isAuth,
+      isLoading,
+      loginRoute,
+      pathIsPrivate,
+      pathIsPublic,
+      pathIsHybrid,
+      pathIsAuthorized,
+    })
+    if (!isAuth && !isLoading && pathIsPrivate) replace(loginRoute)
     if (isAuth && !isLoading && pathIsPublic) replace(access)
     if (isAuth && userRole && !isLoading && !pathIsHybrid && !pathIsAuthorized)
       replace(access)