From 450ca67b5d41490b99f4c52c0c56b672428a3b67 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 15 Nov 2022 14:42:09 -0700 Subject: [PATCH] SHIBUI-2394 fixing updates to 1.15.x from previous versions --- .../tier/shibboleth/admin/ui/domain/EntityDescriptor.java | 2 ++ .../admin/ui/repository/EntityDescriptorProjection.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java index 1d85e8158..39afddb9a 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java @@ -16,6 +16,7 @@ import javax.annotation.Nullable; import javax.persistence.CascadeType; +import javax.persistence.Column; import javax.persistence.ElementCollection; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -50,6 +51,7 @@ public class EntityDescriptor extends AbstractDescriptor implements org.opensaml @Getter @Setter + @Column(columnDefinition = "boolean default true") // this is true for migration reasons, but the java will default false private boolean approved; @OneToOne(cascade = CascadeType.ALL) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorProjection.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorProjection.java index 94dada3d8..66fff37ff 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorProjection.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorProjection.java @@ -40,7 +40,7 @@ public EntityDescriptorProjection(String entityID, String resourceId, String ser this.serviceEnabled = serviceEnabled; this.idOfOwner = idOfOwner; this.protocol = edp == null ? EntityDescriptorProtocol.SAML : edp; - this.approved = approved; + this.approved = approved || serviceEnabled; } public String getEntityID() { @@ -54,4 +54,4 @@ public String getEntityId() { public EntityDescriptorProtocol getProtocol() { return protocol == null ? EntityDescriptorProtocol.SAML : protocol; } -} +} \ No newline at end of file