fix: iOS login (#594)

axelor · Jun 14, 2024 · af6f3dd · af6f3dd
1 parent 8a49cde
commit af6f3dd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/packages/core/src/features/authSlice.js b/packages/core/src/features/authSlice.js
@@ -26,7 +26,7 @@ import {testUrl} from '../utils/api';
 
 export const login = createAsyncThunk(
   'auth/login',
-  async ({url, username, password}) => {
+  async ({url, username, password, closePopup}) => {
     const urlWithProtocol = await testUrl(url);
     const {token, jsessionId, requestInterceptorId, responseInterceptorId} =
       await loginApi(urlWithProtocol, username, password);
@@ -36,6 +36,8 @@ export const login = createAsyncThunk(
 
     apiProviderConfig.setSessionExpired(false);
 
+    closePopup?.();
+
     return {
       url: urlWithProtocol,
       token,

diff --git a/packages/core/src/sessions/components/alerts/PopupCreateSession.js b/packages/core/src/sessions/components/alerts/PopupCreateSession.js
@@ -77,12 +77,13 @@ const PopupCreateSession = ({
 
   const onPressLogin = useCallback(
     session => {
-      dispatch(login({...session})).then(res => {
+      dispatch(
+        login({...session, closePopup: () => handleVisibility(false)}),
+      ).then(res => {
         if (res.error == null && isMounted) {
           sessionStorage.registerSession({
             session,
           });
-          handleVisibility(false);
         }
       });
     },

diff --git a/packages/core/src/sessions/components/alerts/PopupSession.js b/packages/core/src/sessions/components/alerts/PopupSession.js
@@ -48,12 +48,9 @@ const PopupSession = ({
           url: sessionActive.url,
           username: sessionActive.username,
           password,
+          closePopup: () => setIsOpen(false),
         }),
-      ).then(res => {
-        if (res.error == null) {
-          setIsOpen(false);
-        }
-      });
+      );
     },
     [dispatch, sessionActive],
   );