@tap-payments/auth-jsconnect 2.8.10-test → 2.8.13-test

package/build/constants/app.js

@@ -253,12 +253,12 @@ export var AUTH_SCREENS_NAVIGATION = [
     {
         name: 'AUTH_OTP_STEP',
         next: 'AUTH_PREPARING_DATA_STEP',
-        prev: ['AUTH_MOBILE_STEP', 'AUTH_NID_STEP', 'AUTH_EMAIL_STEP'],
+        prev: ['AUTH_MOBILE_STEP', 'AUTH_NID_STEP', 'AUTH_EMAIL_STEP', 'AUTH_PASSWORD_STEP'],
         order: 2
     },
     {
         name: 'AUTH_PASSWORD_STEP',
-        next: 'AUTH_PREPARING_DATA_STEP',
+        next: ['AUTH_PREPARING_DATA_STEP', 'AUTH_OTP_STEP'],
         prev: 'AUTH_EMAIL_STEP',
         order: 2
     },

package/build/features/app/auth/authStore.js

@@ -59,7 +59,7 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { AuthForType, FlowsTypes } from '../../../@types';
 import { ADD_NEW_ENTITY, AUTH_STEP_NAMES, IDENTIFICATION_TYPE, defaultCountry } from '../../../constants';
 import API from '../../../api';
-import { handleCurrentActiveScreen, handleNextScreenStep, handleOpen, handleSetCountryByIso2 } from '../../../app/settings';
+import { handleCurrentActiveScreen, handleNextScreenStep, handleOpen, handlePrevScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 import { findCountryByIddPrefix, openConnect, sleep } from '../../../utils';
 export var updateBusinessCountry = createAsyncThunk('auth/updateBusinessCountry', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var auth, payload, data;
@@ -271,6 +271,10 @@ export var verifyEmailPassword = createAsyncThunk('auth/verifyEmailPassword', fu
                 data = (_h.sent()).data;
                 if ((_e = data.errors) === null || _e === void 0 ? void 0 : _e.length)
                     throw new Error(data.errors[0].description);
+                if ((data === null || data === void 0 ? void 0 : data.auth_type) === 2) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('AUTH_OTP_STEP')); });
+                    return [2, data];
+                }
                 if (scope === 'merchant') {
                     openConnect(settings.data.appConfig.publicKey, settings.data.businessCountry.iso2);
                     return [2, data];
@@ -303,6 +307,8 @@ export var resendEmailAuthOTP = createAsyncThunk('auth/resendEmailAuthOTP', func
                 return [4, API.authService.createAuth(requestBody)];
             case 1:
                 data = _b.sent();
+                if ((data === null || data === void 0 ? void 0 : data.auth_type) === 1)
+                    thunkApi.dispatch(handlePrevScreenStep('AUTH_PASSWORD_STEP'));
                 return [2, { response: data, formData: params }];
         }
     });
