authscape 1.0.188 → 1.0.192

package/index.js

@@ -26,7 +26,7 @@ function AuthScapeApp(_ref) {
   var Component = _ref.Component,
     pageProps = _ref.pageProps,
     _ref$muiTheme = _ref.muiTheme,
-    muiTheme = _ref$muiTheme === void 0 ? null : _ref$muiTheme,
+    muiTheme = _ref$muiTheme === void 0 ? {} : _ref$muiTheme,
     _ref$onAuthentication = _ref.onAuthenticationLoaded,
     onAuthenticationLoaded = _ref$onAuthentication === void 0 ? null : _ref$onAuthentication;
   var _useState = (0, _react.useState)(false),
@@ -73,10 +73,10 @@ function AuthScapeApp(_ref) {
   }, loadingLogin && /*#__PURE__*/_react["default"].createElement(_material.Box, null, "Please wait. Loading..."), !loadingLogin && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(AuthorizationComponent, {
     setCurrentUser: setCurrentUser,
     isEnabled: process.env.enableAuth,
-    userLoaded: function userLoaded() {
+    userLoaded: function userLoaded(signedInUser) {
       setLoadedUser(true);
       if (onAuthenticationLoaded != null) {
-        onAuthenticationLoaded(currentUser);
+        onAuthenticationLoaded(signedInUser);
       }
     }
   }, /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
@@ -2312,31 +2312,33 @@ function AuthorizationComponent(_ref) {
     setLoaded = _useState2[1];
   var validateUserSignedIn = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var usr;
+      var signedInUser, usr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoaded(true);
+            signedInUser = null;
             if (!isEnabled) {
-              _context.next = 8;
+              _context.next = 9;
               break;
             }
-            _context.next = 4;
+            _context.next = 5;
             return apiService().GetCurrentUser();
-          case 4:
+          case 5:
             usr = _context.sent;
             if (usr != null) {
               setCurrentUser(usr);
+              signedInUser = usr;
             } else {
               setCurrentUser(null);
             }
-            _context.next = 9;
+            _context.next = 10;
             break;
-          case 8:
-            setCurrentUser(null);
           case 9:
-            userLoaded();
+            setCurrentUser(null);
           case 10:
+            userLoaded(signedInUser);
+          case 11:
           case "end":
             return _context.stop();
         }

package/package.json

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

package/src/components/AuthScapeApp.js

@@ -6,7 +6,7 @@ import { useRouter } from 'next/router';
 import { ThemeProvider } from '@mui/material/styles';
 import { Box } from '@mui/material';
 
-export function AuthScapeApp({Component, pageProps, muiTheme = null, onAuthenticationLoaded = null}) {
+export function AuthScapeApp({Component, pageProps, muiTheme = {}, onAuthenticationLoaded = null}) {
 
     const [isLoading, setIsLoading] = useState(false);
     const [loadedUser, setLoadedUser] = useState(false);
@@ -58,12 +58,12 @@ export function AuthScapeApp({Component, pageProps, muiTheme = null, onAuthentic
 
                 {!loadingLogin &&
                 <>
-                    <AuthorizationComponent setCurrentUser={setCurrentUser} isEnabled={process.env.enableAuth} userLoaded={() => {
+                    <AuthorizationComponent setCurrentUser={setCurrentUser} isEnabled={process.env.enableAuth} userLoaded={(signedInUser) => {
                         setLoadedUser(true);
 
                         if (onAuthenticationLoaded != null)
                         {
-                            onAuthenticationLoaded(currentUser);
+                            onAuthenticationLoaded(signedInUser);
                         }
                     }}>
                     <Component {...pageProps} currentUser={currentUser} toast={toast} setIsLoading={setIsLoading} loadedUser={loadedUser} logEvent={logEvent} />

package/src/services/authorizationComponent.js

@@ -8,12 +8,14 @@ export function AuthorizationComponent({children, isEnabled, setCurrentUser, use
 
       setLoaded(true);
 
+      let signedInUser = null;
       if (isEnabled)
       {
         let usr = await apiService().GetCurrentUser();
         if (usr != null)
         {
           setCurrentUser(usr);
+          signedInUser = usr;
         }
         else
         {
@@ -25,7 +27,7 @@ export function AuthorizationComponent({children, isEnabled, setCurrentUser, use
         setCurrentUser(null);
       }
 
-      userLoaded();
+      userLoaded(signedInUser);
     }
 
     useEffect(() => {