Merge branch 'feature/SHIBUI-1063' of bitbucket.org:unicon/shib-idp-u…

…i into feature/SHIBUI-1063
TIER · Jan 24, 2019 · 661ed68 · 661ed68
2 parents 00c231c + 2489e4f
commit 661ed68
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...in/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java b/...in/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java
@@ -144,6 +144,13 @@ public ResponseEntity<?> getOneXml(@PathVariable String resourceId) throws Marsh
         return ResponseEntity.ok(xml);
     }
 
+    @GetMapping(value = "/EntityDescriptor/disabledNonAdmin")
+    public Iterable<EntityDescriptorRepresentation> getDisabledAndNotOwnedByAdmin() {
+        return entityDescriptorRepository.findAllDisabledAndNotOwnedByAdmin()
+                .map(ed -> entityDescriptorService.createRepresentationFromDescriptor(ed))
+                .collect(Collectors.toList());
+    }
+
     private static URI getResourceUriFor(EntityDescriptor ed) {
         return ServletUriComponentsBuilder
                 .fromCurrentServletMapping().path("/api/EntityDescriptor")

diff --git a/...in/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepository.java b/...in/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepository.java
@@ -1,16 +1,16 @@
 package edu.internet2.tier.shibboleth.admin.ui.repository;
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
 
 import java.util.stream.Stream;
 
 
 /**
  * Repository to manage {@link EntityDescriptor} instances.
  */
-public interface EntityDescriptorRepository extends CrudRepository<EntityDescriptor, Long> {
+public interface EntityDescriptorRepository extends JpaRepository<EntityDescriptor, Long> {
 
     EntityDescriptor findByEntityID(String entityId);
 
@@ -21,4 +21,7 @@ public interface EntityDescriptorRepository extends CrudRepository<EntityDescrip
     @Query("select e from EntityDescriptor e")
     Stream<EntityDescriptor> findAllByCustomQueryAndStream();
 
+    @Query("select e from EntityDescriptor e, User u join u.roles r " +
+            "where e.createdBy = u.username and e.serviceEnabled = false and r.name in ('ROLE_USER', 'ROLE_NONE')")
+    Stream<EntityDescriptor> findAllDisabledAndNotOwnedByAdmin();
 }