[Ils-source] r1578 - in trunk: src/com/resolutions/ils webapp/WEB-INF/lib

[scribe at crosswire.org]

Author: scribe
Date: 2018-06-07 13:47:08 -0700 (Thu, 07 Jun 2018)
New Revision: 1578

Modified:
   trunk/src/com/resolutions/ils/ILSParameters.java
   trunk/webapp/WEB-INF/lib/crosswire.jar
   trunk/webapp/WEB-INF/lib/ils.jar
Log:
made backward compatible with old API usage


Modified: trunk/src/com/resolutions/ils/ILSParameters.java
===================================================================
--- trunk/src/com/resolutions/ils/ILSParameters.java	2018-06-03 13:01:55 UTC (rev 1577)
+++ trunk/src/com/resolutions/ils/ILSParameters.java	2018-06-07 20:47:08 UTC (rev 1578)
@@ -1,11 +1,46 @@
 package com.resolutions.ils;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.crosswire.webtools.Parameters;
+import org.crosswire.webtools.RightsAndRoles;
+import org.crosswire.webtools.annotation.Description;
 
+import com.resolutions.ils.data.Company;
+
 public class ILSParameters<E extends ILSParameters<?>> extends Parameters<E> {
+
+	@Description(value = "internal")
+	public String ILSUSER = null;
+	@Description(value = "internal")
+	public String ILSPASSWD = null;
+
 	public ILSSession getILSSession() { return (ILSSession)getUser(); }
+
+	@Override
 	public void addError(int code, String message) {
 		super.addError(code, message);
 	}
+
+	@Override
+	public E loadFromRequest(HttpServletRequest request, HttpServletResponse response, boolean validate) {
+		// SPECIAL HACK FOR ILS BACKWARD COMPATABILTY
+		String userID = request.getParameter("ILSUSER");
+		String userPw = request.getParameter("ILSPASSWD");
+		if (userID != null && userPw != null) {
+			Company company = Company.getCompany(request);
+			ILSSession ilsSession = ILSSession.login(company.getCompanyName(), userID, userPw);
+			ilsSession.setDefaultFormat("xml");
+			if (ilsSession != null) {
+				String sessionHash = RightsAndRoles.getInstance().openSession(ilsSession, response);
+				request.setAttribute("X-Auth-Token", sessionHash);
+			}
+		}
+		// END OF SPECIAL HACK
+		return super.loadFromRequest(request, response, validate);
+	}
+
+
 }
 

Modified: trunk/webapp/WEB-INF/lib/crosswire.jar
===================================================================
(Binary files differ)

Modified: trunk/webapp/WEB-INF/lib/ils.jar
===================================================================
(Binary files differ)