Aum/prodqa 38/client redirection to correct withdrawal page using loginid

packages/core/src/App/Containers/Redirect/__tests__/redirect.spec.jsx

@@ -0,0 +1,44 @@
+import React from 'react';
+import { createBrowserHistory } from 'history';
+import { Router } from 'react-router-dom';
+import { render } from '@testing-library/react';
+import Redirect from '../redirect';
+
+jest.mock('Stores/connect', () => ({
+    __esModule: true,
+    default: 'mockedDefaultExport',
+    connect: () => Component => Component,
+}));
+
+describe('<Redirect />', () => {
+    let history,
+     mock_props;
+
+    beforeEach(() => {
+        history = createBrowserHistory();
+
+        mock_props = {
+            loginid: 'CR1234',
+            verification_code: {
+                payment_withdraw: '',
+            },
+            setVerificationCode: jest.fn(),
+            setNewEmail: jest.fn(),
+            setLoginId: jest.fn(id => {
+                return id;
+            }),
+        };
+    });
+
+    it('should set login id provided to the one provided in the url before redirection', () => {
+        history.push('/redirect?action=payment_withdraw&lang=EN&code=FwGsJwTJ&loginid=CR456');
+
+        render(
+            <Router history={history}>
+                <Redirect {...mock_props} />
+            </Router>
+        );
+
+        expect(mock_props.setLoginId).toHaveBeenCalledWith('CR456');
+    });
+});

packages/core/src/App/Containers/Redirect/redirect.jsx

@@ -9,6 +9,7 @@ import { WS } from 'Services';
 const Redirect = ({
     history,
     currency,
+    setLoginId,
     setVerificationCode,
     verification_code,
     hasAnyRealAccount,
@@ -26,9 +27,11 @@ const Redirect = ({
     const { is_appstore } = React.useContext(PlatformContext);
     const action_param = url_params.get('action');
     const code_param = url_params.get('code') || verification_code[action_param];
+    const loginid_param = url_params.get('loginid');
 
     setVerificationCode(code_param, action_param);
     setNewEmail(url_params.get('email'), action_param);
+    if (loginid_param) setLoginId(loginid_param);
 
     switch (action_param) {
         case 'signup': {
@@ -180,7 +183,7 @@ const Redirect = ({
             break;
     }
 
-    if (!redirected_to_route) {
+    if (!redirected_to_route && history.location.pathname !== routes.root) {
         history.push({
             pathname: routes.root,
             search: url_query_string,
@@ -210,7 +213,7 @@ Redirect.propTypes = {
 export default withRouter(
     connect(({ client, ui }) => ({
         currency: client.currency,
-        loginid: client.loginid,
+        setLoginId: client.setLoginId,
         is_eu: client.is_eu,
         setVerificationCode: client.setVerificationCode,
         verification_code: client.verification_code,