Merge pull request #297 from sandeep-deriv/sandeep/dapi-513/fix-auth-redirects

sandeep/dapi-513/fix auth and websocket url

Author: sandeep-deriv

.gitignore

@@ -22,4 +22,6 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-.idea
+.idea
+
+.vscode/settings.json

src/features/Endpoint/Endpoint.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { useForm } from 'react-hook-form';
 import { Button, Text } from '@deriv/ui';
 import { getAppId } from '@site/src/utils';
-import { OAUTH_URL } from '@site/src/utils/constants';
+import { DEFAULT_WS_SERVER } from '@site/src/utils/constants';
 import styles from './Endpoint.module.scss';
 
 interface IEndpointFormValues {
@@ -12,7 +12,7 @@ interface IEndpointFormValues {
 const EndPoint = () => {
   const default_endpoint = {
     app_id: getAppId(),
-    server_url: OAUTH_URL,
+    server_url: DEFAULT_WS_SERVER,
   };
 
   const {

src/features/Endpoint/__tests__/Endpoint.test.tsx

@@ -2,6 +2,7 @@ import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import React from 'react';
 import EndPoint from '../Endpoint';
 import userEvent from '@testing-library/user-event';
+import { DEFAULT_WS_SERVER } from '@site/src/utils/constants';
 
 describe('Endpoint', () => {
   beforeEach(() => {
@@ -23,7 +24,7 @@ describe('Endpoint', () => {
   it('should have default values in input fields', () => {
     const server = screen.getByPlaceholderText('e.g. ws.derivws.com');
     const app_id = screen.getByPlaceholderText('e.g. 9999');
-    expect(server).toHaveValue('oauth.deriv.com');
+    expect(server).toHaveValue(DEFAULT_WS_SERVER);
 
     expect(app_id).toHaveValue('35074');
   });

src/utils/index.ts

@@ -143,11 +143,13 @@ export const getServerConfig = () => {
   if (isBrowser) {
     const config_server_url = localStorage.getItem('config.server_url');
     const config_app_id = localStorage.getItem('config.app_id');
+    const is_qa_server = config_server_url?.toLowerCase().includes('qa');
+    const oauth = is_qa_server ? config_server_url : OAUTH_URL;
 
     return {
       serverUrl: config_server_url ?? DEFAULT_WS_SERVER,
       appId: config_app_id ?? getAppId(),
-      oauth: config_server_url ?? OAUTH_URL,
+      oauth,
     };
   } else {
     return {