authscape 1.0.430 → 1.0.434

package/index.js

@@ -31,6 +31,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function AuthScapeApp(_ref) {
   var Component = _ref.Component,
     layout = _ref.layout,
+    loadingLayout = _ref.loadingLayout,
     pageProps = _ref.pageProps,
     _ref$muiTheme = _ref.muiTheme,
     muiTheme = _ref$muiTheme === void 0 ? {} : _ref$muiTheme,
@@ -42,10 +43,14 @@ function AuthScapeApp(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     frontEndLoadedState = _useState2[0],
     setFrontEndLoadedState = _useState2[1];
-  var _useState3 = (0, _react.useState)(null),
+  var _useState3 = (0, _react.useState)(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    signedInUserState = _useState4[0],
-    setSignedInUserState = _useState4[1];
+    isLoadingShow = _useState4[0],
+    setIsLoadingShow = _useState4[1];
+  var _useState5 = (0, _react.useState)(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    signedInUserState = _useState6[0],
+    setSignedInUserState = _useState6[1];
   var loadingAuth = (0, _react.useRef)(false);
   var frontEndLoaded = (0, _react.useRef)(false);
   var signedInUser = (0, _react.useRef)(null);
@@ -185,6 +190,9 @@ function AuthScapeApp(_ref) {
       authService().login();
     }
   }, [signedInUserState, enforceLoggedIn, frontEndLoadedState]);
+  var setIsLoading = function setIsLoading(isLoading) {
+    setIsLoadingShow(isLoading);
+  };
   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"
@@ -196,14 +204,16 @@ function AuthScapeApp(_ref) {
   }, frontEndLoadedState != null && frontEndLoadedState && pathname != "/signin-oidc" && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, layout != null && layout({
     children: /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
       currentUser: signedInUser.current,
-      toast: _reactToastify.toast
+      toast: _reactToastify.toast,
+      setIsLoading: setIsLoading
     })),
     currentUser: signedInUser.current
   }), layout == null && /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
     currentUser: signedInUser.current,
     toast: _reactToastify.toast,
-    loadedUser: frontEndLoadedState
-  }))), /*#__PURE__*/_react["default"].createElement(_reactToastify.ToastContainer, null)), frontEndLoaded.current && process.env.microsoftClarityTrackingCode != null && process.env.staging == "production" && /*#__PURE__*/_react["default"].createElement("script", {
+    loadedUser: frontEndLoadedState,
+    setIsLoading: setIsLoading
+  }))), /*#__PURE__*/_react["default"].createElement(_reactToastify.ToastContainer, null)), loadingLayout && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, loadingLayout(isLoadingShow)), frontEndLoaded.current && process.env.microsoftClarityTrackingCode != null && process.env.staging == "production" && /*#__PURE__*/_react["default"].createElement("script", {
     dangerouslySetInnerHTML: {
       __html: "\n                        (function(c,l,a,r,i,t,y){\n                            c[a] = c[a] || function () { (c[a].q = c[a].q || []).push(arguments) };\n                            t=l.createElement(r);\n                            t.async=1;\n                            t.src=\"https://www.clarity.ms/tag/\"+i;\n                            y=l.getElementsByTagName(r)[0];\n                            y.parentNode.insertBefore(t,y);\n                        })(window, document, \"clarity\", \"script\", \"" + process.env.microsoftClarityTrackingCode + "\");"
     }

package/package.json

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

package/src/components/AuthScapeApp.js

@@ -8,10 +8,12 @@ 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}) {
+export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiTheme = {}, enforceLoggedIn = false, enableAuth = true}) {
 
     const [frontEndLoadedState, setFrontEndLoadedState] = useState(false);
 
+    const [isLoadingShow, setIsLoadingShow] = useState(false);
+
     const [signedInUserState, setSignedInUserState] = useState(null);
 
     const loadingAuth = useRef(false);
@@ -142,6 +144,11 @@ export function AuthScapeApp ({Component, layout, pageProps, muiTheme = {}, enfo
 
     }, [signedInUserState, enforceLoggedIn, frontEndLoadedState]);
 
+
+    const setIsLoading = (isLoading) => {
+        setIsLoadingShow(isLoading);
+    }
+
     return (
         <>
             <Head>
@@ -158,12 +165,12 @@ export function AuthScapeApp ({Component, layout, pageProps, muiTheme = {}, enfo
                 {frontEndLoadedState != null && frontEndLoadedState && pathname != "/signin-oidc" &&
                 <>
                     {layout != null && layout({
-                        children: <Component {...pageProps} currentUser={signedInUser.current} toast={toast} />,
+                        children: <Component {...pageProps} currentUser={signedInUser.current} toast={toast} setIsLoading={setIsLoading} />,
                         currentUser: signedInUser.current
                     })}
 
                     {layout == null &&
-                        <Component {...pageProps} currentUser={signedInUser.current} toast={toast} loadedUser={frontEndLoadedState} />   
+                        <Component {...pageProps} currentUser={signedInUser.current} toast={toast} loadedUser={frontEndLoadedState} setIsLoading={setIsLoading} />   
                     }
                 </>
                 }
@@ -171,6 +178,12 @@ export function AuthScapeApp ({Component, layout, pageProps, muiTheme = {}, enfo
 
             </ThemeProvider>
 
+            {loadingLayout &&
+            <>
+                {loadingLayout(isLoadingShow)}
+            </>
+            }
+
             {(frontEndLoaded.current && process.env.microsoftClarityTrackingCode != null && process.env.staging == "production") &&
                 <script
                 dangerouslySetInnerHTML={{