This is an automated email from the ASF dual-hosted git repository. cris pushed a commit to branch SLING-10193/test-coverage in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 622893601d7814c1a3974222d52877e3b7b8a684 Author: Cris Rockwell, College of LSA University of Michigan <[email protected]> AuthorDate: Sun Mar 7 15:02:53 2021 -0500 SAML Handler manages user sync with Saml2UserSyncService so extending Jackrabbit ExternalUser is not needed --- .../org/apache/sling/auth/saml2/Saml2User.java | 38 +--------------------- .../apache/sling/auth/saml2/impl/OsgiSamlTest.java | 9 ----- 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/saml-handler/src/main/java/org/apache/sling/auth/saml2/Saml2User.java b/saml-handler/src/main/java/org/apache/sling/auth/saml2/Saml2User.java index 9d1f7ac..c9bef17 100644 --- a/saml-handler/src/main/java/org/apache/sling/auth/saml2/Saml2User.java +++ b/saml-handler/src/main/java/org/apache/sling/auth/saml2/Saml2User.java @@ -19,20 +19,14 @@ */ package org.apache.sling.auth.saml2; -import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityException; -import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef; -import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalUser; import org.opensaml.core.xml.XMLObject; import org.opensaml.core.xml.schema.XSString; - -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -public class Saml2User implements ExternalUser { +public class Saml2User { private String id; private HashMap userProperties; private HashSet groupMembership; @@ -47,40 +41,10 @@ public class Saml2User implements ExternalUser { this.id = id; } - @Nonnull - @Override - public ExternalIdentityRef getExternalId() { - return null; - } - public String getId() { return id; } - @Nonnull - @Override - public String getPrincipalName() { - return null; - } - - @CheckForNull - @Override - public String getIntermediatePath() { - return null; - } - - @Nonnull - @Override - public Iterable<ExternalIdentityRef> getDeclaredGroups() throws ExternalIdentityException { - return null; - } - - @Nonnull - @Override - public Map<String, ?> getProperties() { - return null; - } - public Map<String,String> getUserProperties() { return userProperties; } diff --git a/saml-handler/src/test/java/org/apache/sling/auth/saml2/impl/OsgiSamlTest.java b/saml-handler/src/test/java/org/apache/sling/auth/saml2/impl/OsgiSamlTest.java index 97720ac..6419a1a 100644 --- a/saml-handler/src/test/java/org/apache/sling/auth/saml2/impl/OsgiSamlTest.java +++ b/saml-handler/src/test/java/org/apache/sling/auth/saml2/impl/OsgiSamlTest.java @@ -196,15 +196,6 @@ public class OsgiSamlTest { assertEquals("212-555-1234",samlUser.getUserProperties().get("phone")); assertEquals("test-user", samlUser.getId()); assertTrue( samlUser.getGroupMembership().contains("test-group")); - try { - assertNull(samlUser.getDeclaredGroups()); - } catch (ExternalIdentityException e) { - fail(e.getMessage()); - } - assertNull(samlUser.getProperties()); - assertNull(samlUser.getIntermediatePath()); - assertNull(samlUser.getPrincipalName()); - assertNull(samlUser.getExternalId()); } @Test (expected = IllegalArgumentException.class)
