Skip to content

Commit

Permalink
Try http only
Browse files Browse the repository at this point in the history
Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>
  • Loading branch information
btlogy committed Feb 5, 2024
1 parent 74ddafb commit c5e59d1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client-e2e/test/pageobjects/page.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion client-e2e/test/wdio.conf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
16 changes: 9 additions & 7 deletions client/scripts/devserver.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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
);

Expand Down

0 comments on commit c5e59d1

Please sign in to comment.