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

…i into feature/shibui-2394
TIER · Oct 28, 2022 · 3eb9058 · 3eb9058
2 parents 09e3657 + 79fd272
commit 3eb9058
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
@@ -229,6 +229,9 @@ public EntityDescriptorRepresentation createNew(EntityDescriptorRepresentation e
 
         EntityDescriptor ed = (EntityDescriptor) createDescriptorFromRepresentation(edRep);
         ed.setIdOfOwner(userService.getCurrentUserGroup().getOwnerId());
+        if (userService.currentUserIsAdmin()) {
+            ed.setApproved(true);
+        }
 
         ownershipRepository.deleteEntriesForOwnedObject(ed);
         ownershipRepository.save(new Ownership(userService.getCurrentUserGroup(), ed));
@@ -245,6 +248,9 @@ public EntityDescriptorRepresentation createNewEntityDescriptorFromXMLOrigin(Ent
         if (ed.getProtocol() == EntityDescriptorProtocol.OIDC) {
             ed.getSPSSODescriptor("").addSupportedProtocol("http://openid.net/specs/openid-connect-core-1_0.html");
         }
+        if (userService.currentUserIsAdmin()) {
+            ed.setApproved(true);
+        }
         EntityDescriptor savedEntity = entityDescriptorRepository.save(ed);
         return createRepresentationFromDescriptor(savedEntity);
     }