@iushev/react-rbac 1.0.14 → 1.0.17

package/build/CheckAccess.js

@@ -7,10 +7,10 @@ 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 { checking, hasAccess } = useCheckAccess_1.default({ roles, allow, params, match });
+    const { checking, hasAccess } = (0, useCheckAccess_1.default)({ roles, allow, params, match });
     if (checking) {
-        return jsx_runtime_1.jsx(BusyComponent, {}, void 0);
+        return (0, jsx_runtime_1.jsx)(BusyComponent, {});
     }
-    return jsx_runtime_1.jsx(jsx_runtime_1.Fragment, { children: hasAccess ? jsx_runtime_1.jsx(jsx_runtime_1.Fragment, { children: children }, void 0) : jsx_runtime_1.jsx(NoAccessComponent, {}, void 0) }, void 0);
+    return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: hasAccess ? (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children }) : (0, jsx_runtime_1.jsx)(NoAccessComponent, {}) });
 };
 exports.default = CheckAccess;

package/build/NoAccess.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const NoAccess = () => {
-    return (jsx_runtime_1.jsxs("div", { children: [jsx_runtime_1.jsx("h4", { children: "Access Denied" }, void 0),
-            jsx_runtime_1.jsx("h5", { children: "You don't have permission to access." }, void 0)] }, void 0));
+    return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h4", { children: "Access Denied" }), (0, jsx_runtime_1.jsx)("h5", { children: "You don't have permission to access." })] }));
 };
 exports.default = NoAccess;

package/build/RbacCheckAccess.d.ts

@@ -9,4 +9,8 @@ export default class RbacCheckAccess extends BaseCheckAccess {
     constructor(options: RbacCheckAccessOptions);
     checkAccess(username: string, itemName: string, params: RuleParams): Promise<boolean>;
     load(): Promise<void>;
+    private getRbacItems;
+    private getRbacParents;
+    private getRbacRules;
+    private getRbacAssignments;
 }

package/build/RbacCheckAccess.js

@@ -12,8 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const rbac_1 = require("@iushev/rbac");
 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);
@@ -22,12 +23,15 @@ class RbacCheckAccess extends rbac_1.BaseCheckAccess {
             baseURL: options.path,
         });
         this.axiosInstance.interceptors.request.use((config) => {
+            if (!config.headers) {
+                config.headers = {};
+            }
             if (options.authorization) {
                 const token = options.authorization();
                 config.headers.common["Authorization"] = "Bearer " + token;
             }
             else {
-                config.headers.common["Authorization"] = null;
+                config.headers.common["Authorization"] = "";
             }
             return config;
         });
@@ -45,71 +49,97 @@ class RbacCheckAccess extends rbac_1.BaseCheckAccess {
         });
     }
     load() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            console.log("Load RBAC");
-            const response = yield this.axiosInstance.get("/rbac");
-            const _rbac = response.data;
-            this.items = Object.keys(_rbac.items).reduce((prevValue, name) => {
-                var _a, _b;
-                const item = _rbac.items[name];
-                const ItemClass = item.type === rbac_1.ItemType.permission ? rbac_1.Permission : rbac_1.Role;
-                prevValue.set(name, new ItemClass({
-                    name,
-                    type: item.type,
-                    description: (_a = item.description) !== null && _a !== void 0 ? _a : null,
-                    ruleName: (_b = item.ruleName) !== null && _b !== void 0 ? _b : null,
-                }));
-                return prevValue;
-            }, new Map());
-            this.parents = Object.keys(_rbac.items).reduce((prevValue, name) => {
-                const item = _rbac.items[name];
-                if (!item.children || item.children.length === 0) {
-                    return prevValue;
+            let _rbac;
+            try {
+                console.log("Load RBAC");
+                const response = yield this.axiosInstance.get("/rbac");
+                _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: {},
+                    };
                 }
-                item.children.forEach((childName) => {
-                    if (!this.items.has(childName)) {
-                        return;
-                    }
-                    if (!prevValue.has(childName)) {
-                        prevValue.set(childName, new Map());
-                    }
-                    prevValue.get(childName).set(name, this.items.get(name));
-                });
+                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,
+                type: item.type,
+                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;
-            }, new Map());
-            this.rules = Object.keys(_rbac.rules).reduce((prevValue, name) => {
+            }
+            item.children.forEach((childName) => {
+                if (!this.items.has(childName)) {
+                    return;
+                }
+                if (!prevValue.has(childName)) {
+                    prevValue.set(childName, new Map());
+                }
+                prevValue.get(childName).set(name, this.items.get(name));
+            });
+            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.rule));
+            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;
-                const ruleData = _rbac.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));
-                prevValue.set(name, rule);
-                return prevValue;
-            }, new Map());
-            this.assignments = Object.keys(_rbac.assignments).reduce((prevValue, username) => {
-                const assignments = _rbac.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({
+                if (prevValue.has(username)) {
+                    (_a = prevValue.get(username)) === null || _a === void 0 ? void 0 : _a.set(itemName, new rbac_1.Assignment({
+                        itemName,
+                        username,
+                    }));
+                }
+                else {
+                    prevValue.set(username, new Map([
+                        [
                             itemName,
-                            username,
-                        }));
-                    }
-                    else {
-                        prevValue.set(username, new Map([
-                            [
+                            new rbac_1.Assignment({
                                 itemName,
-                                new rbac_1.Assignment({
-                                    itemName,
-                                    username,
-                                }),
-                            ],
-                        ]));
-                    }
-                });
-                return prevValue;
-            }, new Map());
-        });
+                                username,
+                            }),
+                        ],
+                    ]));
+                }
+            });
+            return prevValue;
+        }, new Map());
     }
 }
 exports.default = RbacCheckAccess;

