jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

add setup_token to setup and restore

Browse Source 
part of cloudron/box#751
This commit is contained in:
Girish Ramakrishnan
2020-12-21 22:36:43 -08:00
parent de5c1ca1cf
commit 29f7b771a1
7 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/main.js
View File

@@ -91,9 +91,9 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
if (!status.activated) {
console.log('Not activated yet, redirecting', status);
if (status.restore.active || status.restore.errorMessage) { // show the error message in restore page
window.location.href = '/restore.html';
window.location.href = '/restore.html' + window.location.search;
} else {
window.location.href = status.adminFqdn ? '/setup.html' : '/setupdns.html';
window.location.href = (status.adminFqdn ? '/setup.html' : '/setupdns.html') + window.location.search;
}
return;
}
@@ -101,7 +101,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
// support local development with localhost check
if (window.location.hostname !== status.adminFqdn && window.location.hostname !== 'localhost') {
// user is accessing by IP or by the old admin location (pre-migration)
window.location.href = '/setupdns.html';
window.location.href = '/setupdns.html' + window.location.search;
return;
}