chore: fixing websocket and endpoint

Author: Hubert Koster

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' });
+  .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.binary.sx/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.binary.sx/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/hooks/useLoginUrl/index.tsx

@@ -3,8 +3,8 @@ import { useCallback } from 'react';
 
 const useLoginUrl = () => {
   const getUrl = useCallback((language = 'en') => {
-    const { appId, serverUrl } = getServerConfig();
-    return generateLoginUrl(language, serverUrl, appId);
+    const { appId, oauth } = getServerConfig();
+    return generateLoginUrl(language, oauth, appId);
   }, []);
 
   return { getUrl };

src/utils/__tests__/utils.test.ts

@@ -1,5 +1,10 @@
 import * as utils from '@site/src/utils';
-import { LOCALHOST_APP_ID, VERCEL_DEPLOYMENT_APP_ID, OAUTH_URL } from '../constants';
+import {
+  LOCALHOST_APP_ID,
+  VERCEL_DEPLOYMENT_APP_ID,
+  OAUTH_URL,
+  DEFAULT_WS_SERVER,
+} from '../constants';
 const {
   getAccountsFromSearchParams,
   getAppId,
@@ -157,7 +162,7 @@ describe('Get Server Config', () => {
       jest.spyOn(utils, 'getIsBrowser').mockReturnValueOnce(false);
       const serverConfig = getServerConfig();
       expect(serverConfig.appId).toEqual(VERCEL_DEPLOYMENT_APP_ID);
-      expect(serverConfig.serverUrl).toEqual(OAUTH_URL);
+      expect(serverConfig.serverUrl).toEqual(DEFAULT_WS_SERVER);
     });
   });
   describe('Given we are in Browser', () => {
@@ -166,7 +171,7 @@ describe('Get Server Config', () => {
     it('Should return default ws server url and vercel deployment appId in LOCALHOST ', () => {
       const serverConfig = getServerConfig();
       expect(serverConfig.appId).toEqual(LOCALHOST_APP_ID);
-      expect(serverConfig.serverUrl).toEqual(OAUTH_URL);
+      expect(serverConfig.serverUrl).toEqual(DEFAULT_WS_SERVER);
     });
     it('Should return serverUrl and appId from localstorage in production', () => {
       jest.spyOn(localStorage, 'getItem').mockReturnValueOnce('test.binary.sx');

src/utils/index.ts

@@ -7,6 +7,7 @@ import {
   STAGING_APP_ID,
   VERCEL_DEPLOYMENT_APP_ID,
   OAUTH_URL,
+  DEFAULT_WS_SERVER,
 } from './constants';
 
 const CURRENCY_MAP = new Map([
@@ -130,18 +131,21 @@ export const getServerConfig = () => {
       return {
         serverUrl: config_server_url,
         appId: config_app_id,
+        oauth: OAUTH_URL,
       };
     } else {
       const isLocalHost = isHost('localhost');
       return {
-        serverUrl: OAUTH_URL,
+        serverUrl: DEFAULT_WS_SERVER,
         appId: getAppId(isLocalHost),
+        oauth: OAUTH_URL,
       };
     }
   } else {
     return {
-      serverUrl: OAUTH_URL,
+      serverUrl: DEFAULT_WS_SERVER,
       appId: getAppId(false),
+      oauth: OAUTH_URL,
     };
   }
 };