NOJIRA

Updating DANGERCONTROLLER to properly remove EntityDescriptors
TIER · Jul 28, 2021 · 2f5ce92 · 2f5ce92
1 parent 994c04e
commit 2f5ce92
Showing 1 changed file with 29 additions and 17 deletions.
diff --git a/...end/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/DangerController.java b/...end/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/DangerController.java
@@ -1,36 +1,48 @@
 package edu.internet2.tier.shibboleth.admin.ui.controller;
 
-import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository;
-import edu.internet2.tier.shibboleth.admin.ui.repository.FilterRepository;
-import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository;
-import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolversPositionOrderContainerRepository;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Profile;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import edu.internet2.tier.shibboleth.admin.ui.exception.ForbiddenException;
+import edu.internet2.tier.shibboleth.admin.ui.repository.FilterRepository;
+import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository;
+import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolversPositionOrderContainerRepository;
+import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService;
+
 @Controller
 @RequestMapping(value = "/api/heheheheheheheWipeout")
 @Profile("very-dangerous")
 public class DangerController {
-    private final MetadataResolverRepository metadataResolverRepository;
-    private final EntityDescriptorRepository entityDescriptorRepository;
-    private final FilterRepository filterRepository;
-    private final MetadataResolversPositionOrderContainerRepository metadataResolversPositionOrderContainerRepository;
-
-    public DangerController(final MetadataResolverRepository metadataResolverRepository, final EntityDescriptorRepository entityDescriptorRepository, final FilterRepository filterRepository, final MetadataResolversPositionOrderContainerRepository metadataResolversPositionOrderContainerRepository) {
-        this.metadataResolverRepository = metadataResolverRepository;
-        this.entityDescriptorRepository = entityDescriptorRepository;
-        this.filterRepository = filterRepository;
-        this.metadataResolversPositionOrderContainerRepository = metadataResolversPositionOrderContainerRepository;
-    }
+    @Autowired
+    private EntityDescriptorService entityDescriptorService;
+
+    @Autowired
+    private FilterRepository filterRepository;
+
+    @Autowired
+    private MetadataResolverRepository metadataResolverRepository;
+
+    @Autowired
+    private MetadataResolversPositionOrderContainerRepository metadataResolversPositionOrderContainerRepository;
 
     @Transactional
     @GetMapping
-    public ResponseEntity<?> wipeOut() {
-        this.entityDescriptorRepository.deleteAll();
+    public ResponseEntity<?> wipeOut() throws ForbiddenException {
+        entityDescriptorService.getAllRepresentationsBasedOnUserAccess().forEach(edr -> {
+            try {
+                edr.setServiceEnabled(false);
+                edr = entityDescriptorService.update(edr);
+                entityDescriptorService.delete(edr.getId());
+            }
+            catch (Throwable e) {
+            }
+        });
+
         this.metadataResolverRepository.deleteAll();
         this.filterRepository.deleteAll();
         this.metadataResolversPositionOrderContainerRepository.deleteAll();