[Ils-source] r1470 - trunk/webapp/api/session/login

[scribe at crosswire.org]

Author: scribe
Date: 2016-06-27 06:39:20 -0700 (Mon, 27 Jun 2016)
New Revision: 1470

Modified:
   trunk/webapp/api/session/login/index.jsp
Log:
applied patch from Adam to standardize session/login 


Modified: trunk/webapp/api/session/login/index.jsp
===================================================================
--- trunk/webapp/api/session/login/index.jsp	2016-06-06 18:30:09 UTC (rev 1469)
+++ trunk/webapp/api/session/login/index.jsp	2016-06-27 13:39:20 UTC (rev 1470)
@@ -1,7 +1,9 @@
-<%@ page language="java" contentType="text/plain;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" %><%
+<%@ 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" %><%
+	int errCode = 0;
     boolean apiEnabled = "on".equals(Utils.getSysConfig(session).getProperty("APIEnable", "off"));
+    ++errCode;
 	if (!apiEnabled) {
-		out.print("API not enabled in system management settings.");
+		out.print("<error code=\""+errCode+"\" message=\"API not enabled in system management settings.\"/>");
 		return;
 	}
 	//-- Company logic from login.jsp -------
@@ -18,8 +20,9 @@
     String userID = request.getParameter("ILSUSER");
     String userPW = request.getParameter("ILSPASSWD");
     ilsSession = ILSSession.login(company.getCompanyName(), userID, userPW);
+    ++errCode;
     if (ilsSession == null) {
-    	out.print("Your iLS sign in information is not valid. Please try again.");
+    	out.print("<error code=\""+errCode+"\" message=\"Your iLS sign in information is not valid.\"/>");
         return;
     }
     
@@ -37,4 +40,4 @@
 	FileOutputStream uuidFile = new FileOutputStream(uuidFileName);
 	u.store(uuidFile, null);
 	uuidFile.close();
-%><%=uuid%>
+%><success uuid="<%=uuid%>"/>