acsi-core 0.9.22 → 0.9.24

package/dist/index.js

@@ -2189,7 +2189,7 @@ var msalConfig = function msalConfig(clientId, redirectUri) {
       navigateToLoginRequestUrl: false
     },
     cache: {
-      cacheLocation: "sessionStorage",
+      cacheLocation: "localStorage",
       storeAuthStateInCookie: false
     },
     system: {
@@ -2232,7 +2232,18 @@ var getMSALInstance = function getMSALInstance(clientId, redirectUri) {
     return null;
   }
   if (!msalInstance) {
+    console.log('[MSAL] Creating new MSAL instance with:', {
+      clientId: finalClientId ? 'configured' : 'missing',
+      redirectUri: finalRedirectUri
+    });
     msalInstance = new msalBrowser.PublicClientApplication(msalConfig(finalClientId, finalRedirectUri));
+  } else {
+    var _existingConfig$auth, _existingConfig$auth2;
+    var existingConfig = msalInstance.config;
+    if ((existingConfig === null || existingConfig === void 0 ? void 0 : (_existingConfig$auth = existingConfig.auth) === null || _existingConfig$auth === void 0 ? void 0 : _existingConfig$auth.clientId) !== finalClientId || (existingConfig === null || existingConfig === void 0 ? void 0 : (_existingConfig$auth2 = existingConfig.auth) === null || _existingConfig$auth2 === void 0 ? void 0 : _existingConfig$auth2.redirectUri) !== finalRedirectUri) {
+      console.warn('[MSAL] Config mismatch detected, creating new instance');
+      msalInstance = new msalBrowser.PublicClientApplication(msalConfig(finalClientId, finalRedirectUri));
+    }
   }
   return msalInstance;
 };
