@axelor/aos-mobile-core 9.0.10 → 9.0.12

package/lib/features/authSlice.js

@@ -16,29 +16,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { ejectAxios, getActiveUserInfo, loginApi, logoutApi, } from '../api/login-api';
+import { getActiveUserInfo, loginApi, logoutApi } from '../api/login-api';
+import { ejectAxios } from '../api/axios-init';
 import { apiProviderConfig } from '../apiProviders/config';
-import { saveUrlInStorage } from '../sessions';
+import { MfaVerifyErrorCode, saveUrlInStorage, verifyMfaApi } from '../sessions';
 import { checkNullString, testUrl } from '../utils';
 import { modulesProvider } from '../app';
 import { webSocketProvider } from '../websocket';
 import { resetConfigs } from './appConfigSlice';
-export const login = createAsyncThunk('auth/login', async ({ url, username, password, closePopup }, { dispatch }) => {
-    const urlWithProtocol = await testUrl(url);
-    const { token, jsessionId, requestInterceptorId, responseInterceptorId } = await loginApi(urlWithProtocol, username, password);
+async function finalizeLogin({ token, jsessionId, requestInterceptorId, responseInterceptorId }, url, dispatch) {
     const { userId, applicationMode } = await getActiveUserInfo();
-    saveUrlInStorage(urlWithProtocol);
+    saveUrlInStorage(url);
     apiProviderConfig.setSessionExpired(false);
-    closePopup?.();
     modulesProvider.getModuleRegisters().forEach(_f => _f(userId));
     webSocketProvider.initWebSocket({
-        baseUrl: urlWithProtocol,
+        baseUrl: url,
         token,
         jsessionId,
     });
     dispatch(resetConfigs());
     return {
-        url: urlWithProtocol,
+        phase: 'session',
+        url,
         token,
         jsessionId,
         userId,
@@ -46,6 +45,45 @@ export const login = createAsyncThunk('auth/login', async ({ url, username, pass
         responseInterceptorId,
         applicationMode,
     };
+}
+export const login = createAsyncThunk('auth/login', async ({ url, username, password, closePopup }, { dispatch }) => {
+    const urlWithProtocol = await testUrl(url);
+    const result = await loginApi(urlWithProtocol, username, password);
+    if (result.kind === 'mfa') {
+        closePopup?.();
+        return {
+            phase: 'mfa',
+            url: urlWithProtocol,
+            mfaState: {
+                username: result.username,
+                methods: result.methods,
+                emailRetryAfter: result.emailRetryAfter,
+            },
+        };
+    }
+    closePopup?.();
+    return finalizeLogin(result, urlWithProtocol, dispatch);
+});
+export const verifyMfa = createAsyncThunk('auth/verifyMfa', async ({ mfaCode, mfaMethod }, { getState, dispatch, rejectWithValue }) => {
+    const { baseUrl, mfaState } = getState()?.auth ?? {};
+    if (!baseUrl || !mfaState?.username) {
+        return rejectWithValue({ code: MfaVerifyErrorCode.SESSION_LOST });
+    }
+    try {
+        const result = await verifyMfaApi(baseUrl, {
+            username: mfaState.username,
+            mfaCode,
+            mfaMethod,
+        });
+        return finalizeLogin(result, baseUrl, dispatch);
+    }
+    catch (e) {
+        if (e?.code === MfaVerifyErrorCode.INVALID_CODE ||
+            e?.code === MfaVerifyErrorCode.SESSION_LOST) {
+            return rejectWithValue({ code: e.code });
+        }
+        throw e;
+    }
 });
 export const isUrlValid = createAsyncThunk('auth/isUrlValid', async ({ url }) => {
     if (!checkNullString(url)) {
@@ -64,6 +102,8 @@ export const logout = createAsyncThunk('auth/logout', async function (_, { getSt
 const initialState = {
     loading: false,
     logged: false,
+    mfaPending: false,
+    mfaState: null,
     userId: null,
     baseUrl: null,
     token: null,
@@ -89,32 +129,85 @@ export const authSlice = createSlice({
                 state[key] = value;
             });
         },
+        cancelMfa: state => {
+            state.mfaPending = false;
+            state.mfaState = null;
+            state.error = null;
+        },
     },
     extraReducers: builder => {
         builder.addCase(login.pending, state => {
             state.logged = false;
             state.loading = true;
+            state.mfaPending = false;
+            state.mfaState = null;
             state.baseUrl = null;
             state.token = null;
             state.error = null;
         });
         builder.addCase(login.fulfilled, (state, action) => {
-            const { url, token, jsessionId, userId, requestInterceptorId, responseInterceptorId, applicationMode, } = action.payload;
-            state.logged = token != null;
+            const payload = action.payload ?? {};
             state.loading = false;
+            state.error = null;
+            if (payload.phase === 'mfa') {
+                state.logged = false;
+                state.mfaPending = true;
+                state.mfaState = payload.mfaState;
+                state.baseUrl = payload.url;
+                return;
+            }
+            const { url, token, jsessionId, userId, requestInterceptorId, responseInterceptorId, applicationMode, } = payload;
+            state.logged = token != null;
+            state.mfaPending = false;
+            state.mfaState = null;
             state.userId = userId;
             state.baseUrl = url;
             state.token = token;
             state.jsessionId = jsessionId;
-            state.error = null;
             state.requestInterceptorId = requestInterceptorId;
             state.responseInterceptorId = responseInterceptorId;
             state.applicationMode = applicationMode;
         });
         builder.addCase(login.rejected, (state, action) => {
             state.loading = false;
+            state.mfaPending = false;
+            state.mfaState = null;
             state.error = { ...action.error, url: action.meta?.arg?.url };
         });
+        builder.addCase(verifyMfa.pending, state => {
+            state.loading = true;
+            state.error = null;
+        });
+        builder.addCase(verifyMfa.fulfilled, (state, action) => {
+            const { url, token, jsessionId, userId, requestInterceptorId, responseInterceptorId, applicationMode, } = action.payload ?? {};
+            state.loading = false;
+            state.logged = token != null;
+            state.mfaPending = false;
+            state.mfaState = null;
+            state.userId = userId;
+            state.baseUrl = url;
+            state.token = token;
+            state.jsessionId = jsessionId;
+            state.requestInterceptorId = requestInterceptorId;
+            state.responseInterceptorId = responseInterceptorId;
+            state.applicationMode = applicationMode;
+            state.error = null;
+        });
+        builder.addCase(verifyMfa.rejected, (state, action) => {
+            state.loading = false;
+            const code = action.payload?.code;
+            if (code === MfaVerifyErrorCode.SESSION_LOST) {
+                state.mfaPending = false;
+                state.mfaState = null;
+                state.error = { message: MfaVerifyErrorCode.SESSION_LOST };
+                return;
+            }
+            if (code === MfaVerifyErrorCode.INVALID_CODE) {
+                state.error = { message: MfaVerifyErrorCode.INVALID_CODE };
+                return;
+            }
+            state.error = { ...action.error };
+        });
         builder.addCase(isUrlValid.fulfilled, (state, action) => {
             state.error = null;
         });
@@ -124,6 +217,8 @@ export const authSlice = createSlice({
         builder.addCase(logout.fulfilled, state => {
             state.logged = false;
             state.loading = false;
+            state.mfaPending = false;
+            state.mfaState = null;
             state.userId = null;
             state.token = null;
             state.jsessionId = null;
@@ -134,6 +229,6 @@ export const authSlice = createSlice({
         });
     },
 });
-export const { clearError, setAppVersion, updateAuthState } = authSlice.actions;
+export const { clearError, setAppVersion, updateAuthState, cancelMfa } = authSlice.actions;
 export const authReducer = authSlice.reducer;
 //# sourceMappingURL=authSlice.js.map

package/lib/features/authSlice.js.map

@@ -1 +1 @@
-{"version":3,"file":"authSlice.js","sourceRoot":"","sources":["../../src/features/authSlice.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"authSlice.js","sourceRoot":"","sources":["../../src/features/authSlice.js"],"names":[],"mappings":"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"}

package/lib/features/scannerSlice.d.ts

@@ -2,6 +2,7 @@ interface ScannerSliceState {
     isEnabled: boolean;
     scanKey: string | null;
     scannedValue: string | null;
+    isMassScan: boolean;
 }
 export declare const enableScan: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scanner/enableScan">, scanValue: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scanner/scanValue">, disableScan: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"scanner/disableScan">, clearScan: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"scanner/clearScan">;
 export declare const useScannerSelector: () => ScannerSliceState;
@@ -10,5 +11,6 @@ declare const _default: import("redux").Reducer<{
     isEnabled: boolean;
     scanKey: any;
     scannedValue: any;
+    isMassScan: boolean;
 }>;
 export default _default;

package/lib/features/scannerSlice.js

@@ -24,12 +24,17 @@ const scannerSlice = createSlice({
         isEnabled: false,
         scanKey: null,
         scannedValue: null,
+        isMassScan: false,
     },
     reducers: {
         enableScan(state, action) {
+            const { scanKey, isMassScan } = typeof action.payload === 'string'
+                ? { scanKey: action.payload, isMassScan: false }
+                : action.payload;
             state.isEnabled = true;
-            state.scanKey = action.payload;
+            state.scanKey = scanKey;
             state.scannedValue = null;
+            state.isMassScan = isMassScan ?? false;
         },
         scanValue(state, action) {
             state.scannedValue = action.payload;
@@ -38,6 +43,7 @@ const scannerSlice = createSlice({
             state.isEnabled = false;
             state.scanKey = null;
             state.scannedValue = null;
+            state.isMassScan = false;
         },
         clearScan(state) {
             state.scannedValue = null;
@@ -45,7 +51,7 @@ const scannerSlice = createSlice({
     },
 });
 export const { enableScan, scanValue, disableScan, clearScan } = scannerSlice.actions;
-const selectScanner = state => state.scanner;
+const selectScanner = (state) => state.scanner;
 export const useScannerSelector = () => useSelector(selectScanner);
 export const useScannedValueByKey = key => {
     const { scanKey, scannedValue } = useScannerSelector();

package/lib/features/scannerSlice.js.map

@@ -1 +1 @@
-{"version":3,"file":"scannerSlice.js","sourceRoot":"","sources":["../../src/features/scannerSlice.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAQ7C,MAAM,YAAY,GAAG,WAAW,CAAC;IAC/B,IAAI,EAAE,SAAS;IACf,YAAY,EAAE;QACZ,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,IAAI;QACb,YAAY,EAAE,IAAI;KACnB;IACD,QAAQ,EAAE;QACR,UAAU,CAAC,KAAK,EAAE,MAAM;YACtB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;YACvB,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YAC/B,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,MAAM;YACrB,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC;QACtC,CAAC;QACD,WAAW,CAAC,KAAK;YACf,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;YACrB,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,SAAS,CAAC,KAAK;YACb,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;QAC5B,CAAC;KACF;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,EAAC,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAC,GAC1D,YAAY,CAAC,OAAO,CAAC;AAEvB,MAAM,aAAa,GAAG,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;AAE7C,MAAM,CAAC,MAAM,kBAAkB,GAA4B,GAAG,EAAE,CAC9D,WAAW,CAAC,aAAa,CAAC,CAAC;AAE7B,MAAM,CAAC,MAAM,oBAAoB,GAAmC,GAAG,CAAC,EAAE;IACxE,MAAM,EAAC,OAAO,EAAE,YAAY,EAAC,GAAG,kBAAkB,EAAE,CAAC;IACrD,OAAO,OAAO,CACZ,GAAG,EAAE,CAAC,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,EAC7C,CAAC,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,CAC7B,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC,OAAO,CAAC"}
+{"version":3,"file":"scannerSlice.js","sourceRoot":"","sources":["../../src/features/scannerSlice.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAS7C,MAAM,YAAY,GAAG,WAAW,CAAC;IAC/B,IAAI,EAAE,SAAS;IACf,YAAY,EAAE;QACZ,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,IAAI;QACb,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE,KAAK;KAClB;IACD,QAAQ,EAAE;QACR,UAAU,CAAC,KAAK,EAAE,MAAM;YACtB,MAAM,EAAC,OAAO,EAAE,UAAU,EAAC,GACzB,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;gBAChC,CAAC,CAAC,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAC;gBAC9C,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;YAErB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;YACvB,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;YACxB,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;YAC1B,KAAK,CAAC,UAAU,GAAG,UAAU,IAAI,KAAK,CAAC;QACzC,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,MAAM;YACrB,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC;QACtC,CAAC;QACD,WAAW,CAAC,KAAK;YACf,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;YACrB,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;YAC1B,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC;QAC3B,CAAC;QACD,SAAS,CAAC,KAAK;YACb,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;QAC5B,CAAC;KACF;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,EAAC,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAC,GAC1D,YAAY,CAAC,OAAO,CAAC;AAEvB,MAAM,aAAa,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;AAEpD,MAAM,CAAC,MAAM,kBAAkB,GAA4B,GAAG,EAAE,CAC9D,WAAW,CAAC,aAAa,CAAC,CAAC;AAE7B,MAAM,CAAC,MAAM,oBAAoB,GAAmC,GAAG,CAAC,EAAE;IACxE,MAAM,EAAC,OAAO,EAAE,YAAY,EAAC,GAAG,kBAAkB,EAAE,CAAC;IACrD,OAAO,OAAO,CACZ,GAAG,EAAE,CAAC,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,EAC7C,CAAC,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,CAC7B,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC,OAAO,CAAC"}

package/lib/hooks/use-mass-scanner.js

@@ -20,10 +20,12 @@ import { useDispatch } from '../redux/hooks';
 import { useCameraScannerValueByKey, clearBarcode, } from '../features/cameraScannerSlice';
 import { clearScan, useScannedValueByKey, useScannerSelector, } from '../features/scannerSlice';
 import { useScanActivator } from './use-scan-activator';
+import { useIsFocused } from './use-navigation';
 export const useMassScanner = ({ scanKey, backgroundAction, fallbackAction, scanInterval = 1000, disableOnError = true, }) => {
     const isProcessingRef = useRef(false);
     const timerRef = useRef(null);
     const dispatch = useDispatch();
+    const isFocused = useIsFocused();
     const { isEnabled: isScanEnabled, scanKey: activeScanKey } = useScannerSelector();
     const { enable: enableScan, disable: disableScan, isZebraDevice, } = useScanActivator(scanKey, true);
     const scannedBarcode = useCameraScannerValueByKey(scanKey);
@@ -58,15 +60,15 @@ export const useMassScanner = ({ scanKey, backgroundAction, fallbackAction, scan
     const processScanRef = useRef(processScan);
     processScanRef.current = processScan;
     useEffect(() => {
-        if (scannedValue) {
+        if (isFocused && scannedValue) {
             processScanRef.current(scannedValue, () => dispatch(clearScan()));
         }
-    }, [dispatch, scannedValue]);
+    }, [dispatch, isFocused, scannedValue]);
     useEffect(() => {
-        if (scannedBarcode?.value) {
+        if (isFocused && scannedBarcode?.value) {
             processScanRef.current(scannedBarcode.value, () => dispatch(clearBarcode()));
         }
-    }, [dispatch, scannedBarcode?.value]);
+    }, [dispatch, isFocused, scannedBarcode?.value]);
     return useMemo(() => ({ disableScan, enableScan, isEnabled }), [disableScan, enableScan, isEnabled]);
 };
 //# sourceMappingURL=use-mass-scanner.js.map

package/lib/hooks/use-mass-scanner.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-mass-scanner.js","sourceRoot":"","sources":["../../src/hooks/use-mass-scanner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-mass-scanner.js","sourceRoot":"","sources":["../../src/hooks/use-mass-scanner.ts"],"names":[],"mappings":"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"}

package/lib/hooks/use-scan-activator.d.ts

@@ -3,7 +3,7 @@ export declare const useScanActivator: (scanKeySearch: string, isMassScan?: bool
     enable: () => void;
     isZebraDevice: boolean;
 };
-export declare const useScannerDeviceActivator: (scanKeySearch: string) => {
+export declare const useScannerDeviceActivator: (scanKeySearch: string, isMassScan?: boolean) => {
     enable: () => void;
     disable: () => void;
 };

package/lib/hooks/use-scan-activator.js

@@ -21,7 +21,7 @@ import { disableCameraScanner, enableCameraScanner, enableMassCameraScanner, } f
 import { enableScan, disableScan } from '../features/scannerSlice';
 import { useDispatch } from '../redux/hooks';
 export const useScanActivator = (scanKeySearch, isMassScan = false) => {
-    const { enable: enableScanner, disable: disableScanner } = useScannerDeviceActivator(scanKeySearch);
+    const { enable: enableScanner, disable: disableScanner } = useScannerDeviceActivator(scanKeySearch, isMassScan);
     const { enable: enableCamera, enableMassCamera, disable: disableCamera, } = useCameraScannerActivator(scanKeySearch);
     const [isZebraDevice, setIsZebraDevice] = useState(false);
     useEffect(() => {
@@ -54,11 +54,11 @@ export const useScanActivator = (scanKeySearch, isMassScan = false) => {
     }, [isZebraDevice, disableScanner, disableCamera]);
     return useMemo(() => ({ disable, enable, isZebraDevice }), [disable, enable, isZebraDevice]);
 };
-export const useScannerDeviceActivator = (scanKeySearch) => {
+export const useScannerDeviceActivator = (scanKeySearch, isMassScan = false) => {
     const dispatch = useDispatch();
     const enable = useCallback(() => {
-        dispatch(enableScan(scanKeySearch));
-    }, [dispatch, scanKeySearch]);
+        dispatch(enableScan({ scanKey: scanKeySearch, isMassScan }));
+    }, [dispatch, scanKeySearch, isMassScan]);
     const disable = useCallback(() => {
         dispatch(disableScan());
     }, [dispatch]);

package/lib/hooks/use-scan-activator.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-scan-activator.js","sourceRoot":"","sources":["../../src/hooks/use-scan-activator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-scan-activator.js","sourceRoot":"","sources":["../../src/hooks/use-scan-activator.ts"],"names":[],"mappings":"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"}

package/lib/i18n/translations/en.json

@@ -81,6 +81,23 @@
     "Base_Connection_SessionNameAlreadyExist": "Session name already exists",
     "Base_Connection_WrongPasswordOrUserName": "Wrong username or password",
     "Base_Connection_InvalidUrl": "Invalid url",
+    "Auth_MFA_Title": "Two-factor authentication",
+    "Auth_MFA_VerificationCode": "Verification code",
+    "Auth_MFA_TOTP_Description": "Enter the code from your authentication app.",
+    "Auth_MFA_TOTP_Placeholder": "Authenticator code",
+    "Auth_MFA_TOTP_Method": "Authenticator app",
+    "Auth_MFA_EMAIL_Description": "Enter the code from verification email.",
+    "Auth_MFA_EMAIL_Placeholder": "Email code",
+    "Auth_MFA_EMAIL_Method": "Email verification",
+    "Auth_MFA_Verify": "Verify",
+    "Auth_MFA_ResendEmail": "Resend email",
+    "Auth_MFA_ResendEmailIn": "Resend email in {{count}}s",
+    "Auth_MFA_OtherOptions": "Other options",
+    "Auth_MFA_BackToLogin": "Back to login",
+    "Auth_MFA_InvalidCode": "Invalid verification code",
+    "Auth_MFA_GenericError": "Sorry, something went wrong. Please try again later.",
+    "Auth_MFA_SessionLost": "Your session has expired. Please log in again.",
+    "Auth_MFA_EmailSent": "A verification code has been sent by email.",
     "Base_Connection_CreateSession": "Create a session",
     "Base_Connection_EditSession": "Edit session",
     "Base_Connection_DefaultSession": "Default session ?",

package/lib/i18n/translations/fr.json

@@ -81,6 +81,23 @@
     "Base_Connection_SessionNameAlreadyExist": "Ce nom de session existe déjà",
     "Base_Connection_WrongPasswordOrUserName": "Mauvais nom d'utilisateur ou mot de passe",
     "Base_Connection_InvalidUrl": "Url non valide",
+    "Auth_MFA_Title": "Authentification à deux facteurs",
+    "Auth_MFA_VerificationCode": "Code de vérification",
+    "Auth_MFA_TOTP_Description": "Saisissez le code de votre application d'authentification.",
+    "Auth_MFA_TOTP_Placeholder": "Code de l'application",
+    "Auth_MFA_TOTP_Method": "Application d'authentification",
+    "Auth_MFA_EMAIL_Description": "Saisissez le code reçu par e-mail.",
+    "Auth_MFA_EMAIL_Placeholder": "Code reçu par e-mail",
+    "Auth_MFA_EMAIL_Method": "Vérification par e-mail",
+    "Auth_MFA_Verify": "Vérifier",
+    "Auth_MFA_ResendEmail": "Renvoyer l'e-mail",
+    "Auth_MFA_ResendEmailIn": "Renvoyer l'e-mail dans {{count}}s",
+    "Auth_MFA_OtherOptions": "Autres options",
+    "Auth_MFA_BackToLogin": "Retour à la connexion",
+    "Auth_MFA_InvalidCode": "Code de vérification invalide",
+    "Auth_MFA_GenericError": "Une erreur est survenue. Veuillez réessayer plus tard.",
+    "Auth_MFA_SessionLost": "Votre session a expiré. Veuillez vous reconnecter.",
+    "Auth_MFA_EmailSent": "Un code de vérification a été envoyé par e-mail.",
     "Base_Connection_CreateSession": "Créer une session",
     "Base_Connection_EditSession": "Editer la session",
     "Base_Connection_DefaultSession": "Session par défaut ?",

package/lib/navigator/components/DrawerContent.d.ts

@@ -5,7 +5,7 @@ interface DrawerContentProps {
     state: DrawerState;
     modules: Module[];
     navigation: NavigationObject;
-    onModuleClick: (name: string) => void;
+    onModuleClick: (name?: string) => void;
     onRefresh: () => void;
     versionCheckConfig: any;
 }

package/lib/navigator/components/DrawerContent.js

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import React, { useRef, useMemo, useEffect, useCallback } from 'react';
+import React, { useRef, useMemo, useEffect, useCallback, useState } from 'react';
 import { StyleSheet, View, Animated, ScrollView } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { CommonActions, DrawerActions } from '@react-navigation/native';
@@ -24,7 +24,7 @@ import { authModule } from '../../auth';
 import { PopupApplicationInformation, PopupMinimalRequiredVersion, } from '../../components';
 import { useOutdatedVersion } from '../../hooks';
 import { useActiveModule } from '../providers';
-import { moduleHasMenus, numberOfModules, getDefaultMenuKey, hasSubMenus, } from '../helpers';
+import { getModuleOfMenu, moduleHasMenus, numberOfModules, getDefaultMenuKey, hasSubMenus, } from '../helpers';
 import { AuthMenu, Menu, MenuIconButton, MenuTitle } from './menu';
 const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, versionCheckConfig, }) => {
     const Colors = useThemeColor();
@@ -36,7 +36,7 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
                 ?.filter(_module => _module.menus)
                 ?.flatMap(_module => {
                 const result = [];
-                for (const [key, menu] of Object.entries(_module.menus)) {
+                for (const [key, menu] of Object.entries(_module.menus ?? {})) {
                     result.push(key);
                     if (hasSubMenus(menu)) {
                         result.push(...Object.keys(menu.subMenus));
@@ -50,11 +50,14 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
     const styles = useMemo(() => getStyles(Colors), [Colors]);
     const secondaryMenusLeft = useRef(new Animated.Value(0)).current;
     const { activeModule } = useActiveModule();
-    const innerMenuIsVisible = useMemo(() => activeModule.name !== authModule.name, [activeModule]);
+    const [innerMenuDisabled, setInnerMenuDisabled] = useState(false);
+    const innerMenuIsVisible = useMemo(() => !innerMenuDisabled && activeModule.name !== authModule.name, [activeModule.name, innerMenuDisabled]);
     const drawerModules = useMemo(() => modules
         .filter(moduleHasMenus)
         .filter(_module => _module.name !== authModule.name), [modules]);
     const externalMenuIsVisible = useMemo(() => numberOfModules(drawerModules) > 1, [drawerModules]);
+    const navigatedModule = useMemo(() => getModuleOfMenu(modules, state.routes?.[state.index]?.name), [modules, state.routes, state.index]);
+    const showRestoreNavigatedModule = useMemo(() => externalMenuIsVisible && navigatedModule != null, [externalMenuIsVisible, navigatedModule]);
     const toggleSecondaryMenu = useCallback(() => {
         const openConfig = { toValue: 0, duration: 300 };
         const closeConfig = { toValue: 100, duration: 0 };
@@ -73,6 +76,7 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
         })
         : 0, [externalMenuIsVisible, secondaryMenusLeft]);
     const handleModuleClick = (_module) => {
+        setInnerMenuDisabled(false);
         onModuleClick(_module.name);
         const defaultMenuKey = getDefaultMenuKey(_module);
         if (defaultMenuKey) {
@@ -85,7 +89,7 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
             return;
         }
         const focused = state.routes.indexOf(route) === state.index &&
-            Object.keys(activeModule.menus).includes(route.name);
+            Object.keys(activeModule.menus ?? {}).includes(route.name);
         const event = navigation.emit({
             type: 'drawerItemPress',
             target: route.key,
@@ -111,7 +115,7 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
       {externalMenuIsVisible && (<View style={styles.iconsContainer}>
           <ScrollView showsVerticalScrollIndicator={false} contentContainerStyle={styles.scrollView}>
             {drawerModules.map(_module => (<View style={styles.globalContainer} key={_module.name}>
-                <MenuIconButton style={styles.menuItemContainer} icon={_module.icon} subtitle={_module.subtitle} disabled={_module.disabled} isActive={_module.name === activeModule?.name} onPress={() => handleModuleClick(_module)} compatibility={_module.compatibilityAOS}/>
+                <MenuIconButton style={styles.menuItemContainer} icon={_module.icon ?? ''} subtitle={_module.subtitle} disabled={_module.disabled} isActive={_module.name === activeModule?.name} onPress={() => handleModuleClick(_module)} compatibility={_module.compatibilityAOS}/>
                 {!innerMenuIsVisible && (<MenuTitle module={_module} onPress={() => handleModuleClick(_module)}/>)}
               </View>))}
           </ScrollView>
@@ -123,7 +127,12 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
         <Animated.View style={[styles.secondaryMenusContainer, { left: innerMenuPosition }]}>
           <Menu activeModule={externalMenuIsVisible ? activeModule : drawerModules[0]} state={state} navigation={navigation} authMenu={<AuthMenu onPress={handleModuleClick} isVisible={!externalMenuIsVisible}/>} onItemClick={externalMenuIsVisible
             ? () => { }
-            : () => onModuleClick(drawerModules[0]?.name)} compatibility={externalMenuIsVisible ? null : drawerModules[0].compatibilityAOS}/>
+            : () => onModuleClick(drawerModules[0]?.name)} compatibility={externalMenuIsVisible
+            ? undefined
+            : drawerModules[0].compatibilityAOS} showClose={showRestoreNavigatedModule} onClose={() => {
+            setInnerMenuDisabled(true);
+            onModuleClick(navigatedModule?.name);
+        }}/>
         </Animated.View>
       </View>
     </SafeAreaView>);

package/lib/navigator/components/DrawerContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"DrawerContent.js","sourceRoot":"","sources":["../../../src/navigator/components/DrawerContent.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAC,MAAM,OAAO,CAAC;AACrE,OAAO,EAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AACpE,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAc,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAC;AACtC,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,GAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,kBAAkB,EAAC,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAC7C,OAAO,EAEL,cAAc,EAEd,eAAe,EACf,iBAAiB,EACjB,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAC,MAAM,QAAQ,CAAC;AAWjE,MAAM,aAAa,GAAG,CAAC,EACrB,KAAK,EACL,OAAO,EACP,UAAU,EACV,aAAa,EACb,SAAS,EACT,kBAAkB,GACC,EAAE,EAAE;IACvB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,EAAC,UAAU,EAAC,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IAE5D,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAC3B,aAAa,CAAC,KAAK,CAAC;YAClB,GAAG,MAAM;YACT,MAAM,EAAE,OAAO;gBACb,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;gBAClC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;gBAClB,MAAM,MAAM,GAAG,EAAE,CAAC;gBAElB,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACxD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAEjB,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;wBACtB,MAAM,CAAC,IAAI,CACT,GAAG,MAAM,CAAC,IAAI,CAAE,IAAyB,CAAC,QAAQ,CAAC,CACpD,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC;iBACD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;SACjE,CAAC,CACH,CAAC;IACJ,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IAE1B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1D,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IACjE,MAAM,EAAC,YAAY,EAAC,GAAG,eAAe,EAAE,CAAC;IAEzC,MAAM,kBAAkB,GAAG,OAAO,CAChC,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,EAC3C,CAAC,YAAY,CAAC,CACf,CAAC;IAEF,MAAM,aAAa,GAAG,OAAO,CAC3B,GAAG,EAAE,CACH,OAAO;SACJ,MAAM,CAAC,cAAc,CAAC;SACtB,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,EACxD,CAAC,OAAO,CAAC,CACV,CAAC;IAEF,MAAM,qBAAqB,GAAG,OAAO,CACnC,GAAG,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,EACxC,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,MAAM,mBAAmB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC3C,MAAM,UAAU,GAAG,EAAC,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,EAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAC,CAAC;QAEhD,QAAQ,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAClC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC;YAClD,eAAe,EAAE,KAAK;SACvB,CAAC,CAAC,KAAK,EAAE,CAAC;IACb,CAAC,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAE7C,SAAS,CAAC,GAAG,EAAE;QACb,mBAAmB,EAAE,CAAC;IACxB,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAE1B,MAAM,iBAAiB,GAAG,OAAO,CAC/B,GAAG,EAAE,CACH,qBAAqB;QACnB,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC;YAC7B,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;YACpB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC;SAC5B,CAAC;QACJ,CAAC,CAAC,CAAC,EACP,CAAC,qBAAqB,EAAE,kBAAkB,CAAC,CAC5C,CAAC;IAEF,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAE,EAAE;QAC5C,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE5B,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,cAAc,EAAE,CAAC;YACnB,cAAc,CAAC,cAAc,CAAC,CAAC;QACjC,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,CAAC,OAAe,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;QAEnE,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GACX,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,KAAK;YAC3C,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvD,MAAM,KAAK,GAAQ,UAAU,CAAC,IAAI,CAAC;YACjC,IAAI,EAAE,iBAA0B;YAChC,MAAM,EAAE,KAAK,CAAC,GAAG;YACjB,iBAAiB,EAAE,IAAI;YACvB,IAAI,EAAE,EAAW;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC5B,UAAU,CAAC,QAAQ,CAAC;gBAClB,GAAG,CAAC,OAAO;oBACT,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE;oBAC7B,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;gBAC5D,MAAM,EAAE,KAAK,CAAC,GAAG;aAClB,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,CACL,CAAC,2BAA2B,CAC1B,OAAO,CAAC,sBAAsB,CAC9B,SAAS,CAAC,CAAC,SAAS,CAAC,EACrB,CACH,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CACL,CAAC,2BAA2B,CAC1B,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,CACvC,SAAS,CAAC,CAAC,SAAS,CAAC,EACrB,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CACL,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CACpC;MAAA,CAAC,qBAAqB,IAAI,CACxB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CACjC;UAAA,CAAC,UAAU,CACT,4BAA4B,CAAC,CAAC,KAAK,CAAC,CACpC,qBAAqB,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CACzC;YAAA,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAC5B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CACrD;gBAAA,CAAC,cAAc,CACb,KAAK,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAChC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CACnB,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAC3B,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAC3B,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE,IAAI,CAAC,CAC9C,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAC1C,aAAa,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAE1C;gBAAA,CAAC,CAAC,kBAAkB,IAAI,CACtB,CAAC,SAAS,CACR,MAAM,CAAC,CAAC,OAAO,CAAC,CAChB,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,EAC1C,CACH,CACH;cAAA,EAAE,IAAI,CAAC,CACR,CAAC,CACJ;UAAA,EAAE,UAAU,CACZ;UAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CACtC;YAAA,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,iBAAiB,CAAC,EACvC;UAAA,EAAE,IAAI,CACR;QAAA,EAAE,IAAI,CAAC,CACR,CACD;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CACjC;QAAA,CAAC,QAAQ,CAAC,IAAI,CACZ,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,uBAAuB,EAAE,EAAC,IAAI,EAAE,iBAAiB,EAAC,CAAC,CAAC,CACnE;UAAA,CAAC,IAAI,CACH,YAAY,CAAC,CACX,qBAAqB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CACxD,CAAC,CACD,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,QAAQ,CAAC,CACP,CAAC,QAAQ,CACP,OAAO,CAAC,CAAC,iBAAiB,CAAC,CAC3B,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,EAEtC,CAAC,CACD,WAAW,CAAC,CACV,qBAAqB;YACnB,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC;YACV,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,IAAI,CAChD,CAAC,CACD,aAAa,CAAC,CACZ,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,gBAClD,CAAC,EAEL;QAAA,EAAE,QAAQ,CAAC,IAAI,CACjB;MAAA,EAAE,IAAI,CACR;IAAA,EAAE,YAAY,CAAC,CAChB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,MAAmB,EAAE,EAAE,CACxC,UAAU,CAAC,MAAM,CAAC;IAChB,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;QACP,aAAa,EAAE,KAAK;QACpB,eAAe,EAAE,MAAM,CAAC,qBAAqB;QAC7C,QAAQ,EAAE,QAAQ;QAClB,MAAM,EAAE,CAAC;KACV;IACD,eAAe,EAAE;QACf,aAAa,EAAE,KAAK;KACrB;IACD,cAAc,EAAE;QACd,IAAI,EAAE,CAAC;KACR;IACD,cAAc,EAAE;QACd,cAAc,EAAE,eAAe;QAC/B,gBAAgB,EAAE,EAAE;QACpB,MAAM,EAAE,CAAC;KACV;IACD,UAAU,EAAE;QACV,aAAa,EAAE,EAAE;KAClB;IACD,mBAAmB,EAAE;QACnB,cAAc,EAAE,CAAC;KAClB;IACD,iBAAiB,EAAE;QACjB,MAAM,EAAE,EAAE;QACV,cAAc,EAAE,CAAC;QACjB,cAAc,EAAE,QAAQ;QACxB,MAAM,EAAE,CAAC;KACV;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,UAAU;QACpB,eAAe,EAAE,MAAM,CAAC,eAAe;QACvC,IAAI,EAAE,CAAC;QACP,GAAG,EAAE,CAAC;QACN,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,CAAC;QACZ,aAAa,EAAE,GAAG;QAClB,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU;QAC7C,YAAY,EAAE,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;KACpC;CACF,CAAC,CAAC;AAEL,eAAe,aAAa,CAAC"}
+{"version":3,"file":"DrawerContent.js","sourceRoot":"","sources":["../../../src/navigator/components/DrawerContent.tsx"],"names":[],"mappings":"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"}

package/lib/navigator/components/menu/Menu.d.ts

@@ -7,7 +7,9 @@ interface MenuProps {
     authMenu?: React.ReactNode;
     activeModule: Module;
     onItemClick: () => void;
-    compatibility: Compatibility;
+    compatibility?: Compatibility;
+    showClose?: boolean;
+    onClose?: () => void;
 }
-declare const Menu: ({ state, navigation, authMenu, activeModule, onItemClick, compatibility, }: MenuProps) => React.JSX.Element;
+declare const Menu: ({ state, navigation, authMenu, activeModule, onItemClick, compatibility, showClose, onClose, }: MenuProps) => React.JSX.Element;
 export default Menu;

package/lib/navigator/components/menu/Menu.js

@@ -17,18 +17,20 @@
  */
 import React, { useMemo } from 'react';
 import { View, StyleSheet, ScrollView } from 'react-native';
-import { Text, WarningCard } from '@axelor/aos-mobile-ui';
+import { Icon, Text, useThemeColor, WarningCard } from '@axelor/aos-mobile-ui';
 import { useTranslator } from '../../../i18n';
 import { getCompatibilityError, getMenuTitle, isMenuIncompatible, } from '../../helpers';
 import MenuItemList from './MenuItemList';
-const Menu = ({ state, navigation, authMenu, activeModule, onItemClick, compatibility, }) => {
+const Menu = ({ state, navigation, authMenu, activeModule, onItemClick, compatibility, showClose = false, onClose, }) => {
     const I18n = useTranslator();
+    const Colors = useThemeColor();
     const title = useMemo(() => getMenuTitle(activeModule, I18n), [I18n, activeModule]);
     const compatibilityError = useMemo(() => isMenuIncompatible(compatibility), [compatibility]);
     return (<View style={styles.menuContainer}>
       <ScrollView contentContainerStyle={styles.moduleMenuContainer} showsVerticalScrollIndicator={false}>
         <View style={styles.menuTitleContainer}>
           <Text style={styles.menuTitle}>{title}</Text>
+          {showClose && (<Icon name="x-lg" size={20} color={Colors.secondaryColor_dark.background} touchable onPress={onClose}/>)}
         </View>
         {compatibilityError && (<WarningCard errorMessage={getCompatibilityError(compatibility, I18n)}/>)}
         <MenuItemList state={state} navigation={navigation} activeModule={activeModule} onItemClick={onItemClick} disabled={compatibilityError}/>
@@ -47,10 +49,14 @@ const styles = StyleSheet.create({
         paddingVertical: 8,
     },
     menuTitleContainer: {
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        alignItems: 'center',
         paddingHorizontal: 16,
         marginBottom: 8,
     },
     menuTitle: {
+        flexShrink: 1,
         fontSize: 21,
         fontWeight: 'bold',
     },