Merge pull request #171 from hubert-deriv/fixing_endpoint_url3

Author: hubert-deriv

src/hooks/useLoginUrl/__tests__/useLoginUrl.test.tsx

@@ -5,7 +5,7 @@ import * as utils from '@site/src/utils';
 
 jest
   .spyOn(utils, 'getServerConfig')
-  .mockReturnValue({ appId: '1234', serverUrl: 'test.binary.sx', oauth: 'test.deriv.com' });
+  .mockReturnValue({ appId: '1234', serverUrl: 'test.binary.sx', oauth: 'test.oauth.sx' });
 
 describe('Use Login URL', () => {
   afterEach(() => {
@@ -23,7 +23,7 @@ describe('Use Login URL', () => {
 
     expect(loginUrl).toContain('l=en');
     expect(utils.getServerConfig).toHaveBeenCalled();
-    expect(loginUrl).toMatch('https://test.deriv.com/oauth2/authorize?app_id=1234&l=en');
+    expect(loginUrl).toMatch('https://test.oauth.sx/oauth2/authorize?app_id=1234&l=en');
     expect(loginUrl).toMatch(/app_id=1234/);
   });
 
@@ -37,7 +37,7 @@ describe('Use Login URL', () => {
 
     expect(loginUrl).toContain('l=es');
     expect(utils.getServerConfig).toHaveBeenCalled();
-    expect(loginUrl).toMatch('https://test.deriv.com/oauth2/authorize?app_id=1234&l=es');
+    expect(loginUrl).toMatch('https://test.oauth.sx/oauth2/authorize?app_id=1234&l=es');
     expect(loginUrl).toMatch(/app_id=1234/);
   });
 });

src/utils/__tests__/utils.test.ts

@@ -1,5 +1,10 @@
 import * as utils from '@site/src/utils';
-import { DEFAULT_WS_SERVER, LOCALHOST_APP_ID, VERCEL_DEPLOYMENT_APP_ID } from '../constants';
+import {
+  LOCALHOST_APP_ID,
+  VERCEL_DEPLOYMENT_APP_ID,
+  OAUTH_URL,
+  DEFAULT_WS_SERVER,
+} from '../constants';
 const {
   getAccountsFromSearchParams,
   getAppId,
@@ -174,7 +179,7 @@ describe('Get Server Config', () => {
 
       const serverConfig = getServerConfig();
       expect(serverConfig.appId).toBe('1234');
-      expect(serverConfig.serverUrl).toBe('test.binary.sx');
+      expect(serverConfig.serverUrl).toBe('ws.binaryws.com');
       expect(localStorage.getItem).toHaveBeenCalledTimes(2);
     });
   });

src/utils/index.ts

@@ -2,12 +2,12 @@ import moment from 'moment';
 import { IUserLoginAccount } from '../contexts/auth/auth.context';
 import { TScopes } from '../types';
 import {
-  DEFAULT_WS_SERVER,
   LOCALHOST_APP_ID,
   PRODUCTION_APP_ID,
   STAGING_APP_ID,
   VERCEL_DEPLOYMENT_APP_ID,
   OAUTH_URL,
+  DEFAULT_WS_SERVER,
 } from './constants';
 
 const CURRENCY_MAP = new Map([
@@ -129,9 +129,9 @@ export const getServerConfig = () => {
     const config_app_id = localStorage.getItem('config.app_id');
     if (config_app_id && config_server_url) {
       return {
-        serverUrl: config_server_url,
+        serverUrl: DEFAULT_WS_SERVER,
         appId: config_app_id,
-        oauth: OAUTH_URL,
+        oauth: config_server_url,
       };
     } else {
       const isLocalHost = isHost('localhost');