[java-identity-provider] 46/51: IDP-1409 Remove PrincipalAuthenticationMethod from the AttributeResolutionContext

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=fd1a5a759626eeca11e8707021f8894321cab386

commit fd1a5a759626eeca11e8707021f8894321cab386
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jan 30 17:30:40 2019 +0000

    IDP-1409 Remove PrincipalAuthenticationMethod from the AttributeResolutionContext
    
    https://issues.shibboleth.net/jira/browse/IDP-1409
---
 .../context/AttributeResolutionContext.java        | 32 ----------------------
 .../resolver/AttributeResolverContextTest.java     |  8 ++----
 .../idp/profile/impl/ResolveAttributes.java        | 21 ++++----------
 3 files changed, 8 insertions(+), 53 deletions(-)

diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
index c235bbb..073363d 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
@@ -216,38 +216,6 @@ public class AttributeResolutionContext extends BaseContext {
     }
 
     /**
-     * Set how the principal was authenticated.
-     * 
-     * <p>This is deprecated, as the V3 representation of authentication results is more general.</p>
-     * 
-     * @return returns the principalAuthenticationMethod
-     * 
-     * @deprecated
-     */
-    @Deprecated
-    @Nullable public String getPrincipalAuthenticationMethod() {
-        return principalAuthenticationMethod;
-    }
-
-    /**
-     * Get how the principal was authenticated.
-     * 
-     * <p>This is deprecated, as the V3 representation of authentication results is more general.</p>
-     * 
-     * @param method The principalAuthenticationMethod to set
-     * 
-     * @return this context
-     * 
-     * @deprecated
-     */
-    @Deprecated
-    @Nullable public AttributeResolutionContext setPrincipalAuthenticationMethod(@Nullable final String method) {
-        principalAuthenticationMethod = method;
-        
-        return this;
-    }
-
-    /**
      * Set the principal associated with this resolution.
      * 
      * @return Returns the principal.
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverContextTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverContextTest.java
index 7cc6748..0808305 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverContextTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverContextTest.java
@@ -27,7 +27,7 @@ import org.testng.annotations.Test;
 import org.testng.collections.Lists;
 
 /** Unit test for {@link AttributeResolutionContext}. */
- at SuppressWarnings("deprecation")
+
 public class AttributeResolverContextTest {
 
     /** Test instantiation and post-instantiation state. */
@@ -36,7 +36,6 @@ public class AttributeResolverContextTest {
         AttributeResolutionContext context = new AttributeResolutionContext();
         Assert.assertNull(context.getAttributeIssuerID());
         Assert.assertNull(context.getAttributeRecipientID());
-        Assert.assertNull(context.getPrincipalAuthenticationMethod());
         Assert.assertTrue(context.getResolvedIdPAttributes().isEmpty());
         Assert.assertTrue(context.getRequestedIdPAttributeNames().isEmpty());
         
@@ -45,10 +44,7 @@ public class AttributeResolverContextTest {
         
         context.setAttributeRecipientID("ARID");
         Assert.assertEquals(context.getAttributeRecipientID(), "ARID");
-        
-        context.setPrincipalAuthenticationMethod("PAM");
-        Assert.assertEquals(context.getPrincipalAuthenticationMethod(), "PAM");
-        
+               
         final IdPAttribute attr = new IdPAttribute("AttrId");
         context.setResolvedIdPAttributes(Collections.singleton(attr));
         Assert.assertEquals(context.getResolvedIdPAttributes().size(), 1);
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
index 5bfe708..f51e28a 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
@@ -24,11 +24,16 @@ import java.util.function.Function;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import org.opensaml.messaging.context.navigate.ChildContextLookup;
+import org.opensaml.profile.action.ActionSupport;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.shibboleth.idp.attribute.context.AttributeContext;
 import net.shibboleth.idp.attribute.resolver.AttributeResolver;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
-import net.shibboleth.idp.authn.AuthenticationResult;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.authn.context.SubjectContext;
 import net.shibboleth.idp.authn.context.navigate.SubjectContextPrincipalLookupFunction;
@@ -45,12 +50,6 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.service.ReloadableService;
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 
-import org.opensaml.messaging.context.navigate.ChildContextLookup;
-import org.opensaml.profile.action.ActionSupport;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Action that invokes the {@link AttributeResolver} for the current request.
  * 
@@ -343,14 +342,6 @@ public final class ResolveAttributes extends AbstractProfileAction {
             resolutionContext.setPrincipal(null);
         }
         
-        resolutionContext.setPrincipalAuthenticationMethod(null);
-        if (null != authenticationContext) {
-            final AuthenticationResult result = authenticationContext.getAuthenticationResult();
-            if (null != result) {
-                resolutionContext.setPrincipalAuthenticationMethod(result.getAuthenticationFlowId());
-            }
-        }
-
         if (recipientLookupStrategy != null) {
             resolutionContext.setAttributeRecipientID(recipientLookupStrategy.apply(profileRequestContext));
         } else {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.