Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-05 02:09:50 +01:00
Code Issues Projects Releases Wiki Activity

Don't fall back to relative address when using proxy-https

Browse Source 
Affects issues:
- Fixed #3032
This commit is contained in:
Aurora Lahtela 2023-09-24 09:14:49 +03:00
parent 9bf7d65137
commit bd5dcb7512
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Plan/react/dashboard/src/service/backendConfiguration.js
View File

@ -6,8 +6,14 @@ const javaReplaced = {
}
const isCurrentAddress = (address) => {
const is = window.location.href.startsWith(address);
if (!is) console.warn(`Configured address ${address} did not match start of ${window.location.href}, falling back to relative address. Configure 'Webserver.Alternative_IP' settings to point to your address.`)
let is = window.location.href.startsWith(address);
const usingProxyHttps = window.location.href.startsWith("https") && address.startsWith("http");
if (usingProxyHttps) {
is = window.location.href.replace('https', '').startsWith(address.replace('http'));
}
if (!is) {
console.warn(`Configured address ${address} did not match start of ${window.location.href}, falling back to relative address. Configure 'Webserver.Alternative_IP' settings to point to your address.`)
}
return is;
}