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

Redirect to /setupdns.html if cloudron is activated but no domain is set

Browse Source 
This happens in the restore case where no domain is provided to
cloudron-setup

Fixes #273
This commit is contained in:
Johannes Zellner
2017-03-23 14:01:21 +01:00
parent 046120befc
commit a694acba44
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webadmin/src/js/main.js
View File

@@ -92,6 +92,13 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
Client.getStatus(function (error, status) {
if (error) return $scope.error(error);
// WARNING if anything about the routing is changed here test these use-cases:
//
// 1. Caas
// 2. selfhosted with --domain argument
// 3. selfhosted restore
// 4. local development with gulp develop
if (!status.activated) {
console.log('You have on domain, redirecting', status.configState.configured);
window.location.href = status.configState.configured ? '/setup.html' : '/setupdns.html';
@@ -100,7 +107,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
// support local development with localhost check
if (window.location.hostname !== status.adminFqdn && window.location.hostname !== 'localhost') {
window.location.href = 'https://' + status.adminFqdn + '/noapp.html';
window.location.href = '/setupdns.html';
return;
}