From 370c88b4a6b5410a03b2428e3f0e1a1ec5870b92 Mon Sep 17 00:00:00 2001 From: Jj! Date: Wed, 13 Feb 2019 16:35:17 -0600 Subject: [PATCH] [SHIBUI-1226] implement updates for logout endpoints --- .../admin/ui/service/JPAEntityDescriptorServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java index c3d434927..6004c6a93 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java @@ -286,6 +286,8 @@ private EntityDescriptor buildDescriptorFromRepresentation(final EntityDescripto // setup logout if (representation.getLogoutEndpoints() != null && !representation.getLogoutEndpoints().isEmpty()) { + // TODO: review if we need more than a naive implementation + getOptionalSPSSODescriptorFromEntityDescriptor(ed).ifPresent(spssoDescriptor -> spssoDescriptor.getSingleLogoutServices().clear()); for (LogoutEndpointRepresentation logoutEndpointRepresentation : representation.getLogoutEndpoints()) { SingleLogoutService singleLogoutService = openSamlObjects.buildDefaultInstanceOfType(SingleLogoutService.class); singleLogoutService.setBinding(logoutEndpointRepresentation.getBindingType()); @@ -294,7 +296,7 @@ private EntityDescriptor buildDescriptorFromRepresentation(final EntityDescripto getSPSSODescriptorFromEntityDescriptor(ed).getSingleLogoutServices().add(singleLogoutService); } } else { - // TODO: implement + getOptionalSPSSODescriptorFromEntityDescriptor(ed).ifPresent(spssoDescriptor -> spssoDescriptor.getSingleLogoutServices().clear()); } if (representation.getRelyingPartyOverrides() != null || (representation.getAttributeRelease() != null && representation.getAttributeRelease().size() > 0)) {