@iushev/react-rbac 1.0.40 → 1.0.42

package/eslint.config.mjs

@@ -1,3 +1,6 @@
+import { fixupConfigRules, fixupPluginRules } from "@eslint/compat";
+import react from "eslint-plugin-react";
+import reactHooks from "eslint-plugin-react-hooks";
 import typescriptEslint from "@typescript-eslint/eslint-plugin";
 import prettier from "eslint-plugin-prettier";
 import globals from "globals";
@@ -19,10 +22,21 @@ export default [
   {
     ignores: ["**/lib/", "**/node_modules/"],
   },
-  ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"),
+  ...fixupConfigRules(
+    compat.extends(
+      "eslint:recommended",
+      "plugin:react/recommended",
+      "plugin:react/jsx-runtime",
+      "plugin:react-hooks/recommended",
+      "plugin:@typescript-eslint/recommended",
+      "prettier",
+    ),
+  ),
   {
     plugins: {
-      "@typescript-eslint": typescriptEslint,
+      react: fixupPluginRules(react),
+      "react-hooks": fixupPluginRules(reactHooks),
+      "@typescript-eslint": fixupPluginRules(typescriptEslint),
       prettier,
     },
 
@@ -37,6 +51,12 @@ export default [
       sourceType: "module",
     },
 
+    settings: {
+      react: {
+        version: "detect",
+      },
+    },
+
     rules: {
       "@typescript-eslint/no-namespace": "off",
       "@typescript-eslint/no-explicit-any": "off",

package/lib/CheckAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CheckAccess.d.ts","sourceRoot":"","sources":["../src/CheckAccess.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAInD,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG;IAClD,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC/B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;AAEF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAgB3C,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"CheckAccess.d.ts","sourceRoot":"","sources":["../src/CheckAccess.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAKnD,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG;IAClD,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC/B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;AAEF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAgB3C,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/lib/CheckAccess.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const useCheckAccess_1 = __importDefault(require("./useCheckAccess"));
 const NoAccess_1 = __importDefault(require("./NoAccess"));
-const CheckAccess = ({ roles, allow, params, match, busy: BusyComponent = () => null, noAccess: NoAccessComponent = NoAccess_1.default, children, }) => {
+const NullComponent_1 = __importDefault(require("./NullComponent"));
+const CheckAccess = ({ roles, allow, params, match, busy: BusyComponent = NullComponent_1.default, noAccess: NoAccessComponent = NoAccess_1.default, children, }) => {
     const { checking, hasAccess } = (0, useCheckAccess_1.default)({ roles, allow, params, match });
     if (checking) {
         return (0, jsx_runtime_1.jsx)(BusyComponent, {});

package/lib/NullComponent.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+declare const NullComponent: React.FC;
+export default NullComponent;
+//# sourceMappingURL=NullComponent.d.ts.map

package/lib/NullComponent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NullComponent.d.ts","sourceRoot":"","sources":["../src/NullComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAe,CAAC;AAE3C,eAAe,aAAa,CAAC"}

package/lib/NullComponent.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const NullComponent = () => null;
+exports.default = NullComponent;

package/lib/RbacContext.d.ts

@@ -1,6 +1,5 @@
 import React from "react";
-import { RuleParams, Rule, RuleCtor } from "@iushev/rbac";
-import RbacCheckAccess from "./RbacCheckAccess";
+import { RuleParams, Rule, RuleCtor, Identity, BaseManager } from "@iushev/rbac";
 export type RuleParamsFunction = () => RuleParams;
 export type MatchFunction = () => boolean;
 export type CheckAccessOptions = {
@@ -10,19 +9,19 @@ export type CheckAccessOptions = {
     match?: MatchFunction;
 };
 export type RbacContextProps = {
-    rbac: RbacCheckAccess | null;
+    rbacManager: BaseManager | null;
     checkAccess: (options: CheckAccessOptions) => Promise<boolean>;
 };
 declare const RbacContext: React.Context<RbacContextProps | null>;
 export declare const useRbac: () => RbacContextProps;
 export type RbacProviderProps = {
-    username: string;
+    identity: Identity;
     rbacUrl: string;
     token: string;
-    isSuperuser: boolean;
-    isGuest: boolean;
     ruleClasses: Map<string, RuleCtor<Rule>>;
+    afterInitManager?: (webManager: any) => void;
     children: React.ReactNode;
+    logging?: false | ((...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,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"}
+{"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;CACvB,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,CAAC;IACnB,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,CA0DpD,CAAC;AAEF,eAAO,MAAM,YAAY,yCAAuB,CAAC;AAEjD,eAAe,WAAW,CAAC"}

package/lib/RbacContext.js

@@ -41,14 +41,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 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 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);
@@ -58,70 +56,45 @@ const useRbac = () => {
     return ctx;
 };
 exports.useRbac = useRbac;
-const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClasses, children, }) => {
-    const [rbac, setRbac] = (0, react_1.useState)(null);
+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* () {
-            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);
-            }
+            const manager = new rbac_web_manager_1.WebManager({
+                path: rbacUrl,
+                authorization: () => {
+                    return token;
+                },
+                logging,
+            });
+            ruleClasses.forEach((RuleClass, ruleName) => {
+                manager.ruleClasses.set(ruleName, RuleClass);
+            });
+            yield manager.load();
+            setRbacManager(manager);
         });
         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;
-        }
-        if (!rbac) {
+    }, [logging, rbacUrl, ruleClasses, token]);
+    const checkAccess = (0, react_1.useCallback)((_a) => __awaiter(void 0, [_a], void 0, function* ({ roles, allow = true, match, params = {} }) {
+        if (!rbacManager) {
             return false;
         }
-        for (const role of roles) {
-            if (role === "?" && isGuest) {
-                // only guest users
-                return true;
-            }
-            else if (role === "@" && !isGuest) {
-                // only authenticated users
+        const matchCustom = (match) => {
+            if (!match) {
                 return true;
             }
-            else if (yield 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 = (0, react_1.useCallback)((match) => {
-        if (!match) {
-            return true;
-        }
-        return match();
-    }, []);
-    const checkAccess = (0, react_1.useCallback)((_a) => __awaiter(void 0, [_a], void 0, function* ({ roles, allow = true, match, params = {} }) {
-        return isSuperuser || ((yield matchRole(roles, params)) && matchCustom(match) && allow);
-    }), [isSuperuser, matchCustom, matchRole]);
+            return match();
+        };
+        const user = new rbac_1.RbacUser(rbacManager);
+        user.identity = identity;
+        return user.isSuperuser || ((yield (0, rbac_1.matchRole)({ user, roles, params })) && matchCustom(match) && allow);
+    }), [identity, rbacManager]);
     const value = (0, react_1.useMemo)(() => {
         return {
-            rbac,
+            rbacManager,
             checkAccess,
         };
-    }, [rbac, checkAccess]);
+    }, [rbacManager, checkAccess]);
     return (0, jsx_runtime_1.jsx)(RbacContext.Provider, { value: value, children: children });
 };
 exports.RbacProvider = RbacProvider;

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 export { default as RbacContext, RbacConsumer, RbacProvider, useRbac } from "./RbacContext";
 export { default as CheckAccess, CheckAccessProps } from "./CheckAccess";
 export { default as NoAccess } from "./NoAccess";
+export { default as NullComponent } from "./NullComponent";
 export { default as useCheckAccess } from "./useCheckAccess";
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC"}

package/lib/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useCheckAccess = exports.NoAccess = exports.CheckAccess = exports.useRbac = exports.RbacProvider = exports.RbacConsumer = exports.RbacContext = void 0;
+exports.useCheckAccess = exports.NullComponent = exports.NoAccess = exports.CheckAccess = exports.useRbac = exports.RbacProvider = exports.RbacConsumer = exports.RbacContext = void 0;
 var RbacContext_1 = require("./RbacContext");
 Object.defineProperty(exports, "RbacContext", { enumerable: true, get: function () { return __importDefault(RbacContext_1).default; } });
 Object.defineProperty(exports, "RbacConsumer", { enumerable: true, get: function () { return RbacContext_1.RbacConsumer; } });
@@ -13,5 +13,7 @@ var CheckAccess_1 = require("./CheckAccess");
 Object.defineProperty(exports, "CheckAccess", { enumerable: true, get: function () { return __importDefault(CheckAccess_1).default; } });
 var NoAccess_1 = require("./NoAccess");
 Object.defineProperty(exports, "NoAccess", { enumerable: true, get: function () { return __importDefault(NoAccess_1).default; } });
+var NullComponent_1 = require("./NullComponent");
+Object.defineProperty(exports, "NullComponent", { enumerable: true, get: function () { return __importDefault(NullComponent_1).default; } });
 var useCheckAccess_1 = require("./useCheckAccess");
 Object.defineProperty(exports, "useCheckAccess", { enumerable: true, get: function () { return __importDefault(useCheckAccess_1).default; } });

package/lib/useCheckAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCheckAccess.d.ts","sourceRoot":"","sources":["../src/useCheckAccess.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAW,MAAM,eAAe,CAAC;AAE5D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,iBAAS,cAAc,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,kBAAkB,oBAyC1E;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"useCheckAccess.d.ts","sourceRoot":"","sources":["../src/useCheckAccess.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAW,MAAM,eAAe,CAAC;AAE5D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,iBAAS,cAAc,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,kBAAkB,oBA4C1E;AAED,eAAe,cAAc,CAAC"}

package/lib/useCheckAccess.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
 const RbacContext_1 = require("./RbacContext");
@@ -10,29 +19,31 @@ function useCheckAccess({ roles, allow, params, match }) {
     });
     (0, react_1.useEffect)(() => {
         let subscribed = true;
-        setState({
-            checking: true,
-            hasAccess: false,
-        });
-        rbac
-            .checkAccess({ roles, allow, params, match })
-            .then((result) => {
-            if (subscribed) {
-                setState({
-                    checking: false,
-                    hasAccess: result,
-                });
+        const checkAccess = () => __awaiter(this, void 0, void 0, function* () {
+            setState({
+                checking: true,
+                hasAccess: false,
+            });
+            try {
+                const result = yield rbac.checkAccess({ roles, allow, params, match });
+                if (subscribed) {
+                    setState({
+                        checking: false,
+                        hasAccess: result,
+                    });
+                }
             }
-        })
-            .catch((err) => {
-            console.error(err);
-            if (subscribed) {
-                setState({
-                    checking: false,
-                    hasAccess: false,
-                });
+            catch (err) {
+                console.error(err);
+                if (subscribed) {
+                    setState({
+                        checking: false,
+                        hasAccess: false,
+                    });
+                }
             }
         });
+        checkAccess();
         return () => {
             subscribed = false;
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iushev/react-rbac",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "private": false,
   "author": "Ivaylo Ushev",
   "description": "",
@@ -9,36 +9,38 @@
   "main": "./lib/index",
   "types": "./lib/index",
   "scripts": {
-    "build": "tsc",
+    "build": "rimraf ./lib && tsc",
     "watch": "tsc -w --preserveWatchOutput",
     "test": "jest --runInBand",
     "test:watch": "jest --watchAll --runInBand",
     "coverage": "jest --coverage --runInBand",
     "lint": "eslint src",
-    "preversion": "rimraf ./lib && npm run build"
+    "preversion": "npm run build"
   },
   "dependencies": {
     "http-status-codes": "^2.3.0"
   },
   "devDependencies": {
-    "@types/react": "^19.0.2",
-    "@types/react-dom": "^19.0.2",
-    "@typescript-eslint/eslint-plugin": "^8.18.1",
-    "@typescript-eslint/parser": "^8.18.1",
-    "eslint": "^9.17.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^5.1.0",
-    "jest": "^29.7.0",
-    "prettier": "^3.4.2",
-    "rimraf": "^6.0.1",
-    "ts-jest": "^29.2.5",
-    "typescript": "^5.7.2"
+    "@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",
+    "eslint": "^9.39.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.4",
+    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "jest": "^30.2.0",
+    "prettier": "^3.7.4",
+    "rimraf": "^6.1.2",
+    "ts-jest": "^29.4.6",
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@iushev/rbac": "^1.0.50",
-    "axios": "^1.7.9",
+    "@iushev/rbac": "^1.0.54",
+    "@iushev/rbac-web-manager": "^1.0.2",
+    "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/CheckAccess.tsx

@@ -3,6 +3,7 @@ import React from "react";
 import { CheckAccessOptions } from "./RbacContext";
 import useCheckAccess from "./useCheckAccess";
 import NoAccess from "./NoAccess";
+import NullComponent from "./NullComponent";
 
 export type CheckAccessProps = CheckAccessOptions & {
   busy?: React.ComponentType;
@@ -15,7 +16,7 @@ const CheckAccess: React.FC<CheckAccessProps> = ({
   allow,
   params,
   match,
-  busy: BusyComponent = () => null,
+  busy: BusyComponent = NullComponent,
   noAccess: NoAccessComponent = NoAccess,
   children,
 }) => {

package/src/NullComponent.tsx

@@ -0,0 +1,5 @@
+import React from "react";
+
+const NullComponent: React.FC = () => null;
+
+export default NullComponent;

package/src/RbacContext.tsx

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

package/src/index.ts

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

package/src/useCheckAccess.ts

@@ -16,22 +16,22 @@ function useCheckAccess({ roles, allow, params, match }: CheckAccessOptions) {
 
   useEffect(() => {
     let subscribed = true;
-    setState({
-      checking: true,
-      hasAccess: false,
-    });
-
-    rbac
-      .checkAccess({ roles, allow, params, match })
-      .then((result) => {
+
+    const checkAccess = async () => {
+      setState({
+        checking: true,
+        hasAccess: false,
+      });
+
+      try {
+        const result = await rbac.checkAccess({ roles, allow, params, match });
         if (subscribed) {
           setState({
             checking: false,
             hasAccess: result,
           });
         }
-      })
-      .catch((err) => {
+      } catch (err) {
         console.error(err);
         if (subscribed) {
           setState({
@@ -39,7 +39,10 @@ function useCheckAccess({ roles, allow, params, match }: CheckAccessOptions) {
             hasAccess: false,
           });
         }
-      });
+      }
+    };
+
+    checkAccess();
 
     return () => {
       subscribed = false;

package/lib/RbacCheckAccess.d.ts

@@ -1,18 +0,0 @@
-import { AxiosRequestConfig } from "axios";
-import { Assignment, BaseCheckAccess, BaseCheckAccessOptions, RuleParams } from "@iushev/rbac";
-export type RbacCheckAccessOptions = BaseCheckAccessOptions & {
-    path: string;
-    authorization: () => string;
-};
-export default class RbacCheckAccess extends BaseCheckAccess {
-    private readonly axiosInstance;
-    protected assignments: Map<string, Map<string, Assignment>>;
-    constructor(options: RbacCheckAccessOptions);
-    checkAccess(username: string, itemName: string, params: RuleParams): Promise<boolean>;
-    load(config?: AxiosRequestConfig): Promise<void>;
-    private getRbacItems;
-    private getRbacParents;
-    private getRbacRules;
-    private getRbacAssignments;
-}
-//# sourceMappingURL=RbacCheckAccess.d.ts.map

package/lib/RbacCheckAccess.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RbacCheckAccess.d.ts","sourceRoot":"","sources":["../src/RbacCheckAccess.ts"],"names":[],"mappings":"AAAA,OAAc,EAAiB,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAGjE,OAAO,EACL,UAAU,EACV,eAAe,EACf,sBAAsB,EAOtB,UAAU,EACX,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,GAAG;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,MAAM,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,eAAe;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAE9C,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAa;gBAE5D,OAAO,EAAE,sBAAsB;IAkB9B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAQrF,IAAI,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,cAAc;IA4BtB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,kBAAkB;CAa3B"}

package/lib/RbacCheckAccess.js

@@ -1,137 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const axios_1 = __importDefault(require("axios"));
-const http_status_codes_1 = __importDefault(require("http-status-codes"));
-const rbac_1 = require("@iushev/rbac");
-class RbacCheckAccess extends rbac_1.BaseCheckAccess {
-    constructor(options) {
-        super(options);
-        this.assignments = new Map();
-        this.axiosInstance = axios_1.default.create({
-            baseURL: options.path,
-        });
-        this.axiosInstance.interceptors.request.use((config) => {
-            if (options.authorization) {
-                const token = options.authorization();
-                config.headers.Authorization = "Bearer " + token;
-            }
-            else {
-                config.headers.Authorization = undefined;
-            }
-            return config;
-        });
-    }
-    checkAccess(username, itemName, params) {
-        const _super = Object.create(null, {
-            checkAccess: { get: () => super.checkAccess }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (this.items.size === 0) {
-                yield this.load();
-            }
-            return _super.checkAccess.call(this, username, itemName, params, (_a = this.assignments.get(username)) !== null && _a !== void 0 ? _a : new Map());
-        });
-    }
-    load(config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let _rbac;
-            try {
-                console.log("Load RBAC");
-                const response = yield this.axiosInstance.get("/rbac", config);
-                _rbac = response.data;
-            }
-            catch (err) {
-                if (axios_1.default.isAxiosError(err) && ((_a = err.response) === null || _a === void 0 ? void 0 : _a.status) === http_status_codes_1.default.NOT_FOUND) {
-                    _rbac = {
-                        assignments: {},
-                        items: {},
-                        rules: {},
-                    };
-                }
-                else {
-                    throw err;
-                }
-            }
-            this.items = this.getRbacItems(_rbac);
-            this.parents = this.getRbacParents(_rbac);
-            this.rules = this.getRbacRules(_rbac);
-            this.assignments = this.getRbacAssignments(_rbac);
-        });
-    }
-    getRbacItems({ items }) {
-        return Object.keys(items).reduce((prevValue, name) => {
-            var _a, _b;
-            const item = items[name];
-            const ItemClass = item.type === rbac_1.ItemType.permission ? rbac_1.Permission : rbac_1.Role;
-            prevValue.set(name, new ItemClass({
-                name,
-                description: (_a = item.description) !== null && _a !== void 0 ? _a : null,
-                ruleName: (_b = item.ruleName) !== null && _b !== void 0 ? _b : null,
-            }));
-            return prevValue;
-        }, new Map());
-    }
-    getRbacParents({ items }) {
-        return Object.keys(items).reduce((prevValue, name) => {
-            const item = items[name];
-            if (!item.children || item.children.length === 0) {
-                return prevValue;
-            }
-            item.children.forEach((childName) => {
-                if (!this.items.has(childName)) {
-                    return;
-                }
-                let child = prevValue.get(childName);
-                if (!child) {
-                    child = new Map();
-                    prevValue.set(childName, child);
-                }
-                const item = this.items.get(name);
-                if (item) {
-                    child.set(name, item);
-                }
-            });
-            return prevValue;
-        }, new Map());
-    }
-    getRbacRules({ rules }) {
-        return Object.keys(rules).reduce((prevValue, name) => {
-            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.ruleData));
-            prevValue.set(name, rule);
-            return prevValue;
-        }, new Map());
-    }
-    getRbacAssignments({ assignments }) {
-        return Object.keys(assignments).reduce((prevValue, username) => {
-            const _assignments = assignments[username];
-            _assignments.forEach((itemName) => {
-                var _a;
-                if (prevValue.has(username)) {
-                    (_a = prevValue.get(username)) === null || _a === void 0 ? void 0 : _a.set(itemName, new rbac_1.Assignment(username, itemName));
-                }
-                else {
-                    prevValue.set(username, new Map([[itemName, new rbac_1.Assignment(username, itemName)]]));
-                }
-            });
-            return prevValue;
-        }, new Map());
-    }
-}
-exports.default = RbacCheckAccess;

package/src/RbacCheckAccess.ts

@@ -1,144 +0,0 @@
-import axios, { AxiosInstance, AxiosRequestConfig } from "axios";
-import statusCodes from "http-status-codes";
-
-import {
-  Assignment,
-  BaseCheckAccess,
-  BaseCheckAccessOptions,
-  IItem,
-  ItemType,
-  Permission,
-  RBACResponse,
-  Role,
-  Rule,
-  RuleParams,
-} from "@iushev/rbac";
-
-export type RbacCheckAccessOptions = BaseCheckAccessOptions & {
-  path: string;
-  authorization: () => string;
-};
-
-export default class RbacCheckAccess extends BaseCheckAccess {
-  private readonly axiosInstance: AxiosInstance;
-
-  protected assignments: Map<string, Map<string, Assignment>> = new Map();
-
-  constructor(options: RbacCheckAccessOptions) {
-    super(options);
-
-    this.axiosInstance = axios.create({
-      baseURL: options.path,
-    });
-
-    this.axiosInstance.interceptors.request.use((config) => {
-      if (options.authorization) {
-        const token = options.authorization();
-        config.headers.Authorization = "Bearer " + token;
-      } else {
-        config.headers.Authorization = undefined;
-      }
-      return config;
-    });
-  }
-
-  public async checkAccess(username: string, itemName: string, params: RuleParams): Promise<boolean> {
-    if (this.items.size === 0) {
-      await this.load();
-    }
-
-    return super.checkAccess(username, itemName, params, this.assignments.get(username) ?? new Map());
-  }
-
-  public async load(config?: AxiosRequestConfig): Promise<void> {
-    let _rbac: RBACResponse;
-    try {
-      console.log("Load RBAC");
-      const response = await this.axiosInstance.get<RBACResponse>("/rbac", config);
-      _rbac = response.data;
-    } catch (err) {
-      if (axios.isAxiosError(err) && err.response?.status === statusCodes.NOT_FOUND) {
-        _rbac = {
-          assignments: {},
-          items: {},
-          rules: {},
-        };
-      } else {
-        throw err;
-      }
-    }
-
-    this.items = this.getRbacItems(_rbac);
-    this.parents = this.getRbacParents(_rbac);
-    this.rules = this.getRbacRules(_rbac);
-    this.assignments = this.getRbacAssignments(_rbac);
-  }
-
-  private getRbacItems({ items }: RBACResponse) {
-    return Object.keys(items).reduce<Map<string, IItem>>((prevValue, name) => {
-      const item = items[name];
-      const ItemClass = item.type === ItemType.permission ? Permission : Role;
-      prevValue.set(
-        name,
-        new ItemClass({
-          name,
-          description: item.description ?? null,
-          ruleName: item.ruleName ?? null,
-        }),
-      );
-      return prevValue;
-    }, new Map());
-  }
-
-  private getRbacParents({ items }: RBACResponse) {
-    return Object.keys(items).reduce<Map<string, Map<string, IItem>>>((prevValue, name) => {
-      const item = items[name];
-      if (!item.children || item.children.length === 0) {
-        return prevValue;
-      }
-      item.children.forEach((childName: string) => {
-        if (!this.items.has(childName)) {
-          return;
-        }
-
-        let child = prevValue.get(childName);
-
-        if (!child) {
-          child = new Map();
-          prevValue.set(childName, child);
-        }
-
-        const item = this.items.get(name);
-        if (item) {
-          child.set(name, item);
-        }
-      });
-
-      return prevValue;
-    }, new Map());
-  }
-
-  private getRbacRules({ rules }: RBACResponse) {
-    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.ruleData));
-      prevValue.set(name, rule);
-      return prevValue;
-    }, new Map());
-  }
-
-  private getRbacAssignments({ assignments }: RBACResponse) {
-    return Object.keys(assignments).reduce<Map<string, Map<string, Assignment>>>((prevValue, username) => {
-      const _assignments = assignments[username];
-      _assignments.forEach((itemName) => {
-        if (prevValue.has(username)) {
-          prevValue.get(username)?.set(itemName, new Assignment(username, itemName));
-        } else {
-          prevValue.set(username, new Map([[itemName, new Assignment(username, itemName)]]));
-        }
-      });
-      return prevValue;
-    }, new Map());
-  }
-}