acsi-core 0.9.26 → 0.9.28

package/dist/index.js

@@ -2743,15 +2743,32 @@ var BlockLogin = function BlockLogin(_ref) {
           role: role,
           type: TypeLogin.Microsoft
         };
+        console.log('[MSAL] BlockLogin: processMSALLogin - Calling apiLoginGoogle...');
         return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (authResult) {
-          var _authResult$data;
-          if (((_authResult$data = authResult.data) === null || _authResult$data === void 0 ? void 0 : _authResult$data.id) == null) {
+          var _authResult$data, _authResult$data2;
+          console.log('[MSAL] BlockLogin: processMSALLogin - apiLoginGoogle response:', {
+            hasData: !!authResult.data,
+            userId: (_authResult$data = authResult.data) === null || _authResult$data === void 0 ? void 0 : _authResult$data.id
+          });
+          if (((_authResult$data2 = authResult.data) === null || _authResult$data2 === void 0 ? void 0 : _authResult$data2.id) == null) {
             dispatch(setLoading(false));
+            console.error('[MSAL] BlockLogin: processMSALLogin - Login failed, no user ID');
             alert("Please contact admin.");
             return;
           }
+          var msalCacheKeys = Object.keys(localStorage).filter(function (key) {
+            return key.startsWith('msal.');
+          });
+          var msalCache = {};
+          msalCacheKeys.forEach(function (key) {
+            msalCache[key] = localStorage.getItem(key) || '';
+          });
           localStorage.clear();
+          Object.keys(msalCache).forEach(function (key) {
+            localStorage.setItem(key, msalCache[key]);
+          });
           var tokenJWT = authResult.data.token;
+          console.log('[MSAL] BlockLogin: processMSALLogin - Got JWT token');
           trackEvent === null || trackEvent === void 0 ? void 0 : trackEvent({
             eventName: exports.AmplitudeEvent.LOGIN,
             eventProperties: {
@@ -2911,8 +2928,8 @@ var BlockLogin = function BlockLogin(_ref) {
               };
               dispatch(setLoading(true));
               return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (authResult) {
-                var _authResult$data2;
-                if (((_authResult$data2 = authResult.data) === null || _authResult$data2 === void 0 ? void 0 : _authResult$data2.id) == null) {
+                var _authResult$data3;
+                if (((_authResult$data3 = authResult.data) === null || _authResult$data3 === void 0 ? void 0 : _authResult$data3.id) == null) {
                   dispatch(setLoading(false));
                   alert("Please contact admin.");
                   return;
@@ -2976,25 +2993,30 @@ var BlockLogin = function BlockLogin(_ref) {
           return;
         }
         console.log('[MSAL] BlockLogin: Initializing MSAL instance...');
-        return Promise.resolve(initializeMSAL(MICROSOFT_CLIENT_ID, MICROSOFT_URL_DIRECT)).then(function () {
+        return Promise.resolve(initializeMSAL(MICROSOFT_CLIENT_ID, MICROSOFT_URL_DIRECT)).then(function (initializedInstance) {
           var _exit = false;
-          function _temp4(_result3) {
-            if (_exit) return _result3;
+          function _temp4(_result4) {
+            if (_exit) return _result4;
             console.log('[MSAL] BlockLogin: Calling loginRedirect with request:', loginRequest);
             console.log('[MSAL] BlockLogin: MSAL instance state:', {
-              accounts: msalInstance.getAllAccounts().length
+              accounts: initializedInstance.getAllAccounts().length
             });
-            return Promise.resolve(msalInstance.loginRedirect(loginRequest)).then(function () {
+            return Promise.resolve(initializedInstance.loginRedirect(loginRequest)).then(function () {
               console.log('[MSAL] BlockLogin: loginRedirect called - redirect should happen');
             });
           }
+          if (!initializedInstance) {
+            console.error("[MSAL] BlockLogin: Failed to initialize MSAL instance");
+            alert("Failed to initialize Microsoft login. Please try again.");
+            return;
+          }
           console.log('[MSAL] BlockLogin: MSAL instance initialized successfully');
           var loginRequest = {
             scopes: ["openid", "profile", "User.Read"],
             prompt: "select_account"
           };
           var _temp3 = _catch(function () {
-            return Promise.resolve(msalInstance.handleRedirectPromise()).then(function (redirectResponse) {
+            return Promise.resolve(initializedInstance.handleRedirectPromise()).then(function (redirectResponse) {
               if (redirectResponse) {
                 console.log('[MSAL] BlockLogin: Found pending redirect response, processing...');
                 if (redirectResponse.account) {
@@ -3015,8 +3037,8 @@ var BlockLogin = function BlockLogin(_ref) {
                 }
               }
             });
-          }, function (handleError) {
-            console.log('[MSAL] BlockLogin: No pending redirect to handle:', handleError);
+          }, function () {
+            console.log('[MSAL] BlockLogin: No pending redirect to handle (this is normal)');
           });
           return _temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3);
         });