colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove hardcoded url & use absolute url to make requests

This commit is contained in:
Jannis Mattheis 2018-03-18 16:03:53 +01:00 committed by Jannis Mattheis
parent 1e33fd0ea4
commit d931dfc696
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/actions/MessageAction.js
View File

@ -38,8 +38,8 @@ export function listenToWebSocket() {
if (!getToken()) {
return;
}
const ws = new WebSocket('ws://localhost:80/stream?token=' + getToken());
const wsUrl = config.get('url').replace('http', 'ws').replace('https', 'wss');
const ws = new WebSocket(wsUrl + 'stream?token=' + getToken());
ws.onerror = (e) => {
console.log('WebSocket connection errored; trying again in 60 seconds', e);

9
ui/src/index.js
View File

@ -11,8 +11,13 @@ const defaultDevConfig = {
url: 'http://localhost:80/',
};
const {port, hostname, protocol} = window.location;
const slashes = protocol.concat('//');
const url = slashes.concat(hostname.concat(':', port));
const urlWithSlash = url.endsWith('/') ? url : url.concat('/');
const defaultProdConfig = {
url: './',
url: urlWithSlash,
};
(function clientJS() {
@ -22,6 +27,6 @@ const defaultProdConfig = {
config.set(window.config || defaultDevConfig);
}
checkIfAlreadyLoggedIn();
ReactDOM.render(<Layout />, document.getElementById('root'));
ReactDOM.render(<Layout/>, document.getElementById('root'));
registerServiceWorker();
}());