From 27bc1b8ba80e2ec33f807941124cd05128d1976c Mon Sep 17 00:00:00 2001 From: chasegawa Date: Thu, 29 Jul 2021 12:39:57 -0700 Subject: [PATCH 1/2] NOJIRA dangercontroller fix for groups on entity descriptors --- .../admin/ui/controller/DangerController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/DangerController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/DangerController.java index c62f8b772..cb1f9719f 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/DangerController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/DangerController.java @@ -8,16 +8,18 @@ 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.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 edu.internet2.tier.shibboleth.admin.ui.security.service.IGroupService; import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService; +import lombok.extern.slf4j.Slf4j; @Controller @RequestMapping(value = "/api/heheheheheheheWipeout") @Profile("very-dangerous") +@Slf4j public class DangerController { @Autowired private EntityDescriptorService entityDescriptorService; @@ -28,6 +30,9 @@ public class DangerController { @Autowired private FilterRepository filterRepository; + @Autowired + private IGroupService groupService; + @Autowired private MetadataResolverRepository metadataResolverRepository; @@ -36,17 +41,18 @@ public class DangerController { @Transactional @GetMapping - public ResponseEntity wipeOut() throws ForbiddenException { + public ResponseEntity wipeOut() { edRepo.findAll().forEach(ed -> { try { ed.setServiceEnabled(false); edRepo.save(ed); + groupService.removeEntityFromGroup(ed); entityDescriptorService.delete(ed.getResourceId()); } catch (Throwable e) { + System.out.println("@@@@@@ error deleting" + e.getMessage()); } }); - this.metadataResolverRepository.deleteAll(); this.filterRepository.deleteAll(); this.metadataResolversPositionOrderContainerRepository.deleteAll(); From 4e9eae0ed1592a3527dcf883b4788a10422bc13c Mon Sep 17 00:00:00 2001 From: chasegawa Date: Thu, 29 Jul 2021 12:55:35 -0700 Subject: [PATCH 2/2] NOJIRA needing to activate danger profile in testing class --- .../internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy index 8f47b85d9..a9121b377 100644 --- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy +++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy @@ -15,7 +15,7 @@ import java.nio.file.Paths //TODO: make config configurable @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = [ShibbolethUiApplication]) -@ActiveProfiles(['dev']) +@ActiveProfiles(['dev', 'very-dangerous']) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD, methodMode = DirtiesContext.MethodMode.AFTER_METHOD) class SeleniumSIDETest extends Specification { @Value('${local.server.port}')