Skip to content

Commit 021d4da

Browse files
sampsapennacsc-felipe
authored andcommitted
fix libupload and websocket with tls proxy
1 parent 461c039 commit 021d4da

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

devproxy/nginx.conf

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -93,27 +93,11 @@ http {
9393
proxy_pass http://app_server_front/ws;
9494
}
9595

96-
location /libupload.js {
97-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
98-
proxy_set_header X-Forwarded-Proto $scheme;
99-
proxy_set_header Host $http_host;
100-
proxy_redirect off;
101-
proxy_buffering off;
102-
proxy_pass http://app_server_front/static/libupload.js;
103-
}
104-
105-
location /libupload.wasm {
106-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
107-
proxy_set_header X-Forwarded-Proto $scheme;
108-
proxy_set_header Host $http_host;
109-
proxy_redirect off;
110-
proxy_buffering off;
111-
proxy_pass http://app_server_front/static/libupload.wasm;
112-
}
113-
11496
location / {
11597
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
11698
proxy_set_header X-Forwarded-Proto $scheme;
99+
proxy_set_header Upgrade $http_upgrade;
100+
proxy_set_header Connection "Upgrade";
117101
proxy_set_header Host $http_host;
118102
proxy_redirect off;
119103
proxy_buffering off;

swift_browser_ui_frontend/vite.config.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ const proxyTo = {
2828

2929
const oidcEnabled = process.env.OIDC_ENABLED === "True";
3030
const root = path.resolve(__dirname, "src");
31+
const publicDir = path.resolve(__dirname, "public");
32+
3133
let pages = {
3234
"index": path.resolve(root, "index.html"),
3335
"select": path.resolve(root, "select.html"),
@@ -48,7 +50,6 @@ let proxy = {
4850
"/static/assets": proxyTo,
4951
"/api": proxyTo,
5052
"/discover": proxyTo,
51-
"/libupload": proxyTo,
5253
"/login/oidc": proxyTo,
5354
"/login/oidc_front": proxyTo,
5455
"/login/oidc-redirect": proxyTo,
@@ -61,12 +62,10 @@ let proxy = {
6162
"/sign": proxyTo,
6263
"/replicate": proxyTo,
6364
"/token": proxyTo,
64-
"/ws": {
65-
target: `ws${process.env.SWIFT_UI_SECURE_WEBSOCKET}://${process.env.SWIFT_UI_TLS_HOST}:${process.env.SWIFT_UI_TLS_PORT}/ws`,
66-
ws: true,
67-
},
6865
};
6966

67+
let origin = `http${process.env.SWIFT_UI_SECURE_WEBSOCKET}://${process.env.SWIFT_UI_TLS_HOST}:${process.env.SWIFT_UI_TLS_PORT}`;
68+
7069
// Vite doesn't work "out-of-the-box" with multiple SPAs
7170
// This middleware loads existing html pages and
7271
// forwards all routes starting with "/browse" to "browse.html"
@@ -131,6 +130,7 @@ export default defineConfig(({ command, mode }) => {
131130
return {
132131
root,
133132
base,
133+
publicDir,
134134
appType: "mpa", // set the dev server as a multi-page app
135135
plugins: [
136136
vue(),
@@ -153,6 +153,7 @@ export default defineConfig(({ command, mode }) => {
153153
https,
154154
strictPort: true,
155155
proxy,
156+
origin,
156157
},
157158
resolve: {
158159
alias: {

0 commit comments

Comments
 (0)