diff --git a/webadmin/src/js/setup.js b/webadmin/src/js/setup.js index 18fa81932..b7cf15f96 100644 --- a/webadmin/src/js/setup.js +++ b/webadmin/src/js/setup.js @@ -20,24 +20,10 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope $scope.provider = ''; $scope.apiServerOrigin = ''; $scope.setupToken = ''; - $scope.createAppstoreAccount = true; $scope.activateCloudron = function () { $scope.busy = true; - function registerAppstoreAccountIfNeeded(callback) { - if (!$scope.createAppstoreAccount) return callback(null); - if ($scope.provider === 'caas') return callback(null); - - $http.post($scope.apiServerOrigin + '/api/v1/users', { email: $scope.account.email, password: $scope.account.password }).success(function (data, status) { - if (status !== 201) return callback({ status: status, data: data }); - - Client.setAppstoreConfig({ userId: data.userId, token: data.accessToken }, callback); - }).error(function (data, status) { - callback({ status: status, data: data }); - }); - } - Client.createAdmin($scope.account.username, $scope.account.password, $scope.account.email, $scope.account.displayName, $scope.setupToken, function (error) { if (error) { console.error('Internal error', error); @@ -46,11 +32,7 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope return; } - registerAppstoreAccountIfNeeded(function (error) { - if (error) console.error('Unable to create appstore account.', error); // this is not fatal - - window.location.href = '/'; - }); + window.location.href = '/'; }); }; @@ -89,7 +71,6 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope } $scope.setupToken = search.setupToken; - $scope.createAppstoreAccount = false; } $scope.account.email = search.email || $scope.account.email; diff --git a/webadmin/src/setup.html b/webadmin/src/setup.html index a074c9c09..0fedbfa99 100644 --- a/webadmin/src/setup.html +++ b/webadmin/src/setup.html @@ -79,17 +79,6 @@ -
-
-
-
- -
-
-
-