username/pass auth handler - initial rev.

[java-idp.git] / src / edu / internet2 / middleware / shibboleth / idp / profile / ShibbolethProfileRequest.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/ShibbolethProfileRequest.java b/src/edu/internet2/middleware/shibboleth/idp/profile/ShibbolethProfileRequest.java
index 5ece170..789c1aa 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/ShibbolethProfileRequest.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/ShibbolethProfileRequest.java
@@ -18,79 +18,27 @@ package edu.internet2.middleware.shibboleth.idp.profile;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.opensaml.common.binding.BindingException;
-import org.opensaml.common.binding.MessageDecoder;
-import org.opensaml.xml.XMLObject;
-
 import edu.internet2.middleware.shibboleth.common.profile.ProfileRequest;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyManager;
-import edu.internet2.middleware.shibboleth.common.session.SessionManager;
-import edu.internet2.middleware.shibboleth.idp.session.Session;
 
 /**
  * Shibboleth {@link ProfileRequest}.
  */
-public class ShibbolethProfileRequest implements ProfileRequest<HttpServletRequest, Session> {
-
-    /** Decoder used to decode the incomming request. */
-    private MessageDecoder<HttpServletRequest> messageDecoder;
+public class ShibbolethProfileRequest implements ProfileRequest<HttpServletRequest> {
 
     /** The in comming request. */
     private HttpServletRequest rawRequest;
 
-    /** Configuration information for the requesting party. */
-    private RelyingPartyConfiguration rpConfiguration;
-
-    /** The decoded request message. */
-    private XMLObject decodedMessage;
-
-    /** The current user session. */
-    private Session userSession;
-
     /**
      * Constructor.
      * 
      * @param request the incomming HTTP request
-     * @param decoder the decoder for the request, all information but the request must be set already
-     * @param sessionManager the manager of current user sessions
-     * @param rpConfigManager the relying party configuration manager
      */
-    public ShibbolethProfileRequest(HttpServletRequest request, MessageDecoder<HttpServletRequest> decoder,
-            SessionManager<Session> sessionManager, RelyingPartyManager rpConfigManager){
-
+    public ShibbolethProfileRequest(HttpServletRequest request){
         rawRequest = request;
-        userSession = sessionManager.getSession(request.getSession().getId());
-        messageDecoder = decoder;
-    }
-
-    /** {@inheritDoc} */
-    public MessageDecoder<HttpServletRequest> getMessageDecoder() {
-        return messageDecoder;
     }
 
     /** {@inheritDoc} */
     public HttpServletRequest getRawRequest() {
         return rawRequest;
     }
-
-    /** {@inheritDoc} */
-    public RelyingPartyConfiguration getRelyingPartyConfiguration() {
-        return rpConfiguration;
-    }
-
-    /** {@inheritDoc} */
-    public synchronized XMLObject getRequest() throws BindingException{
-        if(decodedMessage == null){
-            messageDecoder.setRequest(rawRequest);
-            messageDecoder.decode();
-            decodedMessage = messageDecoder.getSAMLMessage();
-        }
-        return decodedMessage;
-    }
-
-    /** {@inheritDoc} */
-    public Session getSession() {
-        return userSession;
-    }
 }
\ No newline at end of file