[java-identity-provider COMMIT] in /trunk: idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthenticatio...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Jun 22 16:05:44 2014
New Revision: 6150

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6150&view=rev
Log:
PRC should be exposed using request attribute, not method.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java?rev=6150&r1=6149&r2=6150&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java Sun Jun 22 16:05:44 2014
@@ -22,8 +22,6 @@
 import javax.annotation.Nonnull;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.opensaml.profile.context.ProfileRequestContext;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
@@ -146,14 +144,5 @@
             throws ExternalAuthenticationException, IOException {
         throw new ExternalAuthenticationException("Not implemented");
     }
-    
-    /**
-     * Get the profile request context for the request.
-     * 
-     * @return  current profile request context
-     */
-    @Nonnull public ProfileRequestContext getProfileRequestContext() {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-    
+        
 }

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java?rev=6150&r1=6149&r2=6150&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java Sun Jun 22 16:05:44 2014
@@ -76,12 +76,6 @@
                 Constraint.isNotNull(strategy, "RelyingPartyContext lookup strategy cannot be null");
     }
     
-    /** {@inheritDoc} */
-    @Override
-    @Nonnull public ProfileRequestContext getProfileRequestContext() {
-        return profileRequestContext;
-    }
-    
     /**
      * Initialize a request for external authentication by seeking out the information stored in
      * the servlet session and exposing it as request attributes.
@@ -98,6 +92,8 @@
         } else if (authnContext.getAttemptedFlow() == null) {
             throw new ExternalAuthenticationException("No attempted authentication flow set");
         }
+        
+        request.setAttribute(ProfileRequestContext.BINDING_KEY, profileRequestContext);
         
         request.setAttribute(PASSIVE_AUTHN_PARAM, authnContext.isPassive());
         request.setAttribute(FORCE_AUTHN_PARAM, authnContext.isForceAuthn());