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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep 15 20:52:16 2014
New Revision: 6531

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6531&view=rev
Log:
Move profile action into impl package.

Added:
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java
      - copied, changed from r6527, trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/SetRPUIInformation.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/package-info.java   (with props)
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
    trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/SetRPUIInformation.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/package-info.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=6531&r1=6530&r2=6531&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 Mon Sep 15 20:52:16 2014
@@ -22,6 +22,8 @@
 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;
 
@@ -118,6 +120,26 @@
     }
 
     /**
+     * Get the {@link ProfileRequestContext} associated with a request.
+     * 
+     * @param key   the value returned by {@link #startExternalAuthentication(HttpServletRequest)}
+     * @param request servlet request
+     * 
+     * @return the profile request context
+     * @throws ExternalAuthenticationException if an error occurs
+     */
+    @Nonnull public static ProfileRequestContext getProfileRequestContext(@Nonnull @NotEmpty final String key,
+            @Nonnull final HttpServletRequest request) throws ExternalAuthenticationException {
+        
+        final Object obj = request.getSession().getAttribute(CONVERSATION_KEY + key);
+        if (obj == null || !(obj instanceof ExternalAuthentication)) {
+            throw new ExternalAuthenticationException("No conversation state found in session");
+        }
+        
+        return ((ExternalAuthentication) obj).getProfileRequestContext(request);
+    }
+    
+    /**
      * Initialize a request for external authentication by seeking out the information stored in
      * the servlet session and exposing it as request attributes.
      * 
@@ -144,5 +166,18 @@
             throws ExternalAuthenticationException, IOException {
         throw new ExternalAuthenticationException("Not implemented");
     }
-        
+    
+    /**
+     * Get the {@link ProfileRequestContext} associated with a request.
+     * 
+     * @param request servlet request
+     * 
+     * @return the profile request context
+     * @throws ExternalAuthenticationException if an error occurs
+     */
+    @Nonnull protected ProfileRequestContext getProfileRequestContext(@Nonnull final HttpServletRequest request)
+            throws ExternalAuthenticationException {
+        throw new ExternalAuthenticationException("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=6531&r1=6530&r2=6531&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 Mon Sep 15 20:52:16 2014
@@ -160,5 +160,13 @@
         response.sendRedirect(extContext.getFlowExecutionUrl());
     }
 // Checkstyle: CyclomaticComplexity OFF
+
+    /** {@inheritDoc} */
+    @Override
+    protected ProfileRequestContext getProfileRequestContext(@Nonnull final HttpServletRequest request)
+            throws ExternalAuthenticationException {
+        return profileRequestContext;
+    }
+    
     
 }


[... 115 lines stripped ...]