chore: fixing endpoint and websocket connection

Author: Hubert Koster

src/hooks/useLoginUrl/index.tsx

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

src/utils/index.ts

@@ -2,7 +2,6 @@ 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,
@@ -131,21 +130,18 @@ export const getServerConfig = () => {
       return {
         serverUrl: config_server_url,
         appId: config_app_id,
-        oauth: OAUTH_URL,
       };
     } else {
       const isLocalHost = isHost('localhost');
       return {
-        serverUrl: DEFAULT_WS_SERVER,
+        serverUrl: OAUTH_URL,
         appId: getAppId(isLocalHost),
-        oauth: OAUTH_URL,
       };
     }
   } else {
     return {
-      serverUrl: DEFAULT_WS_SERVER,
+      serverUrl: OAUTH_URL,
       appId: getAppId(false),
-      oauth: OAUTH_URL,
     };
   }
 };