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

customDomain during setup is a special caas case

Browse Source
This commit is contained in:
Johannes Zellner
2015-12-29 11:04:42 +01:00
parent 3fb5c682f8
commit 3060b34bdd
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
webadmin/src/js/setup.js
View File

@@ -98,7 +98,11 @@ app.service('Wizard', [ function () {
}];
this.avatar = {};
this.avatarBlob = null;
this.dnsConfig = null;
this.dnsConfig = {
provider: 'route53',
accessKeyId: null,
secretAccessKey: null
};
}
Wizard.prototype.setPreviewAvatar = function (avatar) {
@@ -260,25 +264,23 @@ app.controller('SetupController', ['$scope', '$location', 'Client', 'Wizard', fu
return;
}
if (!search.setupToken) {
window.location.href = '/error.html?errorCode=2';
return;
}
if (status.provider === 'caas') {
if (!search.setupToken) {
window.location.href = '/error.html?errorCode=2';
return;
}
if (!search.email) {
window.location.href = '/error.html?errorCode=3';
return;
}
if (!search.email) {
window.location.href = '/error.html?errorCode=3';
return;
}
$scope.setupToken = search.setupToken;
Wizard.email = search.email;
if (search.customDomain !== 'true') {
Wizard.dnsConfig = null;
}
if (search.customDomain === 'true') {
Wizard.dnsConfig = {
provider: 'route53',
accessKeyId: null,
secretAccessKey: null
};
$scope.setupToken = search.setupToken;
Wizard.email = search.email;
}
$location.path('/step1');