@@ -327,6 +333,7 @@ export var verifyEmailOtp = createAsyncThunk('auth/verifyEmailOtp', function (pa
                     device_token: device_token,
                     service_name: service_name,
                     sign_in: sign_in,
+                    is_lead: false,
                     step_name: AUTH_STEP_NAMES.VERIFY_AUTH_MOBILE,
                     encryption_contract: ['data']
                 };
@@ -534,28 +541,30 @@ export var verifyPACI = createAsyncThunk('auth/verifyPACI', function (params, th
     });
 }); });
 export var checkAccountAvailability = createAsyncThunk('auth/checkAccountAvailability', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, auth, authConfigData, authDataHasValue, isDataHasIndividualOnly, data, authId, accountData, _b, step_name, brands, entities, brandList, entityList, isExistingUser;
-    var _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var _a, settings, auth, authConfigData, authDataHasValue, isDataHasIndividualOnly, data, _b, authId, auth_type, accountData, _c, step_name, brands, entities, brandList, entityList, isExistingUser;
+    var _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, auth = _a.auth;
                 authConfigData = settings.data.appConfig.data;
                 authDataHasValue = authConfigData === null || authConfigData === void 0 ? void 0 : authConfigData.length;
                 isDataHasIndividualOnly = (authConfigData === null || authConfigData === void 0 ? void 0 : authConfigData.length) === 1 && authConfigData.includes('individual');
-                data = (_c = auth.data.responseData) === null || _c === void 0 ? void 0 : _c.authResponse;
-                authId = data === null || data === void 0 ? void 0 : data.id;
+                data = (_d = auth.data.responseData) === null || _d === void 0 ? void 0 : _d.authResponse;
+                _b = data || {}, authId = _b.id, auth_type = _b.auth_type;
+                if (auth_type === 10) {
+                }
                 return [4, API.accountService.checkAccountAvailability(data === null || data === void 0 ? void 0 : data.individual_id)];
             case 1:
-                accountData = _d.sent();
-                _b = accountData || {}, step_name = _b.step_name, brands = _b.brands, entities = _b.entities;
+                accountData = _e.sent();
+                _c = accountData || {}, step_name = _c.step_name, brands = _c.brands, entities = _c.entities;
                 brandList = brands || [];
                 entityList = entities || [];
                 isExistingUser = step_name === 'select_account';
                 if (!(isExistingUser && isDataHasIndividualOnly && authId)) return [3, 3];
                 return [4, thunkApi.dispatch(confirmInfo({ authId: authId }))];
             case 2:
-                _d.sent();
+                _e.sent();
                 return [2, { brandList: brandList, entityList: entityList }];
             case 3:
                 if (isExistingUser && authDataHasValue && brandList.length && entityList.length) {

package/build/features/auth/screens/OTP/OTP.js

@@ -24,7 +24,7 @@ import { handlePrevScreenStep } from '../../../../app/settings';
 import { AuthForType } from '../../../../@types';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Form from '../../../../components/Form';
-import { maskPhone, maskID, deepCopy } from '../../../../utils';
+import { maskPhone, maskID, deepCopy, maskEmail } from '../../../../utils';
 import { OTPValidation } from './validation';
 import OTPInput from './OTPInput';
 var OTPTitleContainerStyled = styled(Box)(function (_a) {
@@ -59,6 +59,24 @@ var OTP = function () {
     });
     var isNidAuth = data.otpData.authFor === AuthForType.NATIONAL_ID;
     var isEmailAuth = data.otpData.authFor === AuthForType.EMAIL;
+    var phone = data.mobileData.mobile ? ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.mobileData.mobile : '';
+    var idNumber = data.nidData.nid;
+    var email = data.emailData.email;
+    var getNumber = function () {
+        var _a, _b;
+        if (isNidAuth)
+            return maskID(idNumber);
+        if (isEmailAuth)
+            return ((_b = (_a = data.responseData) === null || _a === void 0 ? void 0 : _a.authResponse) === null || _b === void 0 ? void 0 : _b.email) || maskEmail(email);
+        maskPhone(phone);
+    };
+    var getTitle = function () {
+        if (isNidAuth)
+            return t('opt_nid_sent_title', { provider: 'ABSHER' });
+        if (isEmailAuth)
+            return t('otp_email_sent_title');
+        return t('ide_opt_sent_title');
+    };
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -82,9 +100,6 @@ var OTP = function () {
         dispatch(handlePrevScreenStep(screen));
     };
     var disabled = !methods.formState.isValid;
-    var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + (data.mobileData.mobile || '');
-    var idNumber = data.nidData.nid;
-    var title = isNidAuth ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: isNidAuth ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : getTitle(), !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: getNumber() }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(OTP);

package/build/features/brand/screens/BrandActivities/RefundPolicy.js

@@ -88,6 +88,6 @@ var RefundPolicy = function (_a) {
             return;
         refundControl.field.onChange(checked);
     };
-    return (_jsx(Collapse, __assign({ in: !isChecked }, { children: _jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: refundChecked, onChange: handleRefundCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_refund_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_EN, target: '_blank', underline: 'always' }, { children: t('refund_policy_compliance') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }) })));
+    return (_jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly || isChecked }, { children: [_jsx(CheckboxStyled, { disabled: isChecked, disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: refundChecked, onChange: handleRefundCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_refund_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_EN, target: '_blank', underline: 'always' }, { children: t('refund_policy_compliance') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }));
 };
 export default RefundPolicy;

