@iushev/react-rbac 1.0.38 → 1.0.40

package/lib/RbacCheckAccess.js

@@ -113,7 +113,7 @@ class RbacCheckAccess extends rbac_1.BaseCheckAccess {
             var _a;
             const ruleData = rules[name];
             const RuleClass = (_a = this.ruleClasses.get(ruleData.data.typeName)) !== null && _a !== void 0 ? _a : rbac_1.Rule;
-            const rule = new RuleClass(name, JSON.parse(ruleData.data.rule));
+            const rule = new RuleClass(name, JSON.parse(ruleData.data.ruleData));
             prevValue.set(name, rule);
             return prevValue;
         }, new Map());

package/lib/RbacContext.d.ts

@@ -13,7 +13,8 @@ export type RbacContextProps = {
     rbac: RbacCheckAccess | null;
     checkAccess: (options: CheckAccessOptions) => Promise<boolean>;
 };
-declare const RbacContext: React.Context<RbacContextProps>;
+declare const RbacContext: React.Context<RbacContextProps | null>;
+export declare const useRbac: () => RbacContextProps;
 export type RbacProviderProps = {
     username: string;
     rbacUrl: string;
@@ -24,7 +25,6 @@ export type RbacProviderProps = {
     children: React.ReactNode;
 };
 export declare const RbacProvider: React.FC<RbacProviderProps>;
-export declare const RbacConsumer: React.Consumer<RbacContextProps>;
-export declare const useRbac: () => RbacContextProps;
+export declare const RbacConsumer: React.Consumer<RbacContextProps | null>;
 export default RbacContext;
 //# sourceMappingURL=RbacContext.d.ts.map

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;AAC1D,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,MAAM,MAAM,kBAAkB,GAAG,MAAM,UAAU,CAAC;AAClD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC;AAC1C,MAAM,MAAM,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,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,eAAe,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChE,CAAC;AAEF,QAAA,MAAM,WAAW,iCAGf,CAAC;AAEH,MAAM,MAAM,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;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA6EpD,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;AAC1D,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,MAAM,MAAM,kBAAkB,GAAG,MAAM,UAAU,CAAC;AAClD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC;AAC1C,MAAM,MAAM,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,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,eAAe,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChE,CAAC;AAEF,QAAA,MAAM,WAAW,wCAAqD,CAAC;AAEvE,eAAO,MAAM,OAAO,QAAO,gBAM1B,CAAC;AAEF,MAAM,MAAM,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;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAqFpD,CAAC;AAEF,eAAO,MAAM,YAAY,yCAAuB,CAAC;AAEjD,eAAe,WAAW,CAAC"}

package/lib/RbacContext.js

@@ -45,30 +45,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useRbac = exports.RbacConsumer = exports.RbacProvider = void 0;
+exports.RbacConsumer = exports.RbacProvider = exports.useRbac = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = __importStar(require("react"));
 const RbacCheckAccess_1 = __importDefault(require("./RbacCheckAccess"));
-const RbacContext = react_1.default.createContext({
-    rbac: null,
-    checkAccess: () => __awaiter(void 0, void 0, void 0, function* () { return true; }),
-});
-const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClasses: _ruleClasses, children, }) => {
+const RbacContext = react_1.default.createContext(null);
+const useRbac = () => {
+    const ctx = (0, react_1.useContext)(RbacContext);
+    if (!ctx) {
+        throw new Error("useRbac must be rendered under RbacProvider");
+    }
+    return ctx;
+};
+exports.useRbac = useRbac;
+const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClasses, children, }) => {
     const [rbac, setRbac] = (0, react_1.useState)(null);
     (0, react_1.useEffect)(() => {
-        if (!token) {
-            setRbac(null);
-        }
-        else {
-            const _rbac = new RbacCheckAccess_1.default({
-                path: rbacUrl,
-                authorization: () => {
-                    return token;
-                },
-            });
-            _rbac.load().then(() => setRbac(_rbac));
-        }
-    }, [rbacUrl, token]);
+        const initRbac = () => __awaiter(void 0, void 0, void 0, function* () {
+            if (!token) {
+                setRbac(null);
+            }
+            else {
+                const _rbac = new RbacCheckAccess_1.default({
+                    path: rbacUrl,
+                    authorization: () => {
+                        return token;
+                    },
+                });
+                ruleClasses.forEach((RuleClass, ruleName) => {
+                    _rbac.ruleClasses.set(ruleName, RuleClass);
+                });
+                yield _rbac.load();
+                setRbac(_rbac);
+            }
+        });
+        initRbac();
+    }, [rbacUrl, token, ruleClasses]);
     const matchRole = (0, react_1.useCallback)((roles, params) => __awaiter(void 0, void 0, void 0, function* () {
         if (!roles || roles.length === 0) {
             return true;
@@ -114,12 +126,4 @@ const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClas
 };
 exports.RbacProvider = RbacProvider;
 exports.RbacConsumer = RbacContext.Consumer;
-const useRbac = () => {
-    const ctx = (0, react_1.useContext)(RbacContext);
-    if (!ctx) {
-        throw new Error("useRbac must be rendered under RbacProvider");
-    }
-    return ctx;
-};
-exports.useRbac = useRbac;
 exports.default = RbacContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iushev/react-rbac",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "private": false,
   "author": "Ivaylo Ushev",
   "description": "",
@@ -37,7 +37,7 @@
     "typescript": "^5.7.2"
   },
   "peerDependencies": {
-    "@iushev/rbac": "^1.0.49",
+    "@iushev/rbac": "^1.0.50",
     "axios": "^1.7.9",
     "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"

package/src/RbacCheckAccess.ts

@@ -122,7 +122,7 @@ export default class RbacCheckAccess extends BaseCheckAccess {
     return Object.keys(rules).reduce<Map<string, Rule>>((prevValue, name) => {
       const ruleData = rules[name];
       const RuleClass = this.ruleClasses.get(ruleData.data.typeName) ?? Rule;
-      const rule = new RuleClass(name, JSON.parse(ruleData.data.rule));
+      const rule = new RuleClass(name, JSON.parse(ruleData.data.ruleData));
       prevValue.set(name, rule);
       return prevValue;
     }, new Map());

package/src/RbacContext.tsx

@@ -17,10 +17,15 @@ export type RbacContextProps = {
   checkAccess: (options: CheckAccessOptions) => Promise<boolean>;
 };
 
-const RbacContext = React.createContext<RbacContextProps>({
-  rbac: null,
-  checkAccess: async () => true,
-});
+const RbacContext = React.createContext<RbacContextProps | null>(null);
+
+export const useRbac = (): RbacContextProps => {
+  const ctx = useContext(RbacContext);
+  if (!ctx) {
+    throw new Error("useRbac must be rendered under RbacProvider");
+  }
+  return ctx;
+};
 
 export type RbacProviderProps = {
   username: string;
@@ -38,24 +43,32 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
   token,
   isSuperuser,
   isGuest,
-  ruleClasses: _ruleClasses,
+  ruleClasses,
   children,
 }) => {
   const [rbac, setRbac] = useState<RbacCheckAccess | null>(null);
 
   useEffect(() => {
-    if (!token) {
-      setRbac(null);
-    } else {
-      const _rbac = new RbacCheckAccess({
-        path: rbacUrl,
-        authorization: () => {
-          return token;
-        },
-      });
-      _rbac.load().then(() => setRbac(_rbac));
-    }
-  }, [rbacUrl, token]);
+    const initRbac = async () => {
+      if (!token) {
+        setRbac(null);
+      } else {
+        const _rbac = new RbacCheckAccess({
+          path: rbacUrl,
+          authorization: () => {
+            return token;
+          },
+        });
+        ruleClasses.forEach((RuleClass, ruleName) => {
+          _rbac.ruleClasses.set(ruleName, RuleClass);
+        });
+        await _rbac.load();
+        setRbac(_rbac);
+      }
+    };
+
+    initRbac();
+  }, [rbacUrl, token, ruleClasses]);
 
   const matchRole = useCallback(
     async (roles: string[], params: RuleParams | RuleParamsFunction) => {
@@ -113,12 +126,4 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
 
 export const RbacConsumer = RbacContext.Consumer;
 
-export const useRbac = (): RbacContextProps => {
-  const ctx = useContext(RbacContext);
-  if (!ctx) {
-    throw new Error("useRbac must be rendered under RbacProvider");
-  }
-  return ctx;
-};
-
 export default RbacContext;