@iushev/react-rbac 1.0.13 → 1.0.16

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.js

@@ -22,12 +22,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;
         });

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.d.ts

@@ -1,6 +1,7 @@
 import { CheckAccessOptions } from "./RbacContext";
-declare function useCheckAccess({ roles, allow, params, match }: CheckAccessOptions): {
+export declare type CheckAssessState = {
     checking: boolean;
     hasAccess: boolean;
 };
+declare function useCheckAccess({ roles, allow, params, match }: CheckAccessOptions): CheckAssessState;
 export default useCheckAccess;

package/build/useCheckAccess.js

@@ -6,36 +6,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
 const RbacContext_1 = __importDefault(require("./RbacContext"));
 function useCheckAccess({ roles, allow, params, match }) {
-    const componentIsMounted = react_1.useRef(true);
-    const rbac = react_1.useContext(RbacContext_1.default);
-    const [checking, setChecking] = react_1.useState(false);
-    const [hasAccess, setHasAccess] = react_1.useState(false);
-    react_1.useEffect(() => {
-        return () => {
-            componentIsMounted.current = false;
-        };
-    }, []);
-    react_1.useEffect(() => {
-        setChecking(true);
-        setHasAccess(false);
+    const rbac = (0, react_1.useContext)(RbacContext_1.default);
+    const [state, setState] = (0, react_1.useState)({
+        checking: true,
+        hasAccess: false,
+    });
+    (0, react_1.useEffect)(() => {
+        let subscribed = true;
+        setState({
+            checking: true,
+            hasAccess: false,
+        });
         rbac
             .checkAccess({ roles, allow, params, match })
             .then((result) => {
-            if (componentIsMounted.current) {
-                setChecking(false);
-                setHasAccess(result);
+            if (subscribed) {
+                setState({
+                    checking: false,
+                    hasAccess: result,
+                });
             }
         })
             .catch((err) => {
-            if (componentIsMounted.current) {
-                setChecking(false);
-                setHasAccess(false);
+            console.error(err);
+            if (subscribed) {
+                setState({
+                    checking: false,
+                    hasAccess: false,
+                });
             }
         });
+        return () => {
+            subscribed = false;
+        };
     }, [rbac, roles, allow, params, match]);
-    return {
-        checking,
-        hasAccess,
-    };
+    return state;
 }
 exports.default = useCheckAccess;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iushev/react-rbac",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "private": false,
   "author": "Ivaylo Ushev",
   "description": "",
@@ -12,13 +12,13 @@
     "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"
   },

package/src/RbacCheckAccess.ts

@@ -31,11 +31,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;
     });