mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2025-04-30 13:11:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Check if redirect available

Browse source
This commit is contained in:
Ildar Kamalov 2019-02-19 19:19:40 +03:00
parent e873149bee
commit 340a4fb58e
4 changed files with 54 additions and 19 deletions
client/src/helpers
helpers.js

22
client/src/helpers/helpers.js
View file

@ -4,7 +4,13 @@ import subHours from 'date-fns/sub_hours';
import addHours from 'date-fns/add_hours';
import round from 'lodash/round';
import { STATS_NAMES, STANDARD_DNS_PORT, STANDARD_WEB_PORT } from './constants';
import {
STATS_NAMES,
STANDARD_DNS_PORT,
STANDARD_WEB_PORT,
CHECK_TIMEOUT,
STOP_TIMEOUT,
} from './constants';
export const formatTime = (time) => {
const parsedTime = dateParse(time);
@ -151,7 +157,19 @@ export const redirectToCurrentProtocol = (values) => {
if (protocol !== 'https:' && enabled && port_https) {
window.location.replace(`https://${hostname}${httpsPort}/${hash}`);
} else if (protocol === 'https:' && enabled && port_https && port_https !== port) {
window.location.replace(`https://${hostname}${httpsPort}/${hash}`);
// TODO
const redirectCheck = setInterval(() => {
fetch(`https://${hostname}${httpsPort}/${hash}`, { mode: 'no-cors' })
.then(() => {
clearInterval(redirectCheck);
window.location.replace(`https://${hostname}${httpsPort}/${hash}`);
})
.catch(() => false);
}, CHECK_TIMEOUT);
setTimeout(() => {
clearInterval(redirectCheck);
console.error('Redirect check stopped');
}, STOP_TIMEOUT);
} else if (protocol === 'https:' && (!enabled || !port_https)) {
window.location.replace(`http://${hostname}/${hash}`);
}