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

package/build/@types/app.d.ts

@@ -334,6 +334,13 @@ export declare enum AuthForType {
     NATIONAL_ID = "national_id",
     NATIONAL_ID_MISSED = "national_id_missed"
 }
+export declare enum AuthTypeNumber {
+    EMAIL_OTP = 5,
+    MOBILE_OTP = 2,
+    PASSWORD = 1,
+    MIGRATION = 10,
+    RESET_PASSWORD = 7
+}
 export declare enum AddressFormateType {
     SELECT = "select",
     NUMBER = "number",

package/build/@types/app.js

@@ -42,6 +42,14 @@ export var AuthForType;
     AuthForType["NATIONAL_ID"] = "national_id";
     AuthForType["NATIONAL_ID_MISSED"] = "national_id_missed";
 })(AuthForType || (AuthForType = {}));
+export var AuthTypeNumber;
+(function (AuthTypeNumber) {
+    AuthTypeNumber[AuthTypeNumber["EMAIL_OTP"] = 5] = "EMAIL_OTP";
+    AuthTypeNumber[AuthTypeNumber["MOBILE_OTP"] = 2] = "MOBILE_OTP";
+    AuthTypeNumber[AuthTypeNumber["PASSWORD"] = 1] = "PASSWORD";
+    AuthTypeNumber[AuthTypeNumber["MIGRATION"] = 10] = "MIGRATION";
+    AuthTypeNumber[AuthTypeNumber["RESET_PASSWORD"] = 7] = "RESET_PASSWORD";
+})(AuthTypeNumber || (AuthTypeNumber = {}));
 export var AddressFormateType;
 (function (AddressFormateType) {
     AddressFormateType["SELECT"] = "select";

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

@@ -56,7 +56,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { AuthForType, FlowsTypes } from '../../../@types';
+import { AuthForType, AuthTypeNumber, FlowsTypes } from '../../../@types';
 import { ADD_NEW_ENTITY, AUTH_STEP_NAMES, IDENTIFICATION_TYPE, defaultCountry } from '../../../constants';
 import API from '../../../api';
 import { handleCurrentActiveScreen, handleNextScreenStep, handleOpen, handlePrevScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
@@ -232,9 +232,9 @@ export var createEmailAuth = createAsyncThunk('auth/createEmailAuth', function (
             case 1:
                 data = _d.sent();
                 screen = 'AUTH_PASSWORD_STEP';
-                if ((data === null || data === void 0 ? void 0 : data.auth_type) === 7)
+                if ((data === null || data === void 0 ? void 0 : data.auth_type) === AuthTypeNumber.RESET_PASSWORD)
                     screen = 'AUTH_RESET_PASSWORD_MESSAGE_STEP';
-                if ((data === null || data === void 0 ? void 0 : data.auth_type) === 5)
+                if ((data === null || data === void 0 ? void 0 : data.auth_type) === AuthTypeNumber.EMAIL_OTP)
                     screen = 'AUTH_OTP_STEP';
                 thunkApi.dispatch(handleNextScreenStep(screen));
                 (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, requestBody.user_credentail);
@@ -271,7 +271,7 @@ 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) {
+                if ((data === null || data === void 0 ? void 0 : data.auth_type) === AuthTypeNumber.MOBILE_OTP) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('AUTH_OTP_STEP')); });
                     return [2, data];
                 }
@@ -307,7 +307,7 @@ 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)
+                if ((data === null || data === void 0 ? void 0 : data.auth_type) === AuthTypeNumber.PASSWORD)
                     thunkApi.dispatch(handlePrevScreenStep('AUTH_PASSWORD_STEP'));
                 return [2, { response: data, formData: params }];
         }
