[Peepagg-cvs] LAMP/src/java/com/peopleaggregator/sso/lamp LampIDP.java,1.6,1.7

[<ch...@us...>]

Update of /cvsroot/peepagg//LAMP/src/java/com/peopleaggregator/sso/lamp
In directory sc8-pr-cvs1:/tmp/cvs-serv31090/src/java/com/peopleaggregator/sso/lamp

Modified Files:
	LampIDP.java 
Log Message:
added getParameterOrAttribute

Index: LampIDP.java
===================================================================
RCS file: /cvsroot/peepagg//LAMP/src/java/com/peopleaggregator/sso/lamp/LampIDP.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LampIDP.java	11 Dec 2003 07:53:00 -0000	1.6
--- LampIDP.java	14 Dec 2003 03:46:21 -0000	1.7
***************
*** 18,22 ****
  import org.sourceid.sso.util.ServletUtils;
  
- 
  /**
   * @author <a href="http://nick.chalko.com/">Nick Chalko</a>
--- 18,21 ----
***************
*** 24,27 ****
--- 23,27 ----
  public class LampIDP extends Lamp {
  
+ 	public static final String PROVIDERID = "ProviderID";
  	/**
  	 *  
***************
*** 44,54 ****
  		HttpSession session = request.getSession();
  		String userID;
! 		if (request.getParameter(USERID) != null) {
! 			userID = request.getParameter(USERID);
! 		} else {
! 			userID = (String) session.getAttribute(LAMP_USERID);
! 		}
! 		String sessionID = request.getParameter(SESSIONID);
! 		String providerID = request.getParameter("ProviderID");
  
  		try {
--- 44,52 ----
  		HttpSession session = request.getSession();
  		String userID;
! 		userID = getParameterOrAttribute(request, session, USERID, LAMP_USERID);
! 		String sessionID = getParameterOrAttribute(request, session, SESSIONID);
! 		String providerID = getParameterOrAttribute(request, session,PROVIDERID);
! 		String successURL = getParameterOrAttribute(request, session,SUCCESSURL);
! 		String errorURL = getParameterOrAttribute(request, session,ERRORURL);
  
  		try {
***************
*** 62,78 ****
  					}
  					initIdpSession(session, userID);
! 
! 					response.sendRedirect(
! 						"http://localhost:8080/fake/success.jsp");  // TODO: fix
! 
  				} else {
  					response.sendRedirect(
! 						"http://localhost:8080/fake/fail.jsp");   // TODO: ise param
  				}
  			} else {
! 				response.sendError(
! 					400,
! 					"Must set either userid/sessionID");
! 
  			}
  		} catch (Exception e) {
--- 60,71 ----
  					}
  					initIdpSession(session, userID);
! 					response.sendRedirect(successURL); // TODO: fix
  				} else {
  					response.sendRedirect(
! 						"http://localhost:8080/fake/fail.jsp");
! 					// TODO: ise param
  				}
  			} else {
! 				response.sendError(400, "Must set either userid/sessionID");
  			}
  		} catch (Exception e) {
***************
*** 83,86 ****
--- 76,106 ----
  		}
  	}
+ 	/**
+ 	 * @param request
+ 	 * @param session
+ 	 * @param sessionid
+ 	 * @return
+ 	 */
+ 	private String getParameterOrAttribute(
+ 		HttpServletRequest request,
+ 		HttpSession session,
+ 		String parameter) {
+ 		return getParameterOrAttribute(request, session, parameter, parameter);
+ 	}
+ 
+ 	private String getParameterOrAttribute(
+ 		HttpServletRequest request,
+ 		HttpSession session,
+ 		String parameter,
+ 		String attribute) {
+ 		String value;
+ 		if (request.getParameter(parameter) != null) {
+ 			value = request.getParameter(parameter);
+ 		} else {
+ 			value = (String) session.getAttribute(attribute);
+ 		}
+ 		return value;
+ 	}
+ 
  	private boolean idpi(
  		HttpServletRequest request,