@axelor/aos-mobile-core 9.0.10 → 9.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/axios-init.d.ts +10 -0
- package/lib/api/axios-init.js +43 -0
- package/lib/api/axios-init.js.map +1 -0
- package/lib/api/index.d.ts +2 -1
- package/lib/api/index.js +2 -1
- package/lib/api/index.js.map +1 -1
- package/lib/api/login-api.d.ts +2 -16
- package/lib/api/login-api.js +13 -27
- package/lib/api/login-api.js.map +1 -1
- package/lib/apiProviders/Standard/ObjectFieldsProvider.d.ts +2 -0
- package/lib/apiProviders/Standard/ObjectFieldsProvider.js +17 -2
- package/lib/apiProviders/Standard/ObjectFieldsProvider.js.map +1 -1
- package/lib/apiProviders/Standard/index.d.ts +1 -1
- package/lib/apiProviders/Standard/index.js +1 -1
- package/lib/apiProviders/Standard/index.js.map +1 -1
- package/lib/apiProviders/Standard/requests.helper.d.ts +2 -1
- package/lib/apiProviders/Standard/requests.helper.js +7 -4
- package/lib/apiProviders/Standard/requests.helper.js.map +1 -1
- package/lib/features/authSlice.d.ts +51 -4
- package/lib/features/authSlice.js +108 -13
- package/lib/features/authSlice.js.map +1 -1
- package/lib/i18n/translations/en.json +17 -0
- package/lib/i18n/translations/fr.json +17 -0
- package/lib/navigator/components/DrawerContent.d.ts +1 -1
- package/lib/navigator/components/DrawerContent.js +16 -7
- package/lib/navigator/components/DrawerContent.js.map +1 -1
- package/lib/navigator/components/menu/Menu.d.ts +4 -2
- package/lib/navigator/components/menu/Menu.js +8 -2
- package/lib/navigator/components/menu/Menu.js.map +1 -1
- package/lib/navigator/helpers/index.d.ts +1 -1
- package/lib/navigator/helpers/index.js +1 -1
- package/lib/navigator/helpers/index.js.map +1 -1
- package/lib/navigator/helpers/menu.helper.d.ts +5 -4
- package/lib/navigator/helpers/menu.helper.js +17 -6
- package/lib/navigator/helpers/menu.helper.js.map +1 -1
- package/lib/screens/LoginScreen.js +2 -1
- package/lib/screens/LoginScreen.js.map +1 -1
- package/lib/screens/SessionManagementScreen.js +2 -1
- package/lib/screens/SessionManagementScreen.js.map +1 -1
- package/lib/sessions/components/alerts/MfaVerificationPopup.d.ts +3 -0
- package/lib/sessions/components/alerts/MfaVerificationPopup.js +136 -0
- package/lib/sessions/components/alerts/MfaVerificationPopup.js.map +1 -0
- package/lib/sessions/components/alerts/index.d.ts +1 -0
- package/lib/sessions/components/alerts/index.js +1 -0
- package/lib/sessions/components/alerts/index.js.map +1 -1
- package/lib/sessions/components/inputs/MfaCodeInput.d.ts +10 -0
- package/lib/sessions/components/inputs/MfaCodeInput.js +38 -0
- package/lib/sessions/components/inputs/MfaCodeInput.js.map +1 -0
- package/lib/sessions/components/inputs/index.d.ts +1 -0
- package/lib/sessions/components/inputs/index.js +1 -0
- package/lib/sessions/components/inputs/index.js.map +1 -1
- package/lib/sessions/index.d.ts +1 -0
- package/lib/sessions/index.js +1 -0
- package/lib/sessions/index.js.map +1 -1
- package/lib/sessions/mfa/api.d.ts +7 -0
- package/lib/sessions/mfa/api.js +71 -0
- package/lib/sessions/mfa/api.js.map +1 -0
- package/lib/sessions/mfa/errors.d.ts +14 -0
- package/lib/sessions/mfa/errors.js +36 -0
- package/lib/sessions/mfa/errors.js.map +1 -0
- package/lib/sessions/mfa/index.d.ts +6 -0
- package/lib/sessions/mfa/index.js +23 -0
- package/lib/sessions/mfa/index.js.map +1 -0
- package/lib/sessions/mfa/type.d.ts +34 -0
- package/lib/sessions/mfa/type.js +35 -0
- package/lib/sessions/mfa/type.js.map +1 -0
- package/lib/sessions/mfa/use-email-code.d.ts +14 -0
- package/lib/sessions/mfa/use-email-code.js +74 -0
- package/lib/sessions/mfa/use-email-code.js.map +1 -0
- package/lib/sessions/mfa/utils.d.ts +7 -0
- package/lib/sessions/mfa/utils.js +60 -0
- package/lib/sessions/mfa/utils.js.map +1 -0
- package/lib/utils/object.d.ts +1 -1
- package/lib/utils/string.d.ts +3 -3
- package/lib/utils/string.js +5 -7
- package/lib/utils/string.js.map +1 -1
- package/package.json +8 -8
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare function ejectAxios({ requestInterceptorId, responseInterceptorId, }: {
|
|
2
|
+
requestInterceptorId: number;
|
|
3
|
+
responseInterceptorId: number;
|
|
4
|
+
}): void;
|
|
5
|
+
export declare function initAxiosWithHeaders(res: any, url: string): {
|
|
6
|
+
token: any;
|
|
7
|
+
jsessionId: string;
|
|
8
|
+
requestInterceptorId: number;
|
|
9
|
+
responseInterceptorId: number;
|
|
10
|
+
};
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Axelor Business Solutions
|
|
3
|
+
*
|
|
4
|
+
* Copyright (C) 2026 Axelor (<http://axelor.com>).
|
|
5
|
+
*
|
|
6
|
+
* This program is free software: you can redistribute it and/or modify
|
|
7
|
+
* it under the terms of the GNU Affero General Public License, version 3,
|
|
8
|
+
* as published by the Free Software Foundation.
|
|
9
|
+
*
|
|
10
|
+
* This program is distributed in the hope that it will be useful,
|
|
11
|
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12
|
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13
|
+
* GNU Affero General Public License for more details.
|
|
14
|
+
*
|
|
15
|
+
* You should have received a copy of the GNU Affero General Public License
|
|
16
|
+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
|
+
*/
|
|
18
|
+
import axios from 'axios';
|
|
19
|
+
import { fieldsParserMiddleware, provider, translationMiddleware, maintenanceMiddleware, } from '../apiProviders';
|
|
20
|
+
const SESSION_REGEX = /JSESSIONID=([^;]*);/g;
|
|
21
|
+
const getJsessionId = (cookie) => {
|
|
22
|
+
return cookie?.match(SESSION_REGEX)?.[0];
|
|
23
|
+
};
|
|
24
|
+
export function ejectAxios({ requestInterceptorId, responseInterceptorId, }) {
|
|
25
|
+
axios.interceptors.request.eject(requestInterceptorId);
|
|
26
|
+
axios.interceptors.request.eject(responseInterceptorId);
|
|
27
|
+
}
|
|
28
|
+
export function initAxiosWithHeaders(res, url) {
|
|
29
|
+
const token = res.headers['x-csrf-token'];
|
|
30
|
+
const jsessionId = getJsessionId(res.headers['set-cookie']?.[0]);
|
|
31
|
+
if (token == null) {
|
|
32
|
+
throw new Error('X-CSRF-Token is not exposed in remote header');
|
|
33
|
+
}
|
|
34
|
+
const requestInterceptorId = axios.interceptors.request.use(config => {
|
|
35
|
+
config.baseURL = url;
|
|
36
|
+
config.headers['x-csrf-token'] = token;
|
|
37
|
+
return config;
|
|
38
|
+
});
|
|
39
|
+
const responseInterceptorId = axios.interceptors.response.use(_response => fieldsParserMiddleware(translationMiddleware(_response)), _error => maintenanceMiddleware(_error));
|
|
40
|
+
provider.getModelApi()?.init();
|
|
41
|
+
return { token, jsessionId, requestInterceptorId, responseInterceptorId };
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=axios-init.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"axios-init.js","sourceRoot":"","sources":["../../src/api/axios-init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,sBAAsB,EACtB,QAAQ,EACR,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,aAAa,GAAG,sBAAsB,CAAC;AAE7C,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,EAAE;IACvC,OAAO,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAC3C,CAAC,CAAC;AAEF,MAAM,UAAU,UAAU,CAAC,EACzB,oBAAoB,EACpB,qBAAqB,GAItB;IACC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACvD,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAQ,EAAE,GAAW;IACxD,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjE,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,oBAAoB,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QACnE,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC;QACrB,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC;QAEvC,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,MAAM,qBAAqB,GAAG,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAC3D,SAAS,CAAC,EAAE,CAAC,sBAAsB,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,EACrE,MAAM,CAAC,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,CACxC,CAAC;IAEF,QAAQ,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC;IAE/B,OAAO,EAAC,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,qBAAqB,EAAC,CAAC;AAC1E,CAAC"}
|
package/lib/api/index.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export { fetchAnomalies } from './anomaly-api';
|
|
2
2
|
export { fetchDefaultFilters, fetchMetaFilters, fetchViewContext, } from './aop-filter-api';
|
|
3
3
|
export { getAppConfig } from './app-config-api';
|
|
4
|
+
export { ejectAxios, initAxiosWithHeaders } from './axios-init';
|
|
4
5
|
export { getAllCurrencies } from './currency-api';
|
|
5
|
-
export {
|
|
6
|
+
export { getActiveUserInfo, loginApi, logoutApi } from './login-api';
|
|
6
7
|
export { getAllMetaModules } from './meta-module-api';
|
|
7
8
|
export { deleteMetaFile, fetchFileDetails, uploadBase64, uploadFile, } from './metafile-api';
|
|
8
9
|
export { fetchModel } from './model-api';
|
package/lib/api/index.js
CHANGED
|
@@ -18,8 +18,9 @@
|
|
|
18
18
|
export { fetchAnomalies } from './anomaly-api';
|
|
19
19
|
export { fetchDefaultFilters, fetchMetaFilters, fetchViewContext, } from './aop-filter-api';
|
|
20
20
|
export { getAppConfig } from './app-config-api';
|
|
21
|
+
export { ejectAxios, initAxiosWithHeaders } from './axios-init';
|
|
21
22
|
export { getAllCurrencies } from './currency-api';
|
|
22
|
-
export {
|
|
23
|
+
export { getActiveUserInfo, loginApi, logoutApi } from './login-api';
|
|
23
24
|
export { getAllMetaModules } from './meta-module-api';
|
|
24
25
|
export { deleteMetaFile, fetchFileDetails, uploadBase64, uploadFile, } from './metafile-api';
|
|
25
26
|
export { fetchModel } from './model-api';
|
package/lib/api/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAC7C,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAC7C,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAC,iBAAiB,EAAE,QAAQ,EAAE,SAAS,EAAC,MAAM,aAAa,CAAC;AACnE,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,UAAU,GACX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AACvC,OAAO,EAAC,UAAU,EAAE,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,sBAAsB,IAAI,yBAAyB,GACpD,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,UAAU,IAAI,aAAa,EAAC,MAAM,YAAY,CAAC"}
|
package/lib/api/login-api.d.ts
CHANGED
|
@@ -1,19 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
responseInterceptorId: number;
|
|
4
|
-
}): void;
|
|
5
|
-
export declare function initAxiosWithHeaders(res: any, url: string): {
|
|
6
|
-
token: any;
|
|
7
|
-
jsessionId: string;
|
|
8
|
-
requestInterceptorId: number;
|
|
9
|
-
responseInterceptorId: number;
|
|
10
|
-
};
|
|
11
|
-
export declare function loginApi(url: string, username: string, password: string): Promise<{
|
|
12
|
-
token: string;
|
|
13
|
-
jsessionId: string;
|
|
14
|
-
requestInterceptorId: number;
|
|
15
|
-
responseInterceptorId: number;
|
|
16
|
-
}>;
|
|
1
|
+
import type { LoginResult } from '../sessions';
|
|
2
|
+
export declare function loginApi(url: string, username: string, password: string): Promise<LoginResult>;
|
|
17
3
|
export declare function logoutApi(): Promise<import("axios").AxiosResponse<any, any, {}>>;
|
|
18
4
|
export declare function getActiveUserInfo(): Promise<{
|
|
19
5
|
userId: any;
|
package/lib/api/login-api.js
CHANGED
|
@@ -16,35 +16,21 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import axios from 'axios';
|
|
19
|
-
import {
|
|
19
|
+
import { initAxiosWithHeaders } from './axios-init';
|
|
20
20
|
const LOGIN_PATH = 'callback';
|
|
21
|
-
const
|
|
22
|
-
const getJsessionId = (cookie) => {
|
|
23
|
-
return cookie?.match(SESSION_REGEX)?.[0];
|
|
24
|
-
};
|
|
25
|
-
export function ejectAxios({ requestInterceptorId, responseInterceptorId, }) {
|
|
26
|
-
axios.interceptors.request.eject(requestInterceptorId);
|
|
27
|
-
axios.interceptors.request.eject(responseInterceptorId);
|
|
28
|
-
}
|
|
29
|
-
export function initAxiosWithHeaders(res, url) {
|
|
30
|
-
const token = res.headers['x-csrf-token'];
|
|
31
|
-
const jsessionId = getJsessionId(res.headers['set-cookie']?.[0]);
|
|
32
|
-
if (token == null) {
|
|
33
|
-
throw new Error('X-CSRF-Token is not exposed in remote header');
|
|
34
|
-
}
|
|
35
|
-
const requestInterceptorId = axios.interceptors.request.use(config => {
|
|
36
|
-
config.baseURL = url;
|
|
37
|
-
config.headers['x-csrf-token'] = token;
|
|
38
|
-
return config;
|
|
39
|
-
});
|
|
40
|
-
const responseInterceptorId = axios.interceptors.response.use(_response => fieldsParserMiddleware(translationMiddleware(_response)), _error => maintenanceMiddleware(_error));
|
|
41
|
-
provider.getModelApi()?.init();
|
|
42
|
-
return { token, jsessionId, requestInterceptorId, responseInterceptorId };
|
|
43
|
-
}
|
|
21
|
+
const isMfaRouteResponse = (data) => data?.route?.path === '/mfa';
|
|
44
22
|
export async function loginApi(url, username, password) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
23
|
+
const res = await axios.post(`${url}${LOGIN_PATH}`, { username, password });
|
|
24
|
+
if (isMfaRouteResponse(res.data)) {
|
|
25
|
+
const state = res.data?.route?.state ?? {};
|
|
26
|
+
return {
|
|
27
|
+
kind: 'mfa',
|
|
28
|
+
methods: Array.isArray(state.methods) ? state.methods : [],
|
|
29
|
+
username: state.username ?? username,
|
|
30
|
+
emailRetryAfter: state.emailRetryAfter,
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
return { kind: 'session', ...initAxiosWithHeaders(res, url) };
|
|
48
34
|
}
|
|
49
35
|
export async function logoutApi() {
|
|
50
36
|
return axios.get('/logout');
|
package/lib/api/login-api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-api.js","sourceRoot":"","sources":["../../src/api/login-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"login-api.js","sourceRoot":"","sources":["../../src/api/login-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAElD,MAAM,UAAU,GAAG,UAAU,CAAC;AAE9B,MAAM,kBAAkB,GAAG,CAAC,IAAS,EAAW,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,KAAK,MAAM,CAAC;AAEhF,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,GAAW,EACX,QAAgB,EAChB,QAAgB;IAEhB,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG,UAAU,EAAE,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC,CAAC,CAAC;IAE1E,IAAI,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC;QAC3C,OAAO;YACL,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1D,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,QAAQ;YACpC,eAAe,EAAE,KAAK,CAAC,eAAe;SACvC,CAAC;IACJ,CAAC;IAED,OAAO,EAAC,IAAI,EAAE,SAAS,EAAE,GAAG,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,CAAC;AAC9D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACxD,OAAO;QACL,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QAChC,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI;KACnD,CAAC;AACJ,CAAC"}
|
|
@@ -9,6 +9,7 @@ declare class ObjectFieldsProvider {
|
|
|
9
9
|
init(models: Models): void;
|
|
10
10
|
getObjectSchema(objectKey: string): Schema;
|
|
11
11
|
getObjectFields(objectKey: string): string[];
|
|
12
|
+
getObjectFieldsForSearch(objectKey: string): string[];
|
|
12
13
|
private handleSchemaField;
|
|
13
14
|
getSortFields(objectKey: string): string[];
|
|
14
15
|
getSearchFields(objectKey: string): string[];
|
|
@@ -16,6 +17,7 @@ declare class ObjectFieldsProvider {
|
|
|
16
17
|
}
|
|
17
18
|
export declare const objectFieldsProvider: ObjectFieldsProvider;
|
|
18
19
|
export declare function getObjectFields(objectKey: string): string[];
|
|
20
|
+
export declare function getObjectFieldsForSearch(objectKey: string): string[];
|
|
19
21
|
export declare function getSortFields(objectKey: string): string[];
|
|
20
22
|
export declare function getSearchCriterias(objectKey: string, searchValue: string): CriteriaGroup;
|
|
21
23
|
export {};
|
|
@@ -44,13 +44,25 @@ class ObjectFieldsProvider {
|
|
|
44
44
|
}
|
|
45
45
|
return [];
|
|
46
46
|
}
|
|
47
|
-
|
|
47
|
+
getObjectFieldsForSearch(objectKey) {
|
|
48
|
+
const objectSchema = this.getObjectSchema(objectKey);
|
|
49
|
+
if (objectSchema != null) {
|
|
50
|
+
return this.handleSchemaField(objectSchema, false, true);
|
|
51
|
+
}
|
|
52
|
+
return [];
|
|
53
|
+
}
|
|
54
|
+
handleSchemaField(schema, isNested = false, excludeNestedArrays = false) {
|
|
48
55
|
const fields = schema.fields;
|
|
49
56
|
const result = [];
|
|
50
57
|
for (const fieldName of schema._nodes) {
|
|
58
|
+
if (isNested &&
|
|
59
|
+
excludeNestedArrays &&
|
|
60
|
+
fields[fieldName].type === 'array') {
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
51
63
|
result.push(fieldName);
|
|
52
64
|
if (fields[fieldName].type === 'object') {
|
|
53
|
-
this.handleSchemaField(fields[fieldName]).forEach(_field => {
|
|
65
|
+
this.handleSchemaField(fields[fieldName], true, excludeNestedArrays).forEach(_field => {
|
|
54
66
|
if (_field === 'id' ||
|
|
55
67
|
_field === '$version' ||
|
|
56
68
|
_field === 'version') {
|
|
@@ -93,6 +105,9 @@ export const objectFieldsProvider = new ObjectFieldsProvider();
|
|
|
93
105
|
export function getObjectFields(objectKey) {
|
|
94
106
|
return objectFieldsProvider.getObjectFields(objectKey);
|
|
95
107
|
}
|
|
108
|
+
export function getObjectFieldsForSearch(objectKey) {
|
|
109
|
+
return objectFieldsProvider.getObjectFieldsForSearch(objectKey);
|
|
110
|
+
}
|
|
96
111
|
export function getSortFields(objectKey) {
|
|
97
112
|
return objectFieldsProvider.getSortFields(objectKey);
|
|
98
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectFieldsProvider.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/ObjectFieldsProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,MAAM,oBAAoB;IAChB,YAAY,CAAe;IAC3B,YAAY,CAAe;IAC3B,UAAU,CAAa;IAE/B;QACE,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACtC,CAAC;IAED,eAAe,CAAC,SAAiB;QAC/B,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEzD,IAAI,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,eAAe,CAAC,SAAiB;QAC/B,MAAM,YAAY,GAAQ,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;
|
|
1
|
+
{"version":3,"file":"ObjectFieldsProvider.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/ObjectFieldsProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,MAAM,oBAAoB;IAChB,YAAY,CAAe;IAC3B,YAAY,CAAe;IAC3B,UAAU,CAAa;IAE/B;QACE,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACtC,CAAC;IAED,eAAe,CAAC,SAAiB;QAC/B,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEzD,IAAI,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,eAAe,CAAC,SAAiB;QAC/B,MAAM,YAAY,GAAQ,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,wBAAwB,CAAC,SAAiB;QACxC,MAAM,YAAY,GAAQ,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,iBAAiB,CACvB,MAAW,EACX,QAAQ,GAAG,KAAK,EAChB,mBAAmB,GAAG,KAAK;QAE3B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACtC,IACE,QAAQ;gBACR,mBAAmB;gBACnB,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,KAAK,OAAO,EAClC,CAAC;gBACD,SAAS;YACX,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEvB,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACxC,IAAI,CAAC,iBAAiB,CACpB,MAAM,CAAC,SAAS,CAAC,EACjB,IAAI,EACJ,mBAAmB,CACpB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBACjB,IACE,MAAM,KAAK,IAAI;wBACf,MAAM,KAAK,UAAU;wBACrB,MAAM,KAAK,SAAS,EACpB,CAAC;wBACD,OAAO;oBACT,CAAC;oBAED,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,IAAI,MAAM,EAAE,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC;IAC5E,CAAC;IAED,aAAa,CAAC,SAAiB;QAC7B,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvD,IAAI,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,SAAiB;QAC/B,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEzD,IAAI,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,kBAAkB,CAAC,SAAiB,EAAE,WAAmB;QACvD,MAAM,YAAY,GAAa,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE/D,IAAI,QAAQ,GAAoB,EAAE,CAAC;QAEnC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7D,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;gBAC3C,SAAS,EAAE,YAAY;gBACvB,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,WAAW;aACnB,CAAC,CAAC,CAAC;QACN,CAAC;QAED,OAAO,EAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAC,CAAC;IAC9C,CAAC;CACF;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,oBAAoB,EAAE,CAAC;AAE/D,MAAM,UAAU,eAAe,CAAC,SAAiB;IAC/C,OAAO,oBAAoB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,SAAiB;IACxD,OAAO,oBAAoB,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,SAAiB;IAC7C,OAAO,oBAAoB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,SAAiB,EACjB,WAAmB;IAEnB,OAAO,oBAAoB,CAAC,kBAAkB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AACzE,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export { ApiProvider, axiosApiProvider } from './AxiosProvider';
|
|
2
|
-
export { getObjectFields, getSearchCriterias, getSortFields, objectFieldsProvider, } from './ObjectFieldsProvider';
|
|
2
|
+
export { getObjectFields, getObjectFieldsForSearch, getSearchCriterias, getSortFields, objectFieldsProvider, } from './ObjectFieldsProvider';
|
|
3
3
|
export { createHierarchicalSearch, createStandardSearch, createStandardFetch, } from './requests.helper';
|
|
@@ -16,6 +16,6 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
export { axiosApiProvider } from './AxiosProvider';
|
|
19
|
-
export { getObjectFields, getSearchCriterias, getSortFields, objectFieldsProvider, } from './ObjectFieldsProvider';
|
|
19
|
+
export { getObjectFields, getObjectFieldsForSearch, getSearchCriterias, getSortFields, objectFieldsProvider, } from './ObjectFieldsProvider';
|
|
20
20
|
export { createHierarchicalSearch, createStandardSearch, createStandardFetch, } from './requests.helper';
|
|
21
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAc,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,aAAa,EACb,oBAAoB,GACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAc,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EACL,eAAe,EACf,wBAAwB,EACxB,kBAAkB,EAClB,aAAa,EACb,oBAAoB,GACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,mBAAmB,CAAC"}
|
|
@@ -15,6 +15,7 @@ interface SearchProps {
|
|
|
15
15
|
companyFieldName?: string;
|
|
16
16
|
companySetFieldName?: string;
|
|
17
17
|
filter?: Filter;
|
|
18
|
+
includeNestedArrayFields?: boolean;
|
|
18
19
|
}
|
|
19
20
|
interface HierarchicalSearchProps extends SearchProps {
|
|
20
21
|
parentField: string;
|
|
@@ -32,7 +33,7 @@ declare class RequestBuilder {
|
|
|
32
33
|
constructor();
|
|
33
34
|
init(defaultRequestLimit: number): void;
|
|
34
35
|
getRequestLimit(): number;
|
|
35
|
-
createStandardSearch: ({ model, criteria, domain, domainContext, fieldKey, sortKey, page, numberElementsByPage, provider, companyId, isCompanyM2M, companyFieldName, companySetFieldName, filter, }: SearchProps) => Promise<any>;
|
|
36
|
+
createStandardSearch: ({ model, criteria, domain, domainContext, fieldKey, sortKey, page, numberElementsByPage, provider, companyId, isCompanyM2M, companyFieldName, companySetFieldName, filter, includeNestedArrayFields, }: SearchProps) => Promise<any>;
|
|
36
37
|
private getIdsHierarchicalSearch;
|
|
37
38
|
createHierarchicalSearch: ({ parentField, parentId, criteria, ...props }: HierarchicalSearchProps) => Promise<any>;
|
|
38
39
|
createStandardFetch: ({ model, fieldKey, id, relatedFields, provider, }: FetchProps) => Promise<any>;
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import { getModelApi } from '../Model';
|
|
19
19
|
import { axiosApiProvider } from './AxiosProvider';
|
|
20
|
-
import { getObjectFields, getSortFields } from './ObjectFieldsProvider';
|
|
20
|
+
import { getObjectFields, getObjectFieldsForSearch, getSortFields, } from './ObjectFieldsProvider';
|
|
21
21
|
class RequestBuilder {
|
|
22
22
|
requestLimit;
|
|
23
23
|
constructor() {
|
|
@@ -29,7 +29,7 @@ class RequestBuilder {
|
|
|
29
29
|
getRequestLimit() {
|
|
30
30
|
return this.requestLimit;
|
|
31
31
|
}
|
|
32
|
-
createStandardSearch = ({ model, criteria = [], domain = '', domainContext = {}, fieldKey, sortKey, page = 0, numberElementsByPage, provider = 'axios', companyId, isCompanyM2M = false, companyFieldName, companySetFieldName, filter, }) => {
|
|
32
|
+
createStandardSearch = ({ model, criteria = [], domain = '', domainContext = {}, fieldKey, sortKey, page = 0, numberElementsByPage, provider = 'axios', companyId, isCompanyM2M = false, companyFieldName, companySetFieldName, filter, includeNestedArrayFields = false, }) => {
|
|
33
33
|
if (model == null || fieldKey == null) {
|
|
34
34
|
return null;
|
|
35
35
|
}
|
|
@@ -73,12 +73,15 @@ class RequestBuilder {
|
|
|
73
73
|
..._filterContext,
|
|
74
74
|
};
|
|
75
75
|
}
|
|
76
|
+
const fields = includeNestedArrayFields
|
|
77
|
+
? getObjectFields(fieldKey)
|
|
78
|
+
: getObjectFieldsForSearch(fieldKey);
|
|
76
79
|
if (provider === 'axios') {
|
|
77
80
|
axiosApiProvider.post({
|
|
78
81
|
url: `/ws/rest/${model}/search`,
|
|
79
82
|
data: {
|
|
80
83
|
data: data,
|
|
81
|
-
fields
|
|
84
|
+
fields,
|
|
82
85
|
sortBy: sortKey ? getSortFields(sortKey) : ['id'],
|
|
83
86
|
limit: limit,
|
|
84
87
|
offset: limit * page,
|
|
@@ -90,7 +93,7 @@ class RequestBuilder {
|
|
|
90
93
|
modelName: model,
|
|
91
94
|
query: {
|
|
92
95
|
data: data,
|
|
93
|
-
fields
|
|
96
|
+
fields,
|
|
94
97
|
sortBy: sortKey ? getSortFields(sortKey) : ['id'],
|
|
95
98
|
limit: limit,
|
|
96
99
|
offset: limit * page,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requests.helper.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/requests.helper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAmB,WAAW,EAAC,MAAM,UAAU,CAAC;AACvD,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"requests.helper.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/requests.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,29 @@
|
|
|
1
1
|
export const login: import("@reduxjs/toolkit").AsyncThunk<{
|
|
2
|
+
phase: string;
|
|
3
|
+
url: any;
|
|
4
|
+
token: any;
|
|
5
|
+
jsessionId: any;
|
|
6
|
+
userId: any;
|
|
7
|
+
requestInterceptorId: any;
|
|
8
|
+
responseInterceptorId: any;
|
|
9
|
+
applicationMode: any;
|
|
10
|
+
} | {
|
|
11
|
+
phase: string;
|
|
2
12
|
url: string;
|
|
3
|
-
|
|
4
|
-
|
|
13
|
+
mfaState: {
|
|
14
|
+
username: string;
|
|
15
|
+
methods: import("../sessions").MfaMethod[];
|
|
16
|
+
emailRetryAfter: string;
|
|
17
|
+
};
|
|
18
|
+
}, void, import("@reduxjs/toolkit").AsyncThunkConfig>;
|
|
19
|
+
export const verifyMfa: import("@reduxjs/toolkit").AsyncThunk<{
|
|
20
|
+
phase: string;
|
|
21
|
+
url: any;
|
|
22
|
+
token: any;
|
|
23
|
+
jsessionId: any;
|
|
5
24
|
userId: any;
|
|
6
|
-
requestInterceptorId:
|
|
7
|
-
responseInterceptorId:
|
|
25
|
+
requestInterceptorId: any;
|
|
26
|
+
responseInterceptorId: any;
|
|
8
27
|
applicationMode: any;
|
|
9
28
|
}, void, import("@reduxjs/toolkit").AsyncThunkConfig>;
|
|
10
29
|
export const isUrlValid: import("@reduxjs/toolkit").AsyncThunk<any, void, import("@reduxjs/toolkit").AsyncThunkConfig>;
|
|
@@ -12,6 +31,8 @@ export const logout: import("@reduxjs/toolkit").AsyncThunk<void, void, import("@
|
|
|
12
31
|
export const authSlice: import("@reduxjs/toolkit").Slice<{
|
|
13
32
|
loading: boolean;
|
|
14
33
|
logged: boolean;
|
|
34
|
+
mfaPending: boolean;
|
|
35
|
+
mfaState: any;
|
|
15
36
|
userId: any;
|
|
16
37
|
baseUrl: any;
|
|
17
38
|
token: any;
|
|
@@ -25,6 +46,8 @@ export const authSlice: import("@reduxjs/toolkit").Slice<{
|
|
|
25
46
|
clearError: (state: {
|
|
26
47
|
loading: boolean;
|
|
27
48
|
logged: boolean;
|
|
49
|
+
mfaPending: boolean;
|
|
50
|
+
mfaState: any;
|
|
28
51
|
userId: any;
|
|
29
52
|
baseUrl: any;
|
|
30
53
|
token: any;
|
|
@@ -38,6 +61,8 @@ export const authSlice: import("@reduxjs/toolkit").Slice<{
|
|
|
38
61
|
setAppVersion: (state: {
|
|
39
62
|
loading: boolean;
|
|
40
63
|
logged: boolean;
|
|
64
|
+
mfaPending: boolean;
|
|
65
|
+
mfaState: any;
|
|
41
66
|
userId: any;
|
|
42
67
|
baseUrl: any;
|
|
43
68
|
token: any;
|
|
@@ -54,6 +79,8 @@ export const authSlice: import("@reduxjs/toolkit").Slice<{
|
|
|
54
79
|
updateAuthState: (state: {
|
|
55
80
|
loading: boolean;
|
|
56
81
|
logged: boolean;
|
|
82
|
+
mfaPending: boolean;
|
|
83
|
+
mfaState: any;
|
|
57
84
|
userId: any;
|
|
58
85
|
baseUrl: any;
|
|
59
86
|
token: any;
|
|
@@ -67,9 +94,26 @@ export const authSlice: import("@reduxjs/toolkit").Slice<{
|
|
|
67
94
|
payload: any;
|
|
68
95
|
type: string;
|
|
69
96
|
}) => void;
|
|
97
|
+
cancelMfa: (state: {
|
|
98
|
+
loading: boolean;
|
|
99
|
+
logged: boolean;
|
|
100
|
+
mfaPending: boolean;
|
|
101
|
+
mfaState: any;
|
|
102
|
+
userId: any;
|
|
103
|
+
baseUrl: any;
|
|
104
|
+
token: any;
|
|
105
|
+
jsessionId: any;
|
|
106
|
+
requestInterceptorId: any;
|
|
107
|
+
responseInterceptorId: any;
|
|
108
|
+
applicationMode: any;
|
|
109
|
+
error: any;
|
|
110
|
+
appVersion: any;
|
|
111
|
+
}) => void;
|
|
70
112
|
}, "auth", "auth", import("@reduxjs/toolkit").SliceSelectors<{
|
|
71
113
|
loading: boolean;
|
|
72
114
|
logged: boolean;
|
|
115
|
+
mfaPending: boolean;
|
|
116
|
+
mfaState: any;
|
|
73
117
|
userId: any;
|
|
74
118
|
baseUrl: any;
|
|
75
119
|
token: any;
|
|
@@ -83,9 +127,12 @@ export const authSlice: import("@reduxjs/toolkit").Slice<{
|
|
|
83
127
|
export const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"auth/clearError">;
|
|
84
128
|
export const setAppVersion: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "auth/setAppVersion">;
|
|
85
129
|
export const updateAuthState: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "auth/updateAuthState">;
|
|
130
|
+
export const cancelMfa: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"auth/cancelMfa">;
|
|
86
131
|
export const authReducer: import("redux").Reducer<{
|
|
87
132
|
loading: boolean;
|
|
88
133
|
logged: boolean;
|
|
134
|
+
mfaPending: boolean;
|
|
135
|
+
mfaState: any;
|
|
89
136
|
userId: any;
|
|
90
137
|
baseUrl: any;
|
|
91
138
|
token: any;
|