@digitaldefiance/express-suite-react-components 2.1.49 → 2.1.50

package/README.md

@@ -261,6 +261,10 @@ MIT © Digital Defiance
 
 ## ChangeLog
 
+### v2.1.50
+
+- Fix PrivateRoute/UnAuthRoute
+
 ### v2.1.49
 
 - Add default exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitaldefiance/express-suite-react-components",
-  "version": "2.1.49",
+  "version": "2.1.50",
   "description": "React MUI components for Digital Defiance Express Suite",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@digitaldefiance/i18n-lib": "2.1.40",
-    "@digitaldefiance/suite-core-lib": "2.1.46",
+    "@digitaldefiance/suite-core-lib": "2.1.50",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
     "@mui/icons-material": "^7.0.2",

package/src/auth/PrivateRoute.d.ts

@@ -1,10 +1,8 @@
 import { FC, ReactNode } from 'react';
-export interface PrivateRouteProps {
+interface PrivateRouteProps {
     children: ReactNode;
-    isAuthenticated: boolean;
-    isCheckingAuth: boolean;
     redirectTo?: string;
-    loadingComponent?: ReactNode;
 }
-export declare const PrivateRoute: FC<PrivateRouteProps>;
+declare const PrivateRoute: FC<PrivateRouteProps>;
+export default PrivateRoute;
 //# sourceMappingURL=PrivateRoute.d.ts.map

package/src/auth/PrivateRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PrivateRoute.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-express-suite-react-components/src/auth/PrivateRoute.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGtC,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,SAAS,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,SAAS,CAAC;CAC9B;AAED,eAAO,MAAM,YAAY,EAAE,EAAE,CAAC,iBAAiB,CAkB9C,CAAC"}
+{"version":3,"file":"PrivateRoute.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-express-suite-react-components/src/auth/PrivateRoute.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,SAAS,EAAc,MAAM,OAAO,CAAC;AAMlD,UAAU,iBAAiB;IACzB,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,QAAA,MAAM,YAAY,EAAE,EAAE,CAAC,iBAAiB,CAcvC,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/src/auth/PrivateRoute.js

@@ -1,16 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrivateRoute = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
 const react_router_dom_1 = require("react-router-dom");
-const PrivateRoute = ({ children, isAuthenticated, isCheckingAuth, redirectTo = '/login', loadingComponent = (0, jsx_runtime_1.jsx)("div", { children: "Checking authentication..." }), }) => {
+const AuthProvider_1 = require("../contexts/AuthProvider");
+const contexts_1 = require("../contexts");
+const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
+const PrivateRoute = ({ children, redirectTo }) => {
+    const { tComponent } = (0, contexts_1.useI18n)();
+    const { isAuthenticated, isCheckingAuth } = (0, react_1.useContext)(AuthProvider_1.AuthContext);
     const location = (0, react_router_dom_1.useLocation)();
     if (isCheckingAuth) {
-        return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: loadingComponent });
+        return (0, jsx_runtime_1.jsxs)("div", { children: [tComponent(suite_core_lib_1.SuiteCoreComponentId, suite_core_lib_1.SuiteCoreStringKey.Common_CheckingAuthentication), "..."] });
     }
     if (!isAuthenticated) {
-        return (0, jsx_runtime_1.jsx)(react_router_dom_1.Navigate, { to: redirectTo, state: { from: location }, replace: true });
+        return (0, jsx_runtime_1.jsx)(react_router_dom_1.Navigate, { to: redirectTo ?? "/login", state: { from: location }, replace: true });
     }
     return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children });
 };
-exports.PrivateRoute = PrivateRoute;
+exports.default = PrivateRoute;

package/src/auth/UnAuthRoute.d.ts

@@ -1,10 +1,7 @@
 import { FC, ReactNode } from 'react';
 export interface UnAuthRouteProps {
     children: ReactNode;
-    isAuthenticated: boolean;
-    isCheckingAuth: boolean;
     redirectTo?: string;
-    loadingComponent?: ReactNode;
 }
 export declare const UnAuthRoute: FC<UnAuthRouteProps>;
 //# sourceMappingURL=UnAuthRoute.d.ts.map

