authscape 1.0.420 → 1.0.424

package/index.js

@@ -26,6 +26,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+// import { authService, apiService, setupOEMProps, OEMStyleSheet } from 'authscape';
+
 function AuthScapeApp(_ref) {
   var Component = _ref.Component,
     layout = _ref.layout,
@@ -40,6 +42,10 @@ function AuthScapeApp(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     frontEndLoadedState = _useState2[0],
     setFrontEndLoadedState = _useState2[1];
+  var _useState3 = (0, _react.useState)(null),
+    _useState4 = _slicedToArray(_useState3, 2),
+    signedInUserState = _useState4[0],
+    setSignedInUserState = _useState4[1];
   var loadingAuth = (0, _react.useRef)(false);
   var frontEndLoaded = (0, _react.useRef)(false);
   var signedInUser = (0, _react.useRef)(null);
@@ -156,12 +162,8 @@ function AuthScapeApp(_ref) {
           case 6:
             setFrontEndLoadedState(true);
             frontEndLoaded.current = true;
-
-            // if (enforceLoggedIn)
-            // {
-            //     await authService().login();
-            // }
-          case 8:
+            setSignedInUserState(signedInUser.current);
+          case 9:
           case "end":
             return _context2.stop();
         }
@@ -178,6 +180,11 @@ function AuthScapeApp(_ref) {
       validateUserSignedIn();
     }
   }
+  (0, _react.useEffect)(function () {
+    if (signedInUserState == null && enforceLoggedIn && pathname != "/signin-oidc" && frontEndLoaded.current == true) {
+      authService().login();
+    }
+  }, [signedInUserState, enforceLoggedIn]);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_head["default"], null, /*#__PURE__*/_react["default"].createElement("meta", {
     name: "viewport",
     content: "width=device-width, initial-scale=0.86, maximum-scale=5.0, minimum-scale=0.86"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.420",
+  "version": "1.0.424",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/AuthScapeApp.js

@@ -1,4 +1,4 @@
-import React, {useState, useRef} from 'react';
+import React, {useState, useRef, useEffect} from 'react';
 import { ToastContainer, toast } from 'react-toastify';
 import { ThemeProvider } from '@mui/material/styles';
 import Head from "next/head";
@@ -6,11 +6,14 @@ import { useSearchParams, usePathname } from 'next/navigation';
 import axios from 'axios';
 import querystring from "query-string";
 import { setCookie } from 'nookies'
+// import { authService, apiService, setupOEMProps, OEMStyleSheet } from 'authscape';
 
 export function AuthScapeApp ({Component, layout, pageProps, muiTheme = {}, enforceLoggedIn = false, enableAuth = true}) {
 
     const [frontEndLoadedState, setFrontEndLoadedState] = useState(false);
 
+    const [signedInUserState, setSignedInUserState] = useState(null);
+
     const loadingAuth = useRef(false);
     const frontEndLoaded = useRef(false);
     const signedInUser = useRef(null);
@@ -115,11 +118,7 @@ export function AuthScapeApp ({Component, layout, pageProps, muiTheme = {}, enfo
 
         setFrontEndLoadedState(true);
         frontEndLoaded.current = true;
-
-        // if (enforceLoggedIn)
-        // {
-        //     await authService().login();
-        // }
+        setSignedInUserState(signedInUser.current);
     }
 
     if (queryCode != null)
@@ -134,6 +133,15 @@ export function AuthScapeApp ({Component, layout, pageProps, muiTheme = {}, enfo
         }
     }
 
+    useEffect(() => {
+
+        if (signedInUserState == null && enforceLoggedIn && pathname != "/signin-oidc" && frontEndLoaded.current == true)
+        {
+            authService().login();
+        }
+
+    }, [signedInUserState, enforceLoggedIn]);
+
     return (
         <>
             <Head>