diff --git a/webadmin/src/js/setup.js b/webadmin/src/js/setup.js index c85865e62..2cb160e06 100644 --- a/webadmin/src/js/setup.js +++ b/webadmin/src/js/setup.js @@ -43,6 +43,8 @@ app.service('Wizard', [ function () { this.username = ''; this.email = ''; this.password = ''; + this.setupToken = null; + this.provider = null; this.availableAvatars = [{ file: null, data: null, @@ -222,9 +224,8 @@ app.controller('StepController', ['$scope', '$route', '$location', 'Wizard', fun app.controller('FinishController', ['$scope', '$location', 'Wizard', 'Client', function ($scope, $location, Wizard, Client) { $scope.wizard = Wizard; - $scope.setupToken = null; - Client.createAdmin($scope.wizard.username, $scope.wizard.password, $scope.wizard.email, $scope.setupToken, function (error) { + Client.createAdmin(Wizard.username, Wizard.password, Wizard.email, Wizard.setupToken, function (error) { if (error) { console.error('Internal error', error); window.location.href = '/error.html'; @@ -280,13 +281,16 @@ app.controller('SetupController', ['$scope', '$location', 'Client', 'Wizard', fu Wizard.dnsConfig = null; } - $scope.setupToken = search.setupToken; + Wizard.setupToken = search.setupToken; + Wizard.provider = status.provider; Wizard.email = search.email; // angular ng-attr is only false when 'undefined' Wizard.requireEmail = search.email || undefined; } + Wizard.provider = status.provider; + $location.path('/step1'); $scope.initialized = true; diff --git a/webadmin/src/setup.html b/webadmin/src/setup.html index f59d7c2d7..aa56ed5b0 100644 --- a/webadmin/src/setup.html +++ b/webadmin/src/setup.html @@ -38,13 +38,13 @@ - +
No setup token provided.

Please use the setup link for this cloudron.
-
+