Merge pull request #161 from ets-cfuhrman-pfe/ssl-changes

Change the way the back-end url is set to a socket url

.gitignore

@@ -73,7 +73,7 @@ web_modules/
 .yarn-integrity
 
 # dotenv environment variable files
-.env
+server/.env
 .env.development.local
 .env.test.local
 .env.production.local

client/.dockerignore

@@ -1,2 +1 @@
 **/node_modules
-.env

client/.env

@@ -0,0 +1,2 @@
+VITE_BACKEND_URL=http://localhost:4400
+VITE_AZURE_BACKEND_URL=http://localhost:4400

client/src/constants.tsx

@@ -1,7 +1,7 @@
 // constants.tsx
 const ENV_VARIABLES = {
     MODE: 'production',
-    VITE_BACKEND_URL: import.meta.env.VITE_BACKEND_URL ||  ""
+    VITE_BACKEND_URL: process.env.VITE_BACKEND_URL || ""
 };
 
 console.log(`ENV_VARIABLES.VITE_BACKEND_URL=${ENV_VARIABLES.VITE_BACKEND_URL}`);

client/src/services/WebsocketService.tsx

@@ -23,9 +23,10 @@ class WebSocketService {
     connect(backendUrl: string): Socket {
         console.log(`WebSocketService.connect(${backendUrl})`);
 
-        // Ensure the URL uses wss: if the page is loaded over https:
-        const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
-        const url = backendUrl.replace(/^http:/, protocol);
+        // Ensure the URL uses wss: if the URL starts with https:
+        const protocol = backendUrl.startsWith('https:') ? 'wss:' : 'ws:';
+        console.log(`WebSocketService.connect: protocol=${protocol}`);
+        const url = backendUrl.replace(/^http(s):/, protocol);
         console.log(`WebSocketService.connect: changed url=${url}`);
 
         this.socket = io(url, {

client/tsconfig.json

@@ -3,7 +3,7 @@
         "target": "ESNext",
         "useDefineForClassFields": true,
         "lib": ["ES2020", "DOM", "DOM.Iterable"],
-        "module": "ES2020",
+        "module": "ESNext",
         "skipLibCheck": true,
 
         /* Bundler mode */