@@ -552,7 +552,7 @@ export var checkAccountAvailability = createAsyncThunk('auth/checkAccountAvailab
                 isDataHasIndividualOnly = (authConfigData === null || authConfigData === void 0 ? void 0 : authConfigData.length) === 1 && authConfigData.includes('individual');
                 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) {
+                if (auth_type === AuthTypeNumber.MIGRATION) {
                 }
                 return [4, API.accountService.checkAccountAvailability(data === null || data === void 0 ? void 0 : data.individual_id)];
             case 1:

package/build/features/app/brand/brandStore.js

@@ -66,10 +66,10 @@ import { hasNoneEditableValue, isKW, isTwitter, isWebsite, mapSalesChannel, retr
 export var verifyLeadToken = createAsyncThunk('brand/verifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
-        var payload, data, countryIso2, _b, config, brand_id, entity_id, publicKey, salesChannels, brandData;
-        var _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var payload, data, countryIso2, _b, config, brand_id, entity_id, board_id, publicKey, salesChannels, brandData, data_1;
+        var _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     payload = __assign({ service_name: 'tap_email', verify_token: token }, (isInternally && {
                         notification: {
@@ -78,31 +78,38 @@ export var verifyLeadToken = createAsyncThunk('brand/verifyLeadToken', function
                     }));
                     return [4, API.leadService.verifyLeadToken(payload)];
                 case 1:
-                    data = (_d.sent()).data;
+                    data = (_e.sent()).data;
                     if (((_c = data === null || data === void 0 ? void 0 : data.errors) === null || _c === void 0 ? void 0 : _c.length) || (data === null || data === void 0 ? void 0 : data.mw_error))
                         throw new Error(data.errors[0].description || (data === null || data === void 0 ? void 0 : data.mw_error));
                     countryIso2 = data === null || data === void 0 ? void 0 : data.country_code;
                     if (countryIso2)
                         thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                    _b = data || {}, config = _b.config, brand_id = _b.brand_id, entity_id = _b.entity_id;
+                    _b = data || {}, config = _b.config, brand_id = _b.brand_id, entity_id = _b.entity_id, board_id = _b.id;
                     publicKey = config === null || config === void 0 ? void 0 : config.public_key;
                     if (publicKey)
                         thunkApi.dispatch(handlePublicKey(publicKey));
                     brandData = undefined;
                     if (isInternally)
                         data.step_name = BRAND_STEP_NAMES.BRAND_INFO;
-                    if (!(data.step_name !== BRAND_STEP_NAMES.PHONE_AUTH || isInternally)) return [3, 4];
-                    if (!brand_id)
-                        throw new Error('Internal server error');
-                    return [4, API.brandService.retrieveBrand(brand_id)];
+                    if (!(data.step_name !== BRAND_STEP_NAMES.PHONE_AUTH || isInternally)) return [3, 7];
+                    if (!!brand_id) return [3, 3];
+                    return [4, API.boardService.retrieveBoardDetails(board_id)];
                 case 2:
-                    brandData = _d.sent();
-                    return [4, API.dataService.getChannelsOfServices({ page: 0 })];
-                case 3:
-                    salesChannels = _d.sent();
+                    data_1 = _e.sent();
+                    brandData = data_1;
+                    if (!((_d = data_1 === null || data_1 === void 0 ? void 0 : data_1.brand) === null || _d === void 0 ? void 0 : _d.id))
+                        throw new Error('brand_id_missing');
+                    return [3, 5];
+                case 3: return [4, API.brandService.retrieveBrand(brand_id)];
+                case 4:
+                    brandData = _e.sent();
+                    _e.label = 5;
+                case 5: return [4, API.dataService.getChannelsOfServices({ page: 0 })];
+                case 6:
+                    salesChannels = _e.sent();
                     thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP'));
-                    _d.label = 4;
-                case 4: return [2, {
+                    _e.label = 7;
+                case 7: return [2, {
                         data: data,
                         brandData: brandData === null || brandData === void 0 ? void 0 : brandData.brand,
                         salesChannels: salesChannels,
@@ -131,10 +138,10 @@ export var resendOTP = createAsyncThunk('brandResendOTP', function (params, thun
     });
 }); });
 export var verifyBrandLeadOTP = createAsyncThunk('brand/verifyLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, brand, settings, responseBody, payload, data, publicKey, _b, brand_id, entity_id, brandData, salesChannels;
-    var _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var _a, brand, settings, responseBody, payload, data, publicKey, _b, brand_id, entity_id, boardId, brandData, data_2, salesChannels;
+    var _c, _d, _e, _f, _g, _h;
+    return __generator(this, function (_j) {
+        switch (_j.label) {
             case 0:
                 _a = thunkApi.getState(), brand = _a.brand, settings = _a.settings;
                 responseBody = brand.data.verify.responseBody;
@@ -147,22 +154,30 @@ export var verifyBrandLeadOTP = createAsyncThunk('brand/verifyLeadOTP', function
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_h.sent()).data;
+                data = (_j.sent()).data;
                 if ((_d = data.errors) === null || _d === void 0 ? void 0 : _d.length)
                     throw new Error(data.errors[0].description);
                 publicKey = (_e = data === null || data === void 0 ? void 0 : data.config) === null || _e === void 0 ? void 0 : _e.public_key;
                 if (publicKey)
                     thunkApi.dispatch(handlePublicKey(publicKey));
-                _b = data || {}, brand_id = _b.brand_id, entity_id = _b.entity_id;
-                if (!brand_id)
-                    throw new Error('Internal server error');
-                return [4, API.brandService.retrieveBrand(brand_id)];
+                _b = data || {}, brand_id = _b.brand_id, entity_id = _b.entity_id, boardId = _b.id;
+                brandData = undefined;
+                if (!!brand_id) return [3, 3];
+                return [4, API.boardService.retrieveBoardDetails(boardId)];
             case 2:
-                brandData = _h.sent();
-                return [4, API.dataService.getChannelsOfServices({ page: 0 })];
-            case 3:
-                salesChannels = _h.sent();
-                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, { otp: params.otp });
+                data_2 = _j.sent();
+                brandData = data_2;
+                if (!((_f = data_2 === null || data_2 === void 0 ? void 0 : data_2.brand) === null || _f === void 0 ? void 0 : _f.id))
+                    throw new Error('brand_id_missing');
+                return [3, 5];
+            case 3: return [4, API.brandService.retrieveBrand(brand_id)];
+            case 4:
+                brandData = _j.sent();
+                _j.label = 5;
+            case 5: return [4, API.dataService.getChannelsOfServices({ page: 0 })];
+            case 6:
+                salesChannels = _j.sent();
+                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP')); });
                 return [2, {
                         data: data,

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

@@ -21,7 +21,7 @@ import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { AuthForType } from '../../../../@types';
+import { AuthForType, AuthTypeNumber } from '../../../../@types';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Form from '../../../../components/Form';
 import { maskPhone, maskID, deepCopy, maskEmail } from '../../../../utils';
@@ -47,9 +47,8 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var OTP = function () {
-    var _a;
     var dispatch = useAppDispatch();
-    var _b = useAppSelector(authSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _a = useAppSelector(authSelector), data = _a.data, loading = _a.loading, error = _a.error;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var methods = useForm({
@@ -59,16 +58,20 @@ 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);
+            return maskID(data.nidData.nid);
+        if (isEmailAuth) {
+            var _c = ((_a = data.responseData) === null || _a === void 0 ? void 0 : _a.authResponse) || {}, auth_type = _c.auth_type, email = _c.email, mobile = _c.mobile;
+            if (auth_type === AuthTypeNumber.MOBILE_OTP && mobile)
+                return mobile;
+            if (auth_type === AuthTypeNumber.EMAIL_OTP && email)
+                return email;
+            return maskEmail(data.emailData.email);
+        }
+        var phone = data.mobileData.mobile ? ((_b = data.mobileData.countryCode) === null || _b === void 0 ? void 0 : _b.idd_prefix) + data.mobileData.mobile : '';
+        return maskPhone(phone);
     };
     var getTitle = function () {
         if (isNidAuth)

package/package.json

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