[Peepagg-cvs] LAMP/src/java/com/peopleaggregator/sso/lamp Lamp.java,1.4,1.5 LampIDP.java,1.7,1.8

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

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

Modified Files:
	Lamp.java LampIDP.java 
Log Message:
Pulled up the getParamOrAttribute.
Added the ability to save the attibute in the session.

Index: Lamp.java
===================================================================
RCS file: /cvsroot/peepagg//LAMP/src/java/com/peopleaggregator/sso/lamp/Lamp.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Lamp.java	11 Dec 2003 07:43:21 -0000	1.4
--- Lamp.java	15 Dec 2003 01:47:10 -0000	1.5
***************
*** 17,20 ****
--- 17,22 ----
  import javax.naming.NamingException;
  import javax.servlet.http.HttpServlet;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpSession;
  import javax.sql.DataSource;
  
***************
*** 150,153 ****
--- 152,185 ----
  			}
  		}
+ 	}
+ 
+ 	public static final String ERRORURL = "errorURL";
+ 	public static final String SUCCESSURL = "successURL";
+ 
+ 	/**
+ 	 * @param request
+ 	 * @param session
+ 	 * @param sessionid
+ 	 * @return
+ 	 */
+ 	protected String getParameterOrAttribute(HttpServletRequest request, HttpSession session, String parameter, boolean save) {
+ 		return getParameterOrAttribute(
+ 			request,
+ 			session,
+ 			parameter,
+ 			parameter,
+ 			save);
+ 	}
+ 
+ 	protected String getParameterOrAttribute(HttpServletRequest request, HttpSession session, String parameter, String attribute, boolean save) {
+ 		String value = request.getParameter(parameter);
+ 		if (value != null) {
+ 			if (save) {
+ 				session.setAttribute(attribute, value);
+ 			}
+ 		} else {
+ 			value = (String) session.getAttribute(attribute);
+ 		}
+ 		return value;
  	}
  

Index: LampIDP.java
===================================================================
RCS file: /cvsroot/peepagg//LAMP/src/java/com/peopleaggregator/sso/lamp/LampIDP.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LampIDP.java	14 Dec 2003 03:46:21 -0000	1.7
--- LampIDP.java	15 Dec 2003 01:47:10 -0000	1.8
***************
*** 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 {
--- 44,62 ----
  		HttpSession session = request.getSession();
  		String userID;
! 		userID =
! 			getParameterOrAttribute(
! 				request,
! 				session,
! 				USERID,
! 				LAMP_USERID,
! 				true);
! 		String sessionID =
! 			getParameterOrAttribute(request, session, SESSIONID, true);
! 		String providerID =
! 			getParameterOrAttribute(request, session, PROVIDERID, true);
! 		String successURL =
! 			getParameterOrAttribute(request, session, SUCCESSURL, true);
! 		String errorURL =
! 			getParameterOrAttribute(request, session, ERRORURL, true);
  
  		try {
***************
*** 62,67 ****
  					response.sendRedirect(successURL); // TODO: fix
  				} else {
! 					response.sendRedirect(
! 						"http://localhost:8080/fake/fail.jsp");
  					// TODO: ise param
  				}
--- 72,76 ----
  					response.sendRedirect(successURL); // TODO: fix
  				} else {
! 					response.sendRedirect(errorURL);
  					// TODO: ise param
  				}
***************
*** 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,
--- 85,88 ----