#62 - delete existing configuration value

alfio-event · Oct 1, 2015 · be364cf · be364cf
1 parent 13c53ab
commit be364cf
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 15 deletions.
diff --git a/src/main/java/alfio/controller/api/admin/SettingsApiController.java b/src/main/java/alfio/controller/api/admin/SettingsApiController.java
@@ -101,6 +101,12 @@ public List<PluginConfigOption> updatePluginConfiguration(@RequestBody List<Plug
         return loadPluginConfiguration();
     }
 
+    @RequestMapping(value = "/configuration/organization/{organizationId}/key/{key}", method = DELETE)
+    public boolean deleteKey(@PathVariable("organizationId") int organizationId, @PathVariable("key") ConfigurationKeys key, Principal principal) {
+        configurationManager.deleteOrganizationLevelByKey(key.getValue(), organizationId, principal.getName());
+        return true;
+    }
+
     @RequestMapping(value = "/configuration/key/{key}", method = DELETE)
     public boolean deleteKey(@PathVariable("key") String key) {
         configurationManager.deleteKey(key);

diff --git a/src/main/java/alfio/manager/system/ConfigurationManager.java b/src/main/java/alfio/manager/system/ConfigurationManager.java
@@ -29,6 +29,7 @@
 import jdk.nashorn.internal.runtime.regexp.joni.Config;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -232,4 +233,9 @@ private static Function<ConfigurationKeys, Configuration> mapEmptyKeys(Configura
     public void deleteKey(String key) {
         configurationRepository.deleteByKey(key);
     }
+
+    public void deleteOrganizationLevelByKey(String key, int organizationId, String username) {
+        Validate.isTrue(userManager.isOwnerOfOrganization(userManager.findUserByUsername(username), organizationId), "User is not owner of the organization. Therefore, delete is not allowed.");
+        configurationRepository.deleteOrganizationLevelByKey(key, organizationId);
+    }
 }
diff --git a/src/main/java/alfio/manager/user/UserManager.java b/src/main/java/alfio/manager/user/UserManager.java
@@ -117,6 +117,10 @@ public boolean isOwner(User user) {
         return checkRole(user, a -> a.getRole().equals(AuthorityRepository.ROLE_ADMIN) || a.getRole().equals(AuthorityRepository.ROLE_OWNER));
     }
 
+    public boolean isOwnerOfOrganization(User user, int organizationId) {
+        return isAdmin(user) || (isOwner(user) && userOrganizationRepository.findByUserId(user.getId()).stream().anyMatch(uo -> uo.getOrganizationId() == organizationId));
+    }
+
     private boolean checkRole(User user, Predicate<Authority> matcher) {
         return getUserAuthorities(user).stream().anyMatch(matcher);
     }

diff --git a/src/main/java/alfio/repository/system/ConfigurationRepository.java b/src/main/java/alfio/repository/system/ConfigurationRepository.java
@@ -78,6 +78,9 @@ List<Configuration> findByTicketCategoryAndKey(@Bind("organizationId") int organ
     @Query("DELETE FROM configuration where c_key = :key")
     void deleteByKey(@Bind("key") String key);
 
+    @Query("DELETE FROM configuration_organization where c_key = :key and organization_id_fk = :organizationId")
+    void deleteOrganizationLevelByKey(@Bind("key") String key, @Bind("organizationId") int organizationId);
+
     @Query(INSERT_STATEMENT)
     int insert(@Bind("key") String key, @Bind("value") String value, @Bind("description") String description);
 

diff --git a/src/main/webapp/resources/angular-templates/admin/partials/configuration/index.html b/src/main/webapp/resources/angular-templates/admin/partials/configuration/index.html
@@ -23,7 +23,7 @@ <h1>General</h1>
             <form name="settingsForm" novalidate data-ng-submit="configCtrl.saveSettings(settingsForm)">
                 <div data-ng-if="configCtrl.general">
                     <div data-ng-repeat="setting in configCtrl.general.settings">
-                        <setting data-obj="setting" data-display-delete-if-needed="true" data-global-settings="configCtrl.globalSettings"></setting>
+                        <setting data-obj="setting" data-display-delete-if-needed="true" data-global-settings="configCtrl.globalSettings" data-organization="configCtrl.organization"></setting>
                     </div>
                     <i class="fa fa-cog fa-spin fa-3x" data-ng-if="configCtrl.general.loading"></i>
                 </div>
@@ -48,17 +48,17 @@ <h1>E-Mail</h1>
                             </label>
                         </div>
                         <div data-ng-repeat="setting in configCtrl.mail.settings | mailSettingsFilter:configCtrl.mail.type.value">
-                            <setting data-obj="setting" data-display-delete-if-needed="true"></setting>
+                            <setting data-obj="setting" data-display-delete-if-needed="true" data-organization="configCtrl.organization"></setting>
                         </div>
                         <div>
-                            <setting obj="configCtrl.mail.maxEmailPerCycle" data-display-delete-if-needed="true"></setting>
+                            <setting obj="configCtrl.mail.maxEmailPerCycle" data-display-delete-if-needed="true" data-organization="configCtrl.organization"></setting>
                         </div>
                         <div>
-                            <setting obj="configCtrl.mail.mailReplyTo" data-display-delete-if-needed="true"></setting>
+                            <setting obj="configCtrl.mail.mailReplyTo" data-display-delete-if-needed="true" data-organization="configCtrl.organization"></setting>
                         </div>
                     </div>
                     <div data-ng-repeat="setting in configCtrl.mail.settings" data-ng-if="!configCtrl.mail.type">
-                        <setting data-obj="setting" data-display-delete-if-needed="true"></setting>
+                        <setting data-obj="setting" data-display-delete-if-needed="true" data-organization="configCtrl.organization"></setting>
                     </div>
                 </div>
 
@@ -69,7 +69,7 @@ <h1>Payment</h1>
 
                 <div data-ng-if="payment">
                     <div data-ng-repeat="setting in configCtrl.payment.settings">
-                        <setting data-obj="setting" data-display-delete-if-needed="true"></setting>
+                        <setting data-obj="setting" data-display-delete-if-needed="true" data-organization="configCtrl.organization"></setting>
                     </div>
                     <i class="fa fa-cog fa-spin fa-3x" data-ng-if="loading"></i>
                 </div>
@@ -82,7 +82,7 @@ <h1>Plugins</h1>
                 <div data-ng-repeat="(key, settings) in configCtrl.pluginSettingsByPluginId">
                     <div class="page-header"><h3 data-ng-bind="key"></h3></div>
                     <div data-ng-repeat="setting in settings">
-                        <setting data-obj="setting" data-display-delete-if-needed="true"></setting>
+                        <setting data-obj="setting" data-display-delete-if-needed="true" data-organization="configCtrl.organization"></setting>
                     </div>
                 </div>
 

diff --git a/src/main/webapp/resources/angular-templates/admin/partials/configuration/setting.html b/src/main/webapp/resources/angular-templates/admin/partials/configuration/setting.html
@@ -1,10 +1,10 @@
 <div class="form-group">
     <label for="{{setting.key}}">{{setting.description}}</label>
-    <div data-ng-class="{'input-group': displayDelete && setting.componentType === 'TEXT'}" data-ng-switch="setting.componentType">
+    <div data-ng-class="{'input-group': displayDelete && setting.componentType === 'TEXT' && setting.id > -1}" data-ng-switch="setting.componentType">
         <input data-ng-switch-when="TEXT" class="form-control" data-ng-model="setting.value" name="{{setting.key}}" id="{{setting.key}}">
         <input type="checkbox" data-ng-switch-when="BOOLEAN" data-ng-model="setting.value" data-ng-true-value="'true'" data-ng-false-value="'false'" name="{{setting.key}}" id="{{setting.key}}">
-        <div class="input-group-btn" data-ng-if="displayDelete && setting.componentType === 'TEXT'">
-            <button class="btn btn-danger" data-ng-click="removeConfigurationKey(setting.key)" type="button"><i class="fa fa-trash" data-tooltip="Delete"></i></button>
+        <div class="input-group-btn" data-ng-if="displayDelete && setting.componentType === 'TEXT' && setting.id > -1">
+            <button class="btn btn-danger" data-ng-click="removeConfiguration(setting)" type="button"><i class="fa fa-trash" data-tooltip="Delete"></i></button>
         </div>
     </div>
 </div>
diff --git a/src/main/webapp/resources/js/admin/directive/admin-directive.js b/src/main/webapp/resources/js/admin/directive/admin-directive.js
@@ -529,15 +529,17 @@
             restrict: 'E',
             scope: {
                 setting: '=obj',
-                displayDeleteIfNeeded: '='
+                displayDeleteIfNeeded: '=',
+                organization: '='
             },
             templateUrl:'/resources/angular-templates/admin/partials/configuration/setting.html',
             link: angular.noop,
             controller: function($scope, $rootScope, ConfigurationService) {
                 $scope.displayDelete = $scope.displayDeleteIfNeeded && angular.isDefined($scope.setting) && !angular.isDefined($scope.setting.pluginId);
-                $scope.removeConfigurationKey = function(key) {
+                $scope.removeConfiguration = function(config) {
                     $scope.loading = true;
-                    ConfigurationService.remove(key).then(function() {$rootScope.$broadcast('ReloadSettings');});
+                    var promise = angular.isDefined($scope.organization) ? ConfigurationService.removeOrganizationConfig(config, $scope.organization) : ConfigurationService.remove(config);
+                    promise.then(function() {$rootScope.$broadcast('ReloadSettings');});
                 };
             }
         }

diff --git a/src/main/webapp/resources/js/admin/feature/configuration/configuration.js b/src/main/webapp/resources/js/admin/feature/configuration/configuration.js
@@ -30,8 +30,11 @@
             updateOrganizationConfig: function(organization, settings) {
                 return $http.post('/admin/api/configuration/organizations/'+organization.id+'/update', settings).error(HttpErrorHandler.handle);
             },
-            remove: function(key) {
-                return $http['delete']('/admin/api/configuration/key/' + key).error(HttpErrorHandler.handle);
+            remove: function(conf) {
+                return $http['delete']('/admin/api/configuration/key/' + conf.configurationKey).error(HttpErrorHandler.handle);
+            },
+            removeOrganizationConfig: function(conf, organization) {
+                return $http['delete']('/admin/api/configuration/organization/'+organization.id+'/key/' + conf.configurationKey).error(HttpErrorHandler.handle);
             },
             loadPlugins: function() {
                 return $http.get('/admin/api/configuration/plugin/load').error(HttpErrorHandler.handle);