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

Remove caas case in setup screen

Browse Source
This commit is contained in:
Johannes Zellner
2019-08-06 10:03:12 +02:00
parent debeb8dfd8
commit c42aa7c806
3 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/client.js
+2 -5
View File
@@ -1065,7 +1065,7 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
});
};
Client.prototype.createAdmin = function (username, password, email, displayName, setupToken, callback) {
Client.prototype.createAdmin = function (username, password, email, displayName, callback) {
var that = this;
var data = {
@@ -1075,10 +1075,7 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
displayName: displayName
};
var query = '';
if (setupToken) query = '?setupToken=' + setupToken;
post('/api/v1/cloudron/activate' + query, data, null, function (error, data, status) {
post('/api/v1/cloudron/activate', data, null, function (error, data, status) {
if (error) return callback(error);
if (status !== 201) return callback(new ClientError(status, data));
src/js/setup.js
+2 -7
View File
@@ -19,13 +19,12 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
$scope.error = null;
$scope.provider = '';
$scope.apiServerOrigin = '';
$scope.setupToken = '';
$scope.activateCloudron = function () {
$scope.busy = true;
$scope.error = null;
Client.createAdmin($scope.account.username, $scope.account.password, $scope.account.email, $scope.account.displayName, $scope.setupToken, function (error) {
Client.createAdmin($scope.account.username, $scope.account.password, $scope.account.email, $scope.account.displayName, function (error) {
if (error && error.statusCode === 400) {
$scope.busy = false;
$scope.error = { username: error.message };
@@ -51,7 +50,7 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
}
// if we are here from the ip first go to the real domain if already setup
if (status.provider !== 'caas' && status.adminFqdn && status.adminFqdn !== window.location.hostname) {
if (status.adminFqdn && status.adminFqdn !== window.location.hostname) {
window.location.href = 'https://' + status.adminFqdn + '/setup.html';
return;
}
@@ -67,10 +66,6 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
return;
}
if (status.provider === 'caas') {
$scope.setupToken = search.setupToken;
}
$scope.account.email = search.email || $scope.account.email;
$scope.account.displayName = search.displayName || $scope.account.displayName;
$scope.account.requireEmail = !search.email;
src/setup.html
-9
View File
@@ -37,15 +37,6 @@
<body class="setup" ng-app="Application" ng-controller="SetupController">
<div class="main-container ng-cloak text-center" ng-show="provider === 'caas' && !setupToken">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<h1> <i class="fa fa-frown-o fa-fw text-danger"></i> No setup token provided. </h1>
Please use the setup link for this cloudron.
</div>
</div>
</div>
<div class="main-container ng-cloak text-center" ng-show="busy">
<div class="row">
<div class="col-md-6 col-md-offset-3">