fix(rbac): replace added for redirect

imjulianeral · Sep 2, 2021 · c957a4f · c957a4f
1 parent d44e4c4
commit c957a4f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/example/ts-fire-example/components/router/Shield.tsx b/example/ts-fire-example/components/router/Shield.tsx
@@ -32,13 +32,18 @@ export function Shield({ children }: Props) {
     LoadingComponent: <Loading />,
     privateRoutes: ['/profile', '/dashboard', '/control-panel'],
     publicRoutes: ['/', '/login'],
-    accessRoute: '/profile',
     loginRoute: '/login',
     RBAC: {
-      ADMIN: ['/profile', '/control-panel'],
-      USER: ['/profile', '/dashboard'],
+      ADMIN: {
+        grantedRoutes: ['/profile', '/control-panel'],
+        accessRoute: '/profile',
+      },
+      USER: {
+        grantedRoutes: ['/profile', '/dashboard'],
+        accessRoute: '/dashboard',
+      },
     },
-    userRole: value?.role,
+    userRole: value?.role as string,
   }
 
   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": "^1.0.1",
+    "next-shield": "^2.0.0",
     "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
@@ -67,10 +67,10 @@ export function NextShield<
   useEffect(() => {
     if (!isAuth && !isLoading && pathIsPrivate) replace(loginRoute)
     if (isAuth && !isLoading && pathIsPublic)
-      getAccessRoute(RBAC, userRole, accessRoute, loginRoute)
+      replace(getAccessRoute(RBAC, userRole, accessRoute, loginRoute))
 
     if (isAuth && userRole && !isLoading && !pathIsHybrid && !pathIsAuthorized)
-      getAccessRoute(RBAC, userRole, accessRoute, loginRoute)
+      replace(getAccessRoute(RBAC, userRole, accessRoute, loginRoute))
   }, [
     replace,
     userRole,