[Ils-source] r1471 - in trunk/webapp/api: ccure/user/put session/login

[scribe at crosswire.org]

Author: scribe
Date: 2016-06-27 07:19:41 -0700 (Mon, 27 Jun 2016)
New Revision: 1471

Modified:
   trunk/webapp/api/ccure/user/put/index.jsp
   trunk/webapp/api/session/login/index.jsp
Log:
Use standard service header in session/login
update ccure/user/put to use more general standard service header


Modified: trunk/webapp/api/ccure/user/put/index.jsp
===================================================================
--- trunk/webapp/api/ccure/user/put/index.jsp	2016-06-27 13:39:20 UTC (rev 1470)
+++ trunk/webapp/api/ccure/user/put/index.jsp	2016-06-27 14:19:41 UTC (rev 1471)
@@ -12,11 +12,17 @@
 <%@ page import="org.crosswire.xml.XMLBlock" %>
 
 <%
+
+	// standard service header ---------------------------------------
+
+	String serviceName = "CCURE user/put";
+
 	Logger logger         = Logger.getLogger(this.getClass());
 	Logger eventsLogger   = Logger.getLogger("EVENTS");
+
+	response.setContentType("text/xml");
+
 	String errMsg = "";
-	// standard service header ---------------------------------------
-	response.setContentType("text/xml");
 	int errCode = 0;
 	Company company = Company.getCompany(request);
     
@@ -25,7 +31,7 @@
 	if (!apiEnabled) {
 		errMsg = "API not enabled in system management settings.";
 		out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
-		eventsLogger.error("CCURE user/put:" + errMsg);
+		eventsLogger.error(serviceName +": " + errMsg);
 		return;
 	}
 
@@ -38,7 +44,7 @@
 	if (ilsSession == null) {
 		errMsg = "iLS sign in information is not valid.";
 		out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
-		eventsLogger.error("CCURE user/put:" + errMsg);
+		eventsLogger.error(serviceName +": " + errMsg);
 		return;
 	}
 	// end standard service header -----------------------------------

Modified: trunk/webapp/api/session/login/index.jsp
===================================================================
--- trunk/webapp/api/session/login/index.jsp	2016-06-27 13:39:20 UTC (rev 1470)
+++ trunk/webapp/api/session/login/index.jsp	2016-06-27 14:19:41 UTC (rev 1471)
@@ -1,33 +1,41 @@
 <%@ page language="java" contentType="text/xml;charset=utf-8" %><%@ page import="com.resolutions.ils.Utils" %><%@ page import="com.resolutions.ils.ILSSession" %><%@ page import="com.resolutions.ils.data.Company" %><%@ page import="java.io.File" %><%@ page import="java.io.FileOutputStream" %><%@ page import="java.util.Properties" %><%@ page import="org.apache.log4j.Logger" %><%@ page import="java.util.UUID" %><%
+
+	// standard service header ---------------------------------------
+	
+	String serviceName = "session/login";
+
+	Logger logger = Logger.getLogger(this.getClass());
+	Logger eventsLogger = Logger.getLogger("EVENTS");
+
+	response.setContentType("text/xml");
+
+	String errMsg = "";
 	int errCode = 0;
-    boolean apiEnabled = "on".equals(Utils.getSysConfig(session).getProperty("APIEnable", "off"));
-    ++errCode;
+	Company company = Company.getCompany(request);
+    
+	boolean apiEnabled = "on".equals(Utils.getSysConfig(session.getServletContext(), company.getCompanyID()).getProperty("APIEnable", "off"));
+	++errCode;
 	if (!apiEnabled) {
-		out.print("<error code=\""+errCode+"\" message=\"API not enabled in system management settings.\"/>");
+		errMsg = "API not enabled in system management settings.";
+		out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
+		eventsLogger.error(serviceName +": " + errMsg);
 		return;
 	}
-	//-- Company logic from login.jsp -------
-	// TODO: consolidate this somewhere
-    String requestURL = request.getRequestURL().toString() + "?" + request.getQueryString();
-    String co = com.resolutions.ils.Utils.getCompanyFromConfig(session, requestURL);
-    if (co == null) co = com.resolutions.ils.Utils.getSysConfig(session).getProperty("Company", null);
-    if (co == null) co = request.getParameter("co");
-    if (co != null) session.setAttribute("co", co);
-    co = (String) session.getAttribute("co");
-    Company company = Company.getCompany((co != null) ? Integer.parseInt(co):1);
-    //-----------------------
-    ILSSession ilsSession = null;
-    String userID = request.getParameter("ILSUSER");
-    String userPW = request.getParameter("ILSPASSWD");
-    ilsSession = ILSSession.login(company.getCompanyName(), userID, userPW);
-    ++errCode;
-    if (ilsSession == null) {
-    	out.print("<error code=\""+errCode+"\" message=\"Your iLS sign in information is not valid.\"/>");
-        return;
-    }
-    
-	Logger logger = Logger.getLogger(this.getClass());
-	Logger eventsLogger = Logger.getLogger("EVENTS");
+
+	String userID = request.getParameter("ILSUSER");
+	String userPW = request.getParameter("ILSPASSWD");
+	ILSSession ilsSession = (userID != null && userPW != null)
+			? ILSSession.login(company.getCompanyName(), userID, userPW)
+			: (ILSSession)session.getAttribute("ilsSession");
+	++errCode;
+	if (ilsSession == null) {
+		errMsg = "iLS sign in information is not valid.";
+		out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
+		eventsLogger.error(serviceName +": " + errMsg);
+		return;
+	}
+	// end standard service header -----------------------------------
+	
 	Properties u = new Properties();
 	u.setProperty("l", userID);
 	u.setProperty("p", userPW);