@@ -2253,6 +2264,7 @@ var initializeMSAL = function initializeMSAL(clientId, redirectUri) {
     isInitializing = true;
     initPromise = instance.initialize().then(function () {
       isInitializing = false;
+      console.log('[MSAL] Instance initialized successfully');
       return instance;
     })["catch"](function (error) {
       isInitializing = false;
@@ -2267,19 +2279,152 @@ var initializeMSAL = function initializeMSAL(clientId, redirectUri) {
 var handleMSALRedirect = function handleMSALRedirect(clientId, redirectUri) {
   try {
     if (!window.location.hash) {
+      console.log('[MSAL] handleMSALRedirect: No hash found in URL');
       return Promise.resolve(null);
     }
+    console.log('[MSAL] handleMSALRedirect: Hash found:', window.location.hash.substring(0, 100) + '...');
     var hashParams = new URLSearchParams(window.location.hash.substring(1));
-    var hasMSALParams = hashParams.has('access_token') || hashParams.has('id_token') || hashParams.has('error') || hashParams.has('code');
+    var hasAccessToken = hashParams.has('access_token');
+    var hasIdToken = hashParams.has('id_token');
+    var hasError = hashParams.has('error');
+    var hasCode = hashParams.has('code');
+    var hasMSALParams = hasAccessToken || hasIdToken || hasError || hasCode;
+    console.log('[MSAL] handleMSALRedirect: Hash params check:', {
+      hasAccessToken: hasAccessToken,
+      hasIdToken: hasIdToken,
+      hasError: hasError,
+      hasCode: hasCode,
+      hasMSALParams: hasMSALParams
+    });
     if (!hasMSALParams) {
+      console.log('[MSAL] handleMSALRedirect: No MSAL parameters found in hash');
       return Promise.resolve(null);
     }
     return Promise.resolve(_catch(function () {
+      console.log('[MSAL] handleMSALRedirect: Initializing MSAL with:', {
+        clientId: clientId ? 'configured' : 'missing',
+        redirectUri: redirectUri
+      });
       return Promise.resolve(initializeMSAL(clientId, redirectUri)).then(function (instance) {
-        return instance ? Promise.resolve(instance.handleRedirectPromise()) : null;
+        if (!instance) {
+          console.error('[MSAL] handleMSALRedirect: Failed to initialize instance');
+          return null;
+        }
+        console.log('[MSAL] handleMSALRedirect: Calling handleRedirectPromise...');
+        var accounts = instance.getAllAccounts();
+        console.log('[MSAL] handleMSALRedirect: Current accounts:', accounts.length);
+        return Promise.resolve(instance.handleRedirectPromise()).then(function (response) {
+          var _exit = false;
+          var _temp = function () {
+            if (response) {
+              var _response$account;
+              console.log('[MSAL] handleMSALRedirect: Got response from handleRedirectPromise', {
+                account: (_response$account = response.account) === null || _response$account === void 0 ? void 0 : _response$account.username,
+                hasAccessToken: !!response.accessToken,
+                scopes: response.scopes
+              });
+            } else {
+              console.log('[MSAL] handleMSALRedirect: handleRedirectPromise returned null/undefined');
+              console.log('[MSAL] handleMSALRedirect: This might mean the redirect was already processed or state mismatch');
+              console.log('[MSAL] handleMSALRedirect: Checking localStorage for interaction state...');
+              try {
+                var msalCacheKeys = Object.keys(localStorage).filter(function (key) {
+                  return key.startsWith('msal.');
+                });
+                console.log('[MSAL] handleMSALRedirect: Found MSAL cache keys:', msalCacheKeys.length);
+                var interactionStateKey = msalCacheKeys.find(function (key) {
+                  return key.includes('interaction');
+                });
+                if (interactionStateKey) {
+                  console.log('[MSAL] handleMSALRedirect: Found interaction state key:', interactionStateKey);
+                }
+              } catch (cacheError) {
+                console.error('[MSAL] handleMSALRedirect: Error checking cache:', cacheError);
+              }
+              return function () {
+                if (hashParams.has('code')) {
+                  console.log('[MSAL] handleMSALRedirect: Attempting to extract account info from client_info...');
+                  return _catch(function () {
+                    var clientInfo = hashParams.get('client_info');
+                    return function () {
+                      if (clientInfo) {
+                        var decodedClientInfo = JSON.parse(atob(clientInfo));
+                        console.log('[MSAL] handleMSALRedirect: Decoded client_info:', decodedClientInfo);
+                        var allAccounts = instance.getAllAccounts();
+                        console.log('[MSAL] handleMSALRedirect: Accounts in cache:', allAccounts.length);
+                        var matchingAccount = allAccounts.find(function (acc) {
+                          return acc.homeAccountId === decodedClientInfo.uid || acc.username === decodedClientInfo.preferred_username || acc.username === decodedClientInfo.email;
+                        });
+                        if (!matchingAccount && allAccounts.length > 0) {
+                          matchingAccount = allAccounts[0];
+                          console.log('[MSAL] handleMSALRedirect: Using first available account');
+                        }
+                        return function () {
+                          if (matchingAccount) {
+                            console.log('[MSAL] handleMSALRedirect: Found matching account, trying silent token acquisition...');
+                            return _catch(function () {
+                              return Promise.resolve(instance.acquireTokenSilent({
+                                scopes: ["openid", "profile", "User.Read"],
+                                account: matchingAccount
+                              })).then(function (silentResult) {
+                                if (silentResult) {
+                                  console.log('[MSAL] handleMSALRedirect: Got token via silent acquisition');
+                                  _exit = true;
+                                  return silentResult;
+                                }
+                              });
+                            }, function (silentError) {
+                              console.error('[MSAL] handleMSALRedirect: Silent acquisition failed:', silentError);
+                            });
+                          } else {
+                            console.log('[MSAL] handleMSALRedirect: No account in cache, creating account from client_info...');
+                            var accountInfo = {
+                              homeAccountId: decodedClientInfo.uid || decodedClientInfo.sub,
+                              environment: 'login.microsoftonline.com',
+                              tenantId: decodedClientInfo.tid,
+                              username: decodedClientInfo.preferred_username || decodedClientInfo.email,
+                              name: decodedClientInfo.name,
+                              localAccountId: decodedClientInfo.oid || decodedClientInfo.sub
+                            };
+                            console.log('[MSAL] handleMSALRedirect: Created account info:', accountInfo);
+                            var _account$accessToken$ = {
+                              account: accountInfo,
+                              accessToken: '',
+                              idToken: '',
+                              scopes: ["openid", "profile", "User.Read"],
+                              expiresOn: null,
+                              tenantId: decodedClientInfo.tid,
+                              uniqueId: decodedClientInfo.oid || decodedClientInfo.sub,
+                              tokenType: 'Bearer'
+                            };
+                            _exit = true;
+                            return _account$accessToken$;
+                          }
+                        }();
+                      }
+                    }();
+                  }, function (manualError) {
+                    console.error('[MSAL] handleMSALRedirect: Manual code processing failed:', manualError);
+                  });
+                }
+              }();
+            }
+          }();
+          return _temp && _temp.then ? _temp.then(function (_result6) {
+            return _exit ? _result6 : response;
+          }) : _exit ? _temp : response;
+        });
       });
     }, function (error) {
-      console.error('[MSAL] Redirect handling error:', error);
+      console.error('[MSAL] handleMSALRedirect: Error during processing:', error);
+      if (error instanceof Error) {
+        var _error$stack;
+        console.error('[MSAL] handleMSALRedirect: Error details:', {
+          name: error.name,
+          message: error.message,
+          stack: (_error$stack = error.stack) === null || _error$stack === void 0 ? void 0 : _error$stack.substring(0, 200)
+        });
+      }
       return null;
     }));
   } catch (e) {
@@ -2312,12 +2457,18 @@ var MSALRedirectHandler = function MSALRedirectHandler() {
   React.useLayoutEffect(function () {
     var handleRedirect = function handleRedirect() {
       try {
+        var alreadyProcessed = localStorage.getItem('MSAL_LOGIN_PENDING');
+        if (alreadyProcessed === 'true') {
+          console.log('[MSAL] RedirectHandler: Already processed by pre-init, skipping');
+          return Promise.resolve();
+        }
         if (!isMSALRedirect()) {
+          console.log('[MSAL] RedirectHandler: No MSAL redirect detected');
           return Promise.resolve();
         }
-        console.log('[MSAL] Redirect detected, processing...');
-        console.log('[MSAL] Hash:', window.location.hash);
-        console.log('[MSAL] Full URL:', window.location.href);
+        console.log('[MSAL] RedirectHandler: Redirect detected, processing...');
+        console.log('[MSAL] RedirectHandler: Hash:', window.location.hash);
+        console.log('[MSAL] RedirectHandler: Full URL:', window.location.href);
         var _temp = _catch(function () {
           return Promise.resolve(handleMSALRedirect()).then(function (response) {
             if (response && response.account) {
@@ -2650,15 +2801,25 @@ var BlockLogin = function BlockLogin(_ref) {
     }
   }, []);
   React.useEffect(function () {
+    console.log('[MSAL] BlockLogin: useEffect mounted, checking for pending MSAL login...');
     var handleMSALLoginSuccess = function handleMSALLoginSuccess(event) {
       try {
+        console.log('[MSAL] BlockLogin: Received msal-login-success event', event.detail);
         var _event$detail = event.detail,
           account = _event$detail.account,
-          accessToken = _event$detail.accessToken;
+          _accessToken = _event$detail.accessToken;
         var _temp2 = function () {
-          if (account && accessToken) {
+          if (account && _accessToken) {
+            console.log('[MSAL] BlockLogin: Processing login from event...');
             localStorage.removeItem('MSAL_LOGIN_PENDING');
-            return Promise.resolve(processMSALLogin(account, accessToken)).then(function () {});
+            localStorage.removeItem('MSAL_ACCOUNT');
+            localStorage.removeItem('MSAL_ACCESS_TOKEN');
+            sessionStorage.removeItem('MSAL_LOGIN_PENDING');
+            sessionStorage.removeItem('MSAL_ACCOUNT');
+            sessionStorage.removeItem('MSAL_ACCESS_TOKEN');
+            return Promise.resolve(processMSALLogin(account, _accessToken)).then(function () {});
+          } else {
+            console.warn('[MSAL] BlockLogin: Event received but missing account or accessToken');
           }
         }();
         return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
@@ -2666,28 +2827,57 @@ var BlockLogin = function BlockLogin(_ref) {
         return Promise.reject(e);
       }
     };
+    window.addEventListener('msal-login-success', handleMSALLoginSuccess);
+    console.log('[MSAL] BlockLogin: Event listener registered');
     var pendingLogin = localStorage.getItem('MSAL_LOGIN_PENDING');
+    var accountStr = localStorage.getItem('MSAL_ACCOUNT');
+    var accessToken = localStorage.getItem('MSAL_ACCESS_TOKEN');
+    if (!pendingLogin || pendingLogin !== 'true') {
+      console.log('[MSAL] BlockLogin: Not found in localStorage, checking sessionStorage...');
+      pendingLogin = sessionStorage.getItem('MSAL_LOGIN_PENDING');
+      accountStr = sessionStorage.getItem('MSAL_ACCOUNT');
+      accessToken = sessionStorage.getItem('MSAL_ACCESS_TOKEN');
+      if (pendingLogin === 'true' && accountStr && accessToken) {
+        console.log('[MSAL] BlockLogin: Found in sessionStorage, copying to localStorage...');
+        localStorage.setItem('MSAL_ACCOUNT', accountStr);
+        localStorage.setItem('MSAL_ACCESS_TOKEN', accessToken);
+        localStorage.setItem('MSAL_LOGIN_PENDING', pendingLogin);
+      }
+    }
+    console.log('[MSAL] BlockLogin: Pending login check:', pendingLogin);
     if (pendingLogin === 'true') {
-      var accountStr = localStorage.getItem('MSAL_ACCOUNT');
-      var accessToken = localStorage.getItem('MSAL_ACCESS_TOKEN');
+      console.log('[MSAL] BlockLogin: Found pending login', {
+        hasAccount: !!accountStr,
+        hasAccessToken: !!accessToken
+      });
       if (accountStr && accessToken) {
         try {
           var account = JSON.parse(accountStr);
+          console.log('[MSAL] BlockLogin: Parsed account:', account.username);
           localStorage.removeItem('MSAL_LOGIN_PENDING');
           localStorage.removeItem('MSAL_ACCOUNT');
           localStorage.removeItem('MSAL_ACCESS_TOKEN');
+          sessionStorage.removeItem('MSAL_LOGIN_PENDING');
+          sessionStorage.removeItem('MSAL_ACCOUNT');
+          sessionStorage.removeItem('MSAL_ACCESS_TOKEN');
+          console.log('[MSAL] BlockLogin: Calling processMSALLogin...');
           processMSALLogin(account, accessToken);
         } catch (error) {
-          console.error('[MSAL] Error parsing stored account:', error);
+          console.error('[MSAL] BlockLogin: Error parsing stored account:', error);
           localStorage.removeItem('MSAL_LOGIN_PENDING');
           localStorage.removeItem('MSAL_ACCOUNT');
           localStorage.removeItem('MSAL_ACCESS_TOKEN');
+          sessionStorage.removeItem('MSAL_LOGIN_PENDING');
+          sessionStorage.removeItem('MSAL_ACCOUNT');
+          sessionStorage.removeItem('MSAL_ACCESS_TOKEN');
         }
+      } else {
+        console.warn('[MSAL] BlockLogin: Pending login flag set but missing account or token');
       }
     }
-    window.addEventListener('msal-login-success', handleMSALLoginSuccess);
     return function () {
       window.removeEventListener('msal-login-success', handleMSALLoginSuccess);
+      console.log('[MSAL] BlockLogin: Event listener removed');
     };
   }, []);
   var googleLogin = google.useGoogleLogin({