@iushev/react-rbac 1.0.31 → 1.0.34

package/lib/RbacCheckAccess.d.ts

@@ -1,3 +1,4 @@
+import { AxiosRequestConfig } from "axios";
 import { Assignment, BaseCheckAccess, BaseCheckAccessOptions, RuleParams } from "@iushev/rbac";
 export declare type RbacCheckAccessOptions = BaseCheckAccessOptions & {
     path: string;
@@ -8,7 +9,7 @@ export default class RbacCheckAccess extends BaseCheckAccess {
     protected assignments: Map<string, Map<string, Assignment>>;
     constructor(options: RbacCheckAccessOptions);
     checkAccess(username: string, itemName: string, params: RuleParams): Promise<boolean>;
-    load(): Promise<void>;
+    load(config?: AxiosRequestConfig): Promise<void>;
     private getRbacItems;
     private getRbacParents;
     private getRbacRules;

package/lib/RbacCheckAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RbacCheckAccess.d.ts","sourceRoot":"","sources":["../src/RbacCheckAccess.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EACV,eAAe,EACf,sBAAsB,EAOtB,UAAU,EACX,MAAM,cAAc,CAAC;AAEtB,oBAAY,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,aAAa,CAAgB;IAErC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAa;gBAE5D,OAAO,EAAE,sBAAsB;IAsB9B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAQrF,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBlC,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,cAAc;IAsBtB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,kBAAkB;CAa3B"}
+{"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,oBAAY,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,aAAa,CAAgB;IAErC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAa;gBAE5D,OAAO,EAAE,sBAAsB;IAsB9B,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

@@ -48,13 +48,13 @@ class RbacCheckAccess extends rbac_1.BaseCheckAccess {
             return _super.checkAccess.call(this, username, itemName, params, (_a = this.assignments.get(username)) !== null && _a !== void 0 ? _a : new Map());
         });
     }
-    load() {
+    load(config) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let _rbac;
             try {
                 console.log("Load RBAC");
-                const response = yield this.axiosInstance.get("/rbac");
+                const response = yield this.axiosInstance.get("/rbac", config);
                 _rbac = response.data;
             }
             catch (err) {
@@ -98,10 +98,15 @@ class RbacCheckAccess extends rbac_1.BaseCheckAccess {
                 if (!this.items.has(childName)) {
                     return;
                 }
-                if (!prevValue.has(childName)) {
-                    prevValue.set(childName, new Map());
+                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);
                 }
-                prevValue.get(childName).set(name, this.items.get(name));
             });
             return prevValue;
         }, new Map());

package/lib/RbacContext.js

@@ -41,7 +41,7 @@ const react_1 = __importStar(require("react"));
 const RbacCheckAccess_1 = __importDefault(require("./RbacCheckAccess"));
 const RbacContext = react_1.default.createContext({
     rbac: null,
-    checkAccess: (_options) => __awaiter(void 0, void 0, void 0, function* () { return true; }),
+    checkAccess: () => __awaiter(void 0, void 0, void 0, function* () { return true; }),
 });
 const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClasses, children, }) => {
     const [rbac, setRbac] = (0, react_1.useState)(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iushev/react-rbac",
-  "version": "1.0.31",
+  "version": "1.0.34",
   "private": false,
   "author": "Ivaylo Ushev",
   "description": "",
@@ -21,24 +21,24 @@
     "http-status-codes": "^2.2.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.24",
-    "@types/react-dom": "^18.0.8",
-    "@typescript-eslint/eslint-plugin": "^5.41.0",
-    "@typescript-eslint/parser": "^5.41.0",
-    "eslint": "^8.26.0",
-    "eslint-config-prettier": "^8.5.0",
+    "@types/react": "^18.0.27",
+    "@types/react-dom": "^18.0.10",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
+    "eslint": "^8.32.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.31.10",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "jest": "^29.2.2",
-    "prettier": "^2.7.1",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.8.4"
+    "jest": "^29.4.1",
+    "prettier": "^2.8.3",
+    "rimraf": "^4.1.2",
+    "ts-jest": "^29.0.5",
+    "typescript": "^4.9.4"
   },
   "peerDependencies": {
-    "@iushev/rbac": "^1.0.40",
-    "axios": "^1.1.3",
+    "@iushev/rbac": "^1.0.42",
+    "axios": "^1.2.5",
     "react": "^16.14.0 || ^17.0.2 || ^18.2.0",
     "react-dom": "^16.14.0 || ^17.0.2 || ^18.2.0"
   },

package/src/RbacCheckAccess.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosInstance } from "axios";
+import axios, { AxiosInstance, AxiosRequestConfig } from "axios";
 import statusCodes from "http-status-codes";
 
 import {
@@ -54,11 +54,11 @@ export default class RbacCheckAccess extends BaseCheckAccess {
     return super.checkAccess(username, itemName, params, this.assignments.get(username) ?? new Map());
   }
 
-  public async load(): Promise<void> {
+  public async load(config?: AxiosRequestConfig): Promise<void> {
     let _rbac: RBACResponse;
     try {
       console.log("Load RBAC");
-      const response = await this.axiosInstance.get<RBACResponse>("/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) {
@@ -105,11 +105,17 @@ export default class RbacCheckAccess extends BaseCheckAccess {
           return;
         }
 
-        if (!prevValue.has(childName)) {
-          prevValue.set(childName, new Map());
+        let child = prevValue.get(childName);
+
+        if (!child) {
+          child = new Map();
+          prevValue.set(childName, child);
         }
 
-        prevValue.get(childName)!.set(name, this.items.get(name)!);
+        const item = this.items.get(name);
+        if (item) {
+          child.set(name, item);
+        }
       });
 
       return prevValue;

package/src/RbacContext.tsx

@@ -19,7 +19,7 @@ export type RbacContextProps = {
 
 const RbacContext = React.createContext<RbacContextProps>({
   rbac: null,
-  checkAccess: async (_options: CheckAccessOptions) => true,
+  checkAccess: async () => true,
 });
 
 export type RbacProviderProps = {