@iushev/react-rbac 1.0.48 → 1.0.50

package/lib/RbacContext.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { RuleParams, Rule, RuleCtor, Identity, BaseManager } from "@iushev/rbac";
+import { RuleParams, Identity, BaseManager } from "@iushev/rbac";
 export type RuleParamsFunction = () => RuleParams;
 export type MatchFunction = () => boolean;
 export type CheckAccessOptions = {
@@ -10,19 +10,15 @@ export type CheckAccessOptions = {
     logging?: false | ((...args: any[]) => void);
 };
 export type RbacContextProps = {
-    rbacManager: BaseManager | null;
     checkAccess: (options: CheckAccessOptions) => Promise<boolean>;
 };
 declare const RbacContext: React.Context<RbacContextProps | null>;
 export declare const useRbac: () => RbacContextProps;
 export type RbacProviderProps = {
-    identity: Identity | null;
-    rbacUrl: string;
-    token: string;
-    ruleClasses: Map<string, RuleCtor<Rule>>;
-    afterInitManager?: (webManager: any) => void;
+    identity: Identity;
+    authManager: BaseManager;
     children: React.ReactNode;
-    logging?: false | ((...args: any[]) => void);
+    logging?: ((...args: any[]) => void);
 };
 export declare const RbacProvider: React.FC<RbacProviderProps>;
 export declare const RbacConsumer: React.Consumer<RbacContextProps | null>;

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,EAAuB,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGtG,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;IACtB,OAAO,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,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,QAAQ,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,IAAI,CAAC;IAC7C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,OAAO,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC;CAC9C,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA4DpD,CAAC;AAEF,eAAO,MAAM,YAAY,yCAAuB,CAAC;AAEjD,eAAe,WAAW,CAAC"}
+{"version":3,"file":"RbacContext.d.ts","sourceRoot":"","sources":["../src/RbacContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAuB,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEtF,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;IACtB,OAAO,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;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,QAAQ,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,OAAO,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA8BpD,CAAC;AAEF,eAAO,MAAM,YAAY,yCAAuB,CAAC;AAEjD,eAAe,WAAW,CAAC"}

package/lib/RbacContext.js

@@ -46,7 +46,6 @@ exports.RbacConsumer = exports.RbacProvider = exports.useRbac = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = __importStar(require("react"));
 const rbac_1 = require("@iushev/rbac");
-const rbac_web_manager_1 = require("@iushev/rbac-web-manager");
 const RbacContext = react_1.default.createContext(null);
 const useRbac = () => {
     const ctx = (0, react_1.useContext)(RbacContext);
@@ -56,47 +55,23 @@ const useRbac = () => {
     return ctx;
 };
 exports.useRbac = useRbac;
-const RbacProvider = ({ identity, rbacUrl, token, ruleClasses, children, logging, }) => {
-    const [rbacManager, setRbacManager] = (0, react_1.useState)(null);
-    (0, react_1.useEffect)(() => {
-        const initRbac = () => __awaiter(void 0, void 0, void 0, function* () {
-            const manager = new rbac_web_manager_1.WebManager({
-                path: rbacUrl,
-                authorization: () => {
-                    return token;
-                },
-                logging,
-            });
-            ruleClasses.forEach((RuleClass, ruleName) => {
-                manager.ruleClasses.set(ruleName, RuleClass);
-            });
-            if (identity) {
-                yield manager.load();
-            }
-            setRbacManager(manager);
-        });
-        initRbac();
-    }, [identity, logging, rbacUrl, ruleClasses, token]);
+const RbacProvider = ({ identity, authManager, children, logging, }) => {
     const checkAccess = (0, react_1.useCallback)((_a) => __awaiter(void 0, [_a], void 0, function* ({ roles, allow = true, match, params = {}, logging: loggingOption = false }) {
-        if (!rbacManager) {
-            return false;
-        }
         const matchCustom = (match) => {
             if (!match) {
                 return true;
             }
             return match();
         };
-        const user = new rbac_1.RbacUser(rbacManager);
+        const user = new rbac_1.RbacUser(authManager);
         user.identity = identity;
         return user.isSuperuser || ((yield (0, rbac_1.matchRole)({ user, roles, params, logging: loggingOption ? loggingOption : logging })) && matchCustom(match) && allow);
-    }), [identity, rbacManager, logging]);
+    }), [identity, authManager, logging]);
     const value = (0, react_1.useMemo)(() => {
         return {
-            rbacManager,
             checkAccess,
         };
-    }, [rbacManager, checkAccess]);
+    }, [checkAccess]);
     return (0, jsx_runtime_1.jsx)(RbacContext.Provider, { value: value, children: children });
 };
 exports.RbacProvider = RbacProvider;