package/build/RbacContext.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -39,8 +43,8 @@ const RbacContext = react_1.default.createContext({
     checkAccess: (_options) => __awaiter(void 0, void 0, void 0, function* () { return true; }),
 });
 const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClasses, children, }) => {
-    const [rbac, setRbac] = react_1.useState(null);
-    react_1.useEffect(() => {
+    const [rbac, setRbac] = (0, react_1.useState)(null);
+    (0, react_1.useEffect)(() => {
         if (!token) {
             setRbac(null);
         }
@@ -54,7 +58,7 @@ const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClas
             _rbac.load().then(() => setRbac(_rbac));
         }
     }, [rbacUrl, token]);
-    const value = react_1.useMemo(() => {
+    const value = (0, react_1.useMemo)(() => {
         const checkAccess = ({ roles, allow = true, match, params = {} }) => __awaiter(void 0, void 0, void 0, function* () {
             const matchRole = () => __awaiter(void 0, void 0, void 0, function* () {
                 if (!roles || roles.length === 0) {
@@ -98,7 +102,7 @@ const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClas
             checkAccess,
         };
     }, [rbac, username, isGuest, isSuperuser]);
-    return jsx_runtime_1.jsx(RbacContext.Provider, Object.assign({ value: value }, { children: children }), void 0);
+    return (0, jsx_runtime_1.jsx)(RbacContext.Provider, Object.assign({ value: value }, { children: children }));
 };
 exports.RbacProvider = RbacProvider;
 exports.RbacConsumer = RbacContext.Consumer;

package/build/useCheckAccess.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
 const RbacContext_1 = __importDefault(require("./RbacContext"));
 function useCheckAccess({ roles, allow, params, match }) {
-    const rbac = react_1.useContext(RbacContext_1.default);
-    const [state, setState] = react_1.useState({
+    const rbac = (0, react_1.useContext)(RbacContext_1.default);
+    const [state, setState] = (0, react_1.useState)({
         checking: true,
         hasAccess: false,
     });
-    react_1.useEffect(() => {
+    (0, react_1.useEffect)(() => {
         let subscribed = true;
         setState({
             checking: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iushev/react-rbac",
-  "version": "1.0.14",
+  "version": "1.0.17",
   "private": false,
   "author": "Ivaylo Ushev",
   "description": "",
@@ -12,17 +12,20 @@
     "test": "jest"
   },
   "devDependencies": {
-    "typescript": "^4.2.4"
+    "typescript": "^4.6.2"
   },
   "peerDependencies": {
-    "@iushev/rbac": "^1.0.19",
-    "@types/react": "^16.14.5 || ^17.0.4",
-    "@types/react-dom": "^16.9.12 || ^17.0.3",
-    "axios": "^0.21.1",
+    "@iushev/rbac": "^1.0.22",
+    "@types/react": "^16.14.5 || ^17.0.40",
+    "@types/react-dom": "^17.0.13",
+    "axios": ">= 0.26.1",
     "react": "^16.14.0 || ^17.0.2",
     "react-dom": "^16.14.0 || ^17.0.2"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "dependencies": {
+    "http-status-codes": "^2.2.0"
   }
 }

package/src/RbacCheckAccess.ts

@@ -1,3 +1,6 @@
+import axios, { AxiosInstance } from "axios";
+import statusCodes from "http-status-codes";
+
 import {
   Assignment,
   BaseCheckAccess,
@@ -11,8 +14,6 @@ import {
   RuleParams,
 } from "@iushev/rbac";
 
-import axios, { AxiosInstance } from "axios";
-
 export type RbacCheckAccessOptions = BaseCheckAccessOptions & {
   path: string;
   authorization: () => string;
@@ -31,11 +32,15 @@ export default class RbacCheckAccess extends BaseCheckAccess {
     });
 
     this.axiosInstance.interceptors.request.use((config) => {
+      if (!config.headers) {
+        config.headers = {};
+      }
+
       if (options.authorization) {
         const token = options.authorization();
-        config.headers.common["Authorization"] = "Bearer " + token;
+        (config.headers.common as any as Record<string, string>)["Authorization"] = "Bearer " + token;
       } else {
-        config.headers.common["Authorization"] = null;
+        (config.headers.common as any as Record<string, string>)["Authorization"] = "";
       }
       return config;
     });
@@ -50,12 +55,31 @@ export default class RbacCheckAccess extends BaseCheckAccess {
   }
 
   public async load(): Promise<void> {
-    console.log("Load RBAC");
-    const response = await this.axiosInstance.get<RBACResponse>("/rbac");
-    const _rbac = response.data;
+    let _rbac: RBACResponse;
+    try {
+      console.log("Load RBAC");
+      const response = await this.axiosInstance.get<RBACResponse>("/rbac");
+      _rbac = response.data;
+    } catch (err) {
+      if (axios.isAxiosError(err) && err.response?.status === statusCodes.NOT_FOUND) {
+        _rbac = {
+          assignments: {},
+          items: {},
+          rules: {},
+        };
+      }
+      throw err;
+    }
+
+    this.items = this.getRbacItems(_rbac);
+    this.parents = this.getRbacParents(_rbac);
+    this.rules = this.getRbacRules(_rbac);
+    this.assignments = this.getRbacAssignments(_rbac);
+  }
 
-    this.items = Object.keys(_rbac.items).reduce<Map<string, Item>>((prevValue, name) => {
-      const item = _rbac.items[name];
+  private getRbacItems({ items }: RBACResponse) {
+    return Object.keys(items).reduce<Map<string, Item>>((prevValue, name) => {
+      const item = items[name];
       const ItemClass = item.type === ItemType.permission ? Permission : Role;
       prevValue.set(
         name,
@@ -68,9 +92,11 @@ export default class RbacCheckAccess extends BaseCheckAccess {
       );
       return prevValue;
     }, new Map());
+  }
 
-    this.parents = Object.keys(_rbac.items).reduce<Map<string, Map<string, Item>>>((prevValue, name) => {
-      const item = _rbac.items[name];
+  private getRbacParents({ items }: RBACResponse) {
+    return Object.keys(items).reduce<Map<string, Map<string, Item>>>((prevValue, name) => {
+      const item = items[name];
       if (!item.children || item.children.length === 0) {
         return prevValue;
       }
@@ -88,45 +114,46 @@ export default class RbacCheckAccess extends BaseCheckAccess {
 
       return prevValue;
     }, new Map());
+  }
 
-    this.rules = Object.keys(_rbac.rules).reduce<Map<string, Rule>>((prevValue, name) => {
-      const ruleData = _rbac.rules[name];
+  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.rule));
       prevValue.set(name, rule);
       return prevValue;
     }, new Map());
+  }
 
-    this.assignments = Object.keys(_rbac.assignments).reduce<Map<string, Map<string, Assignment>>>(
-      (prevValue, username) => {
-        const assignments = _rbac.assignments[username];
-        assignments.forEach((itemName) => {
-          if (prevValue.has(username)) {
-            prevValue.get(username)?.set(
+  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({
               itemName,
-              new Assignment({
-                itemName,
-                username,
-              })
-            );
-          } else {
-            prevValue.set(
               username,
-              new Map([
-                [
+            })
+          );
+        } else {
+          prevValue.set(
+            username,
+            new Map([
+              [
+                itemName,
+                new Assignment({
                   itemName,
-                  new Assignment({
-                    itemName,
-                    username,
-                  }),
-                ],
-              ])
-            );
-          }
-        });
-        return prevValue;
-      },
-      new Map()
-    );
+                  username,
+                }),
+              ],
+            ])
+          );
+        }
+      });
+      return prevValue;
+    }, new Map());
   }
 }