package/src/auth/UnAuthRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnAuthRoute.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-express-suite-react-components/src/auth/UnAuthRoute.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGtC,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,SAAS,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,SAAS,CAAC;CAC9B;AAED,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC,gBAAgB,CAkB5C,CAAC"}
+{"version":3,"file":"UnAuthRoute.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-express-suite-react-components/src/auth/UnAuthRoute.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,SAAS,EAAc,MAAM,OAAO,CAAC;AAKlD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC,gBAAgB,CAiB5C,CAAC"}

package/src/auth/UnAuthRoute.js

@@ -2,14 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnAuthRoute = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
 const react_router_dom_1 = require("react-router-dom");
-const UnAuthRoute = ({ children, isAuthenticated, isCheckingAuth, redirectTo = '/dashboard', loadingComponent = (0, jsx_runtime_1.jsx)("div", { children: "Checking authentication..." }), }) => {
+const contexts_1 = require("../contexts");
+const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
+const UnAuthRoute = ({ children, redirectTo = '/dashboard', }) => {
+    const { isAuthenticated, isCheckingAuth } = (0, react_1.useContext)(contexts_1.AuthContext);
+    const { tComponent } = (0, contexts_1.useI18n)();
     const location = (0, react_router_dom_1.useLocation)();
     if (isCheckingAuth) {
-        return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: loadingComponent });
+        return (0, jsx_runtime_1.jsxs)("div", { children: [tComponent(suite_core_lib_1.SuiteCoreComponentId, suite_core_lib_1.SuiteCoreStringKey.Common_CheckingAuthentication), "..."] });
     }
     if (isAuthenticated) {
-        return (0, jsx_runtime_1.jsx)(react_router_dom_1.Navigate, { to: redirectTo, state: { from: location }, replace: true });
+        return (0, jsx_runtime_1.jsx)(react_router_dom_1.Navigate, { to: redirectTo ?? "/dashboard", state: { from: location }, replace: true });
     }
     return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children });
 };

package/src/components/ApiAccess.d.ts

@@ -1,5 +1,6 @@
 import { FC } from 'react';
 export interface ApiAccessProps {
+    token?: string | null;
     labels?: {
         title?: string;
         tokenNotAvailable?: string;

package/src/components/ApiAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApiAccess.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-express-suite-react-components/src/components/ApiAccess.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,EAAE,EAAY,MAAM,OAAO,CAAC;AA4BrC,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE;QACP,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,EAAE,CAAC,EAAE,MAAM,CAAC;KACb,CAAC;CACH;AAED,eAAO,MAAM,SAAS,EAAE,EAAE,CAAC,cAAc,CA4ExC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"ApiAccess.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-express-suite-react-components/src/components/ApiAccess.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,EAAE,EAAY,MAAM,OAAO,CAAC;AA4BrC,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE;QACP,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,EAAE,CAAC,EAAE,MAAM,CAAC;KACb,CAAC;CACH;AAED,eAAO,MAAM,SAAS,EAAE,EAAE,CAAC,cAAc,CA8ExC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/src/components/ApiAccess.js

@@ -29,8 +29,9 @@ const ApiAccessTitle = (0, material_1.styled)(material_1.Typography)(({ theme })
     marginBottom: theme.spacing(3),
     color: theme.palette.primary.main,
 }));
-const ApiAccess = ({ labels = {}, }) => {
-    const { token } = (0, contexts_1.useAuth)();
+const ApiAccess = ({ token: tokenProp, labels = {}, }) => {
+    const { token: authToken } = (0, contexts_1.useAuth)();
+    const token = tokenProp !== undefined ? tokenProp : authToken;
     const { tComponent } = (0, contexts_1.useI18n)();
     const [dialogOpen, setDialogOpen] = (0, react_1.useState)(false);
     const [isError, setIsError] = (0, react_1.useState)(false);