@iushev/react-rbac 1.0.21 → 1.0.22

package/lib/RbacContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RbacContext.d.ts","sourceRoot":"","sources":["../src/RbacContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgE,MAAM,OAAO,CAAC;AAErF,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAG1D,oBAAY,kBAAkB,GAAG,MAAM,UAAU,CAAC;AAClD,oBAAY,aAAa,GAAG,MAAM,OAAO,CAAC;AAC1C,oBAAY,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,GAAG,kBAAkB,CAAC;IACzC,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC7B,WAAW,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChE,CAAC;AAEF,QAAA,MAAM,WAAW,iCAEf,CAAC;AAEH,oBAAY,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAkEpD,CAAC;AAEF,eAAO,MAAM,YAAY,kCAAuB,CAAC;AAEjD,eAAO,MAAM,OAAO,QAAO,gBAM1B,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"RbacContext.d.ts","sourceRoot":"","sources":["../src/RbacContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgE,MAAM,OAAO,CAAC;AAErF,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAG1D,oBAAY,kBAAkB,GAAG,MAAM,UAAU,CAAC;AAClD,oBAAY,aAAa,GAAG,MAAM,OAAO,CAAC;AAC1C,oBAAY,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,GAAG,kBAAkB,CAAC;IACzC,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC7B,WAAW,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChE,CAAC;AAEF,QAAA,MAAM,WAAW,iCAEf,CAAC;AAEH,oBAAY,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA4EpD,CAAC;AAEF,eAAO,MAAM,YAAY,kCAAuB,CAAC;AAEjD,eAAO,MAAM,OAAO,QAAO,gBAM1B,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/lib/RbacContext.js

@@ -62,6 +62,9 @@ const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClas
         if (!roles || roles.length === 0) {
             return true;
         }
+        if (!rbac) {
+            return false;
+        }
         for (const role of roles) {
             if (role === "?" && isGuest) {
                 // only guest users
@@ -71,7 +74,7 @@ const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClas
                 // only authenticated users
                 return true;
             }
-            else if (yield (rbac === null || rbac === void 0 ? void 0 : rbac.checkAccess(username, role, typeof params === "function" ? params() : params))) {
+            else if (yield rbac.checkAccess(username, role, typeof params === "function" ? params() : params)) {
                 // only authenticated users that has permission
                 return true;
             }
@@ -80,7 +83,7 @@ const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClas
             }
         }
         return false;
-    }), []);
+    }), [isGuest, rbac, username]);
     const matchCustom = (0, react_1.useCallback)((match) => {
         if (!match) {
             return true;
@@ -89,12 +92,12 @@ const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClas
     }, []);
     const checkAccess = (0, react_1.useCallback)(({ roles, allow = true, match, params = {} }) => __awaiter(void 0, void 0, void 0, function* () {
         return isSuperuser || ((yield matchRole(roles, params)) && matchCustom(match) && allow);
-    }), []);
+    }), [isSuperuser, matchCustom, matchRole]);
     const value = (0, react_1.useMemo)(() => {
         return {
             checkAccess,
         };
-    }, [rbac, username, isGuest, isSuperuser]);
+    }, [checkAccess]);
     return (0, jsx_runtime_1.jsx)(RbacContext.Provider, Object.assign({ value: value }, { children: children }));
 };
 exports.RbacProvider = RbacProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iushev/react-rbac",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "private": false,
   "author": "Ivaylo Ushev",
   "description": "",
@@ -28,6 +28,8 @@
     "eslint": "^8.14.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-react-hooks": "^4.5.0",
     "jest": "^27.5.1",
     "prettier": "^2.6.2",
     "rimraf": "^3.0.2",

package/src/NoAccess.tsx

@@ -4,7 +4,7 @@ const NoAccess: React.FC = () => {
   return (
     <div>
       <h4>Access Denied</h4>
-      <h5>You don't have permission to access.</h5>
+      <h5>You don&apos;t have permission to access.</h5>
     </div>
   );
 };

package/src/RbacContext.tsx

@@ -54,28 +54,35 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
     }
   }, [rbacUrl, token]);
 
-  const matchRole = useCallback(async (roles, params) => {
-    if (!roles || roles.length === 0) {
-      return true;
-    }
-
-    for (const role of roles) {
-      if (role === "?" && isGuest) {
-        // only guest users
+  const matchRole = useCallback(
+    async (roles, params) => {
+      if (!roles || roles.length === 0) {
         return true;
-      } else if (role === "@" && !isGuest) {
-        // only authenticated users
-        return true;
-      } else if (await rbac?.checkAccess(username, role, typeof params === "function" ? params() : params)) {
-        // only authenticated users that has permission
-        return true;
-      } else {
-        continue;
       }
-    }
 
-    return false;
-  }, []);
+      if (!rbac) {
+        return false;
+      }
+
+      for (const role of roles) {
+        if (role === "?" && isGuest) {
+          // only guest users
+          return true;
+        } else if (role === "@" && !isGuest) {
+          // only authenticated users
+          return true;
+        } else if (await rbac.checkAccess(username, role, typeof params === "function" ? params() : params)) {
+          // only authenticated users that has permission
+          return true;
+        } else {
+          continue;
+        }
+      }
+
+      return false;
+    },
+    [isGuest, rbac, username]
+  );
 
   const matchCustom = useCallback((match) => {
     if (!match) {
@@ -84,15 +91,18 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
     return match();
   }, []);
 
-  const checkAccess = useCallback(async ({ roles, allow = true, match, params = {} }: CheckAccessOptions) => {
-    return isSuperuser || ((await matchRole(roles, params)) && matchCustom(match) && allow);
-  }, []);
+  const checkAccess = useCallback(
+    async ({ roles, allow = true, match, params = {} }: CheckAccessOptions) => {
+      return isSuperuser || ((await matchRole(roles, params)) && matchCustom(match) && allow);
+    },
+    [isSuperuser, matchCustom, matchRole]
+  );
 
   const value = useMemo(() => {
     return {
       checkAccess,
     };
-  }, [rbac, username, isGuest, isSuperuser]);
+  }, [checkAccess]);
 
   return <RbacContext.Provider value={value}>{children}</RbacContext.Provider>;
 };

package/src/index.ts

@@ -1,4 +1,4 @@
 export { default as RbacContext, RbacConsumer, RbacProvider } from "./RbacContext";
 export { default as CheckAccess, CheckAccessProps } from "./CheckAccess";
 export { default as NoAccess } from "./NoAccess";
-export { default as useCheckAccess } from "./useCheckAccess";
+export { default as useCheckAccess } from "./useCheckAccess";