From c5e59d1380e9decddb31c8d2fc5e7283fdf0a6c4 Mon Sep 17 00:00:00 2001
From: Benoit Donneaux <benoit@leastauthority.com>
Date: Mon, 5 Feb 2024 22:20:17 +0100
Subject: [PATCH] Try http only

Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>
---
 .github/workflows/integrate.yml     |  2 +-
 client-e2e/test/pageobjects/page.ts |  2 +-
 client-e2e/test/wdio.conf.ts        |  2 +-
 client/scripts/devserver.ts         | 16 +++++++++-------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index 4b1cdd3a..10cd2740 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -66,7 +66,7 @@ jobs:
           cat <<EOF >> ./client/.env
           NODE_ENV=development
           MAILBOX_URL="wss://mailbox.stage.winden.app/v1"
-          RELAY_URL="ws://relay:4002"
+          RELAY_URL="wss://relay.stage.winden.app"
           EOF
           printf "Client .env:\n"
           cat ./client/.env
diff --git a/client-e2e/test/pageobjects/page.ts b/client-e2e/test/pageobjects/page.ts
index 603eea15..299d876b 100644
--- a/client-e2e/test/pageobjects/page.ts
+++ b/client-e2e/test/pageobjects/page.ts
@@ -1,4 +1,4 @@
-export const homePageUrl = `https://client:8080`;
+export const homePageUrl = `http://client:8080`;
 
 export async function open() {
   const url = await browser.url(homePageUrl);
diff --git a/client-e2e/test/wdio.conf.ts b/client-e2e/test/wdio.conf.ts
index d399f0e6..317252c8 100644
--- a/client-e2e/test/wdio.conf.ts
+++ b/client-e2e/test/wdio.conf.ts
@@ -56,7 +56,7 @@ export const config: Options.Testrunner = {
   ],
   logLevel: "error",
   bail: 0,
-  baseUrl: "https://client:8080",
+  baseUrl: "http://client:8080",
   waitforTimeout: 10000,
   connectionRetryTimeout: 60000,
   connectionRetryCount: 2,
diff --git a/client/scripts/devserver.ts b/client/scripts/devserver.ts
index 779d1343..3106a072 100644
--- a/client/scripts/devserver.ts
+++ b/client/scripts/devserver.ts
@@ -1,7 +1,8 @@
 import express from "express";
 import fs from "fs";
 import { createProxyMiddleware } from "http-proxy-middleware";
-import https from "https";
+//import https from "https";
+import http from "http";
 import path from "path";
 import webpack from "webpack";
 import webpackDevMiddleware from "webpack-dev-middleware";
@@ -56,12 +57,13 @@ app.get("*", (req, res) => {
   res.sendFile(path.join(__dirname, "../src/public/index.html"));
 });
 
-const server = https.createServer(
-  {
-    key: fs.readFileSync(path.join(__dirname, "../certs/server.key")),
-    cert: fs.readFileSync(path.join(__dirname, "../certs/server.cert")),
-    passphrase: "gulp",
-  },
+//const server = https.createServer(
+const server = http.createServer(
+  // {
+  //   key: fs.readFileSync(path.join(__dirname, "../certs/server.key")),
+  //   cert: fs.readFileSync(path.join(__dirname, "../certs/server.cert")),
+  //   passphrase: "gulp",
+  // },
   app
 );