package/build/features/brand/screens/BrandActivities/TAC.js

@@ -88,6 +88,6 @@ var TAC = function (_a) {
             return;
         tacControl.field.onChange(checked);
     };
-    return (_jsx(Collapse, __assign({ in: !isChecked }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.75 } }, { children: [_jsxs(TACContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] })) })));
+    return (_jsxs(ScreenContainer, __assign({ sx: { mt: 2.75 } }, { children: [_jsxs(TACContainerStyled, __assign({ readOnly: readOnly || isChecked }, { children: [_jsx(CheckboxStyled, { disabled: isChecked, disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] })));
 };
 export default React.memo(TAC);

package/build/features/brand/screens/BrandActivities/TransactionPolicy.js

@@ -51,6 +51,6 @@ var TransactionPolicy = function (_a) {
             return;
         transactionControl.field.onChange(checked);
     };
-    return (_jsx(Collapse, __assign({ in: !isChecked }, { children: _jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: transactionChecked, onChange: handleTransactionCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_chargeback_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_EN, target: '_blank', underline: 'always' }, { children: t('chargeback_policy') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }) })));
+    return (_jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly || isChecked }, { children: [_jsx(CheckboxStyled, { disabled: isChecked, disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: transactionChecked, onChange: handleTransactionCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_chargeback_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_EN, target: '_blank', underline: 'always' }, { children: t('chargeback_policy') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }));
 };
 export default TransactionPolicy;

package/build/features/connect/screens/OTP/OTP.js

@@ -84,7 +84,7 @@ var OTP = function () {
         dispatch(handlePrevScreenStep(startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
     };
     var disabled = !methods.formState.isValid;
-    var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + (data.mobileData.mobile || '');
+    var phone = data.mobileData.mobile ? ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.mobileData.mobile : '';
     var idNumber = data.nidData.nid;
     var title = startWithNID ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: startWithNID ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));

package/build/features/connectExpress/screens/IdentityOTP/OTP.js

@@ -79,7 +79,7 @@ var OTP = function () {
         dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid;
-    var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + (data.mobileData.mobile || '');
+    var phone = data.mobileData.mobile ? ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.mobileData.mobile : '';
     var idNumber = data.nidData.nid;
     var title = isNidAuth ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: isNidAuth ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));

package/build/features/connectExpress/screens/OTP/OTP.js

@@ -80,7 +80,7 @@ var OTP = function () {
         dispatch(handlePrevScreenStep(screen));
     };
     var disabled = !methods.formState.isValid;
-    var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + (data.mobileData.mobile || '');
+    var phone = data.mobileData.mobile ? ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.mobileData.mobile : '';
     var idNumber = data.nidData.nid;
     var title = isNidAuth ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: isNidAuth ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));

package/build/features/signIn/screens/OTP/OTP.js

@@ -85,7 +85,7 @@ var OTP = function () {
         dispatch(handlePrevScreenStep(isEmail ? 'SIGIN_EMAIL_STEP' : 'SIGIN_MOBILE_STEP'));
     };
     var disabled = !methods.formState.isValid || !!error;
-    var phone = ((_a = data.auth.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + (data.auth.mobile || '');
+    var phone = data.auth.mobile ? ((_a = data.auth.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.auth.mobile : '';
     var email = data.auth.email || '';
     var title = t('ide_opt_sent_title');
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: isEmail ? maskEmail(email) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.8.10-test",
+	"version": "2.8.13-test",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",