@tap-payments/auth-jsconnect 2.10.4-development → 2.10.5-development

package/build/api/auth.d.ts

@@ -20,7 +20,7 @@ export type CivilID = {
 export type TerminalCredential = {
     terminal: {
         id: string;
-        terminal_device: {
+        terminal_device?: {
             id: string;
         };
     };

package/build/constants/app.d.ts

@@ -220,6 +220,7 @@ export declare const TERMINAL_STEP_NAMES: {
     INFO: string;
     SUCCESS: string;
     CREATE_AUTH: string;
+    CREATE_TERMINAL_AUTH: string;
 };
 export declare const RSA_FRONTEND_MW_PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgC9kH1SQvjbXAUXd0PbrDUG8P\nLhRig9pJNBmdQBZjihuaxfkzYu6ToMbIMAfmYgVgQw338/y7aQ8X3m03CXNIlkxo\nOwxKCA8ymKsZQptXJn9IxlPO7yjoFgTFBrpmTgvcC4XO1uoUYTAPq3szK8kj4zgT\nucWG1hSKsOdRU7sl/wIDAQAB\n-----END PUBLIC KEY-----";
 export declare const ENCRYPTION_FLAG = "encryption_contract";

package/build/constants/app.js

@@ -1227,7 +1227,8 @@ export var TERMINAL_STEP_NAMES = {
     PHONE_AUTH: 'terminal_phone_auth',
     INFO: 'terminal_info',
     SUCCESS: 'terminal_completed',
-    CREATE_AUTH: 'connect_create_auth_terminal'
+    CREATE_AUTH: 'connect_create_auth_terminal',
+    CREATE_TERMINAL_AUTH: 'connect_create_terminal_link'
 };
 export var RSA_FRONTEND_MW_PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgC9kH1SQvjbXAUXd0PbrDUG8P\nLhRig9pJNBmdQBZjihuaxfkzYu6ToMbIMAfmYgVgQw338/y7aQ8X3m03CXNIlkxo\nOwxKCA8ymKsZQptXJn9IxlPO7yjoFgTFBrpmTgvcC4XO1uoUYTAPq3szK8kj4zgT\nucWG1hSKsOdRU7sl/wIDAQAB\n-----END PUBLIC KEY-----";
 export var ENCRYPTION_FLAG = 'encryption_contract';

package/build/features/app/terminal/terminalStore.js

@@ -148,22 +148,27 @@ export var verifyTokenOTP = createAsyncThunk('terminal/verifyOtp', function (par
     });
 }); });
 export var linkNewTerminal = createAsyncThunk('terminal/linkNewTerminal', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var terminal, _a, merchant_id, terminal_id, payload, data;
-    var _b;
+    var _a, terminal, _b, language, businessCountry, scope, terminalId, payload, data;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                terminal = thunkApi.getState().terminal;
-                _a = ((_b = terminal.data.responseData) === null || _b === void 0 ? void 0 : _b.authData) || {}, merchant_id = _a.merchant_id, terminal_id = _a.terminal_id;
+                _a = thunkApi.getState(), terminal = _a.terminal, _b = _a.settings.data, language = _b.language, businessCountry = _b.businessCountry, scope = _b.appConfig.scope;
+                terminalId = (terminal.data.terminalInfo.selectedTerminal || {}).id;
                 payload = {
-                    merchant: {
-                        id: merchant_id,
+                    user_credentail: {
                         terminal: {
-                            id: terminal_id
+                            id: terminalId
                         }
-                    }
+                    },
+                    country: businessCountry === null || businessCountry === void 0 ? void 0 : businessCountry.iso2,
+                    scope: scope,
+                    lang: language,
+                    is_lead: false,
+                    sign_in: false,
+                    step_name: TERMINAL_STEP_NAMES.CREATE_TERMINAL_AUTH,
+                    encryption_contract: []
                 };
-                return [4, API.terminalService.generateAuthenticationToLinkNewTerminal(payload)];
+                return [4, API.authService.createAuth(payload)];
             case 1:
                 data = _c.sent();
                 return [2, { data: data, nextScreen: CONNECT_FLOWS.terminal.terminalLinkNew }];
@@ -195,7 +200,7 @@ export var pushNotificationLinkNewTerminal = createAsyncThunk('terminal/pushNoti
                 case 0:
                     terminal = thunkApi.getState().terminal;
                     _b = terminal.data.responseData || {}, linkNewTerminalData = _b.linkNewTerminalData, linkTerminalDeviceData = _b.linkTerminalDeviceData;
-                    id = ((newTerminal ? linkNewTerminalData === null || linkNewTerminalData === void 0 ? void 0 : linkNewTerminalData.authentication : linkTerminalDeviceData) || {}).id;
+                    id = ((newTerminal ? linkNewTerminalData : linkTerminalDeviceData) || {}).id;
                     e = TERMINAL_PUSH_NOTIFICATION_DURATION;
                     interval = 3;
                     maxCalls = Math.floor(e / interval);
@@ -266,13 +271,11 @@ export var unlinkTerminalDevice = createAsyncThunk('terminal/unlinkTerminalDevic
     });
 }); });
 export var linkTerminalDevice = createAsyncThunk('terminal/linkTerminalDevice', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b, selectedTerminal, selectedTerminalDevice, _c, businessCountry, language, scope, terminalId, deviceId, payload, data;
+    var _a, _b, terminalId, deviceId, _c, businessCountry, language, scope, payload, data;
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
-                _a = thunkApi.getState(), _b = _a.terminal.data.terminalInfo, selectedTerminal = _b.selectedTerminal, selectedTerminalDevice = _b.selectedTerminalDevice, _c = _a.settings.data, businessCountry = _c.businessCountry, language = _c.language, scope = _c.appConfig.scope;
-                terminalId = selectedTerminal === null || selectedTerminal === void 0 ? void 0 : selectedTerminal.id;
-                deviceId = selectedTerminalDevice.id;
+                _a = thunkApi.getState(), _b = _a.terminal.data.terminalInfo, terminalId = _b.selectedTerminal.id, deviceId = _b.selectedTerminalDevice.id, _c = _a.settings.data, businessCountry = _c.businessCountry, language = _c.language, scope = _c.appConfig.scope;
                 payload = {
                     user_credentail: {
                         terminal: {

package/build/features/terminal/screens/LinkNewTerminal/LinkNewTerminal.js

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import Box from '@mui/material/Box';
@@ -23,20 +23,20 @@ import { pushNotificationLinkNewTerminal, terminalSelector } from '../../../app/
 import { CodeDescription, QRCodeImage } from './styles';
 import { LinkNewTerminalContainer, LinkTerminalText, QRCodeDescription } from '../shared';
 var LinkNewTerminal = function () {
-    var _a, _b, _c, _d;
+    var _a, _b;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
     var data = useAppSelector(terminalSelector).data;
-    var _e = React.useState(false), isReady = _e[0], setIsReady = _e[1];
-    var _f = React.useState(false), success = _f[0], setSuccess = _f[1];
-    var _g = React.useState(false), failed = _g[0], setFailed = _g[1];
+    var _c = React.useState(false), isReady = _c[0], setIsReady = _c[1];
+    var _d = React.useState(false), success = _d[0], setSuccess = _d[1];
+    var _e = React.useState(false), failed = _e[0], setFailed = _e[1];
     var terminalInfo = data.terminalInfo, responseData = data.responseData;
-    var _h = responseData || {}, terminalData = _h.terminalData, linkNewTerminalData = _h.linkNewTerminalData, terminalList = _h.terminalList;
+    var _f = responseData || {}, terminalData = _f.terminalData, linkNewTerminalData = _f.linkNewTerminalData;
     var terminal_devices = (terminalData || {}).terminal_devices;
-    var qrCode = (_a = linkNewTerminalData === null || linkNewTerminalData === void 0 ? void 0 : linkNewTerminalData.authentication) === null || _a === void 0 ? void 0 : _a.qr;
-    var code = (_b = linkNewTerminalData === null || linkNewTerminalData === void 0 ? void 0 : linkNewTerminalData.authentication) === null || _b === void 0 ? void 0 : _b.code;
+    var qrCode = "data:image/png;base64,".concat(linkNewTerminalData === null || linkNewTerminalData === void 0 ? void 0 : linkNewTerminalData.qr);
+    var code = linkNewTerminalData === null || linkNewTerminalData === void 0 ? void 0 : linkNewTerminalData.code;
     var expiry = TERMINAL_PUSH_NOTIFICATION_DURATION;
-    var deviceName = ((_d = (_c = terminalInfo.selectedTerminalDevice.model) === null || _c === void 0 ? void 0 : _c.name[0]) === null || _d === void 0 ? void 0 : _d.text) || '';
+    var deviceName = ((_b = (_a = terminalInfo.selectedTerminalDevice.model) === null || _a === void 0 ? void 0 : _a.name[0]) === null || _b === void 0 ? void 0 : _b.text) || '';
     var newTerminal = true;
     React.useEffect(function () {
         if (linkNewTerminalData && !isReady) {
@@ -63,6 +63,6 @@ var LinkNewTerminal = function () {
         var previousScreen = (terminal_devices === null || terminal_devices === void 0 ? void 0 : terminal_devices.length) ? CONNECT_FLOWS.terminal.terminalList : CONNECT_FLOWS.terminal.noTerminalLinked;
         dispatch(handlePrevScreenStep(previousScreen));
     };
-    return (_jsxs(ScreenContainer, __assign({ minHeight: 200, justifyContent: 'space-between' }, { children: [_jsx(PushNotification, __assign({ error: t('terminal_request_denied', { device: deviceName }), failed: failed, success: success, expiryInSeconds: expiry }, { children: _jsxs(LinkNewTerminalContainer, { children: [_jsx(LinkTerminalText, { children: t('terminal_link_terminal') }), _jsx(QRCodeDescription, { children: t('terminal_qr_code_description') }), _jsx(QRCodeImage, { src: qrCode }), _jsx(LinkTerminalText, { children: t('terminal_or_use_code') }), _jsx(CodeDescription, { children: code })] }) })), _jsx(Box, __assign({ sx: { ml: 2.5, mr: 2.5 } }, { children: _jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: handleOnBack, variant: 'text' }, { children: t('back') })) }))] })));
+    return (_jsxs(ScreenContainer, __assign({ minHeight: 200, justifyContent: 'space-between' }, { children: [_jsx(PushNotification, __assign({ error: t('terminal_request_denied', { device: deviceName }), failed: failed, success: success, expiryInSeconds: expiry }, { children: _jsxs(LinkNewTerminalContainer, { children: [_jsx(LinkTerminalText, { children: t('terminal_link_terminal') }), _jsx(QRCodeDescription, { children: t('terminal_qr_code_description') }), _jsx(QRCodeImage, { src: qrCode }), code && (_jsxs(_Fragment, { children: [_jsx(LinkTerminalText, { children: t('terminal_or_use_code') }), _jsx(CodeDescription, { children: code })] }))] }) })), _jsx(Box, __assign({ sx: { ml: 2.5, mr: 2.5 } }, { children: _jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: handleOnBack, variant: 'text' }, { children: t('back') })) }))] })));
 };
 export default React.memo(LinkNewTerminal);

package/build/features/terminal/screens/TerminalListPage/TerminalListPage.js

@@ -16,12 +16,13 @@ import { ScreenContainer } from '../../../shared/Containers';
 import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/settings';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Button from '../../../../components/Button';
+import Warning from '../../../../components/Warning';
 import { linkNewTerminal, storeSelectedTerminal, terminalSelector } from '../../../app/terminal/terminalStore';
 import { Header, Container, TerminalList } from '../shared';
 var TerminalListPage = function () {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(terminalSelector), _b = _a.data, selectedTerminal = _b.terminalInfo.selectedTerminal, responseData = _b.responseData, loading = _a.loading;
+    var _a = useAppSelector(terminalSelector), _b = _a.data, selectedTerminal = _b.terminalInfo.selectedTerminal, responseData = _b.responseData, loading = _a.loading, error = _a.error;
     var terminalList = (responseData || {}).terminalList;
     var handleOnSelectTerminal = function (terminal) {
         dispatch(storeSelectedTerminal(terminal));
@@ -36,6 +37,6 @@ var TerminalListPage = function () {
     var handleOnBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    return (_jsxs(ScreenContainer, __assign({ minHeight: 200, sx: { pl: 2.5, pr: 2.5 }, justifyContent: 'space-between' }, { children: [_jsxs(Container, { children: [_jsx(Header, { title: 'terminal_select_device', sx: { pb: 0 } }), _jsx(TerminalList, { select: false, loading: loading, selectedTerminal: selectedTerminal, list: terminalList, onClick: handleOnSelectTerminal })] }), _jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return handleOnBack(); }, variant: 'text' }, { children: t('back') }))] })));
+    return (_jsxs(ScreenContainer, __assign({ minHeight: 200, justifyContent: 'space-between' }, { children: [_jsxs(Container, __assign({ sx: { pl: 2.5, pr: 2.5 } }, { children: [_jsx(Header, { title: 'terminal_select_device', sx: { pb: 0 } }), _jsx(TerminalList, { select: false, loading: loading, selectedTerminal: selectedTerminal, list: terminalList, onClick: handleOnSelectTerminal })] })), error && _jsx(Warning, __assign({ sx: { mt: 2 } }, { children: t(error) })), _jsx(Button, __assign({ sx: { ml: 2.5, mr: 2.5, mb: 1.5, mt: 1.5 }, onClick: function () { return handleOnBack(); }, variant: 'text' }, { children: t('back') }))] })));
 };
 export default React.memo(TerminalListPage);

package/package.json

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