package/lib/useCheckAccess.js

@@ -12,20 +12,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
 const RbacContext_1 = require("./RbacContext");
 function useCheckAccess({ roles, allow, params, match, logging }) {
-    const rbac = (0, RbacContext_1.useRbac)();
+    const { checkAccess } = (0, RbacContext_1.useRbac)();
     const [state, setState] = (0, react_1.useState)({
         checking: true,
         hasAccess: false,
     });
     (0, react_1.useEffect)(() => {
         let subscribed = true;
-        const checkAccess = () => __awaiter(this, void 0, void 0, function* () {
+        const _checkAccess = () => __awaiter(this, void 0, void 0, function* () {
             setState({
                 checking: true,
                 hasAccess: false,
             });
             try {
-                const result = yield rbac.checkAccess({ roles, allow, params, match, logging });
+                const result = yield checkAccess({ roles, allow, params, match, logging });
                 if (subscribed) {
                     setState({
                         checking: false,
@@ -43,11 +43,11 @@ function useCheckAccess({ roles, allow, params, match, logging }) {
                 }
             }
         });
-        checkAccess();
+        _checkAccess();
         return () => {
             subscribed = false;
         };
-    }, [rbac, roles, allow, params, match, logging]);
+    }, [roles, allow, params, match, logging, checkAccess]);
     return state;
 }
 exports.default = useCheckAccess;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iushev/react-rbac",
-  "version": "1.0.48",
+  "version": "1.0.50",
   "private": false,
   "author": "Ivaylo Ushev",
   "description": "",
@@ -17,15 +17,12 @@
     "lint": "eslint src",
     "preversion": "npm run build"
   },
-  "dependencies": {
-    "http-status-codes": "^2.3.0"
-  },
   "devDependencies": {
     "@eslint/compat": "^2.0.0",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
-    "@typescript-eslint/eslint-plugin": "^8.50.0",
-    "@typescript-eslint/parser": "^8.50.0",
+    "@typescript-eslint/eslint-plugin": "^8.51.0",
+    "@typescript-eslint/parser": "^8.51.0",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
@@ -38,8 +35,8 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@iushev/rbac": "^1.0.64",
-    "@iushev/rbac-web-manager": "^1.0.8",
+    "@iushev/rbac": "^1.0.66",
+    "http-status-codes": "^2.3.0",
     "axios": "^1.13.2",
     "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"

package/src/RbacContext.tsx

@@ -1,7 +1,6 @@
-import React, { useCallback, useContext, useEffect, useMemo, useState } from "react";
+import React, { useCallback, useContext, useMemo } from "react";
 
-import { RuleParams, Rule, RuleCtor, RbacUser, matchRole, Identity, BaseManager } from "@iushev/rbac";
-import { WebManager } from "@iushev/rbac-web-manager";
+import { RuleParams, RbacUser, matchRole, Identity, BaseManager } from "@iushev/rbac";
 
 export type RuleParamsFunction = () => RuleParams;
 export type MatchFunction = () => boolean;
@@ -14,7 +13,6 @@ export type CheckAccessOptions = {
 };
 
 export type RbacContextProps = {
-  rbacManager: BaseManager | null;
   checkAccess: (options: CheckAccessOptions) => Promise<boolean>;
 };
 
@@ -29,52 +27,20 @@ export const useRbac = (): RbacContextProps => {
 };
 
 export type RbacProviderProps = {
-  identity: Identity | null;
-  rbacUrl: string;
-  token: string;
-  ruleClasses: Map<string, RuleCtor<Rule>>;
-  afterInitManager?: (webManager: any) => void;
+  identity: Identity;
+  authManager: BaseManager;
   children: React.ReactNode;
-  logging?: false | ((...args: any[]) => void);
+  logging?: ((...args: any[]) => void);
 };
 
 export const RbacProvider: React.FC<RbacProviderProps> = ({
   identity,
-  rbacUrl,
-  token,
-  ruleClasses,
+  authManager,
   children,
   logging,
 }) => {
-  const [rbacManager, setRbacManager] = useState<BaseManager | null>(null);
-
-  useEffect(() => {
-    const initRbac = async () => {
-      const manager = new WebManager({
-        path: rbacUrl,
-        authorization: () => {
-          return token;
-        },
-        logging,
-      });
-      ruleClasses.forEach((RuleClass, ruleName) => {
-        manager.ruleClasses.set(ruleName, RuleClass);
-      });
-      if (identity) {
-        await manager.load();
-      }
-      setRbacManager(manager);
-    };
-
-    initRbac();
-  }, [identity, logging, rbacUrl, ruleClasses, token]);
-
   const checkAccess = useCallback(
     async ({ roles, allow = true, match, params = {}, logging: loggingOption = false }: CheckAccessOptions) => {
-      if (!rbacManager) {
-        return false;
-      }
-
       const matchCustom = (match?: MatchFunction) => {
         if (!match) {
           return true;
@@ -82,20 +48,19 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
         return match();
       };
 
-      const user = new RbacUser(rbacManager);
+      const user = new RbacUser(authManager);
       user.identity = identity;
 
       return user.isSuperuser || ((await matchRole({ user, roles, params, logging: loggingOption ? loggingOption : logging })) && matchCustom(match) && allow);
     },
-    [identity, rbacManager, logging],
+    [identity, authManager, logging],
   );
 
   const value = useMemo(() => {
     return {
-      rbacManager,
       checkAccess,
     };
-  }, [rbacManager, checkAccess]);
+  }, [checkAccess]);
 
   return <RbacContext.Provider value={value}>{children}</RbacContext.Provider>;
 };

package/src/useCheckAccess.ts

@@ -7,7 +7,7 @@ export type CheckAccessState = {
 };
 
 function useCheckAccess({ roles, allow, params, match, logging }: CheckAccessOptions) {
-  const rbac = useRbac();
+  const { checkAccess } = useRbac();
 
   const [state, setState] = useState<CheckAccessState>({
     checking: true,
@@ -17,14 +17,14 @@ function useCheckAccess({ roles, allow, params, match, logging }: CheckAccessOpt
   useEffect(() => {
     let subscribed = true;
 
-    const checkAccess = async () => {
+    const _checkAccess = async () => {
       setState({
         checking: true,
         hasAccess: false,
       });
 
       try {
-        const result = await rbac.checkAccess({ roles, allow, params, match, logging });
+        const result = await checkAccess({ roles, allow, params, match, logging });
         if (subscribed) {
           setState({
             checking: false,
@@ -42,12 +42,12 @@ function useCheckAccess({ roles, allow, params, match, logging }: CheckAccessOpt
       }
     };
 
-    checkAccess();
+    _checkAccess();
 
     return () => {
       subscribed = false;
     };
-  }, [rbac, roles, allow, params, match, logging]);
+  }, [roles, allow, params, match, logging, checkAccess]);
 
   return state;
 }