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

Remove password requirement for app uninstall and restore

Browse Source
This commit is contained in:
Johannes Zellner
2019-05-13 23:31:45 +02:00
parent 7c2ea6288c
commit b67d5eec3d
3 changed files with 23 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/apps.js
View File

@@ -239,8 +239,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.appUninstall = {
busy: false,
error: {},
app: {},
password: ''
app: {}
};
$scope.appRestore = {
@@ -248,7 +247,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
busyFetching: false,
error: {},
app: {},
password: '',
backups: [ ],
selectedBackup: null,
@@ -370,14 +368,9 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
restore: function () {
$scope.appRestore.busy = true;
$scope.appRestore.error.password = null;
Client.restoreApp($scope.appRestore.app.id, $scope.appRestore.selectedBackup.id, $scope.appRestore.password, function (error) {
if (error && error.statusCode === 403) {
$scope.appRestore.password = '';
$scope.appRestore.error.password = true;
$('#appRestorePasswordInput').focus();
} else if (error) {
Client.restoreApp($scope.appRestore.app.id, $scope.appRestore.selectedBackup.id, function (error) {
if (error) {
Client.error(error);
} else {
$('#appRestoreModal').modal('hide');
@@ -471,10 +464,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
// reset uninstall dialog
$scope.appUninstall.app = {};
$scope.appUninstall.error = {};
$scope.appUninstall.password = '';
$scope.appUninstallForm.$setPristine();
$scope.appUninstallForm.$setUntouched();
// reset update dialog
$scope.appUpdate.error = {};
@@ -484,7 +473,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
// reset restore dialog
$scope.appRestore.error = {};
$scope.appRestore.app = {};
$scope.appRestore.password = '';
$scope.appRestore.selectedBackup = null;
$scope.appRestore.backups = [];
$scope.appRestore.location = '';
@@ -559,15 +547,9 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.doUninstall = function () {
$scope.appUninstall.busy = true;
$scope.appUninstall.error.password = null;
Client.uninstallApp($scope.appUninstall.app.id, $scope.appUninstall.password, function (error) {
if (error && error.statusCode === 403) {
$scope.appUninstall.password = '';
$scope.appUninstall.error.password = true;
$scope.appUninstallForm.password.$setPristine();
$('#appUninstallPasswordInput').focus();
} else if (error && error.statusCode === 402) { // unpurchase failed
Client.uninstallApp($scope.appUninstall.app.id, function (error) {
if (error && error.statusCode === 402) { // unpurchase failed
Client.error('Relogin to Cloudron App Store');
} else if (error) {
Client.error(error);