Hacks login method to make mk2jsf demo work for now.
[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / mkjsf / pazpar2 / ServiceProxyExtensions.java
index 04343c3..de1f42a 100644 (file)
@@ -9,15 +9,23 @@ import javax.inject.Inject;
 import javax.inject.Named;\r
 \r
 import org.apache.log4j.Logger;\r
+import org.apache.myfaces.custom.fileupload.UploadedFile;\r
 \r
 import com.indexdata.mkjsf.config.ConfigurationReader;\r
+import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;\r
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;\r
+import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;\r
 import com.indexdata.mkjsf.pazpar2.commands.sp.InitDocUpload;\r
-import com.indexdata.mkjsf.pazpar2.data.Pazpar2Responses;\r
+import com.indexdata.mkjsf.pazpar2.data.AuthResponse;\r
+import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;\r
+import com.indexdata.mkjsf.pazpar2.data.ResponseParser;\r
+import com.indexdata.mkjsf.pazpar2.data.Responses;\r
+import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;\r
 import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;\r
+import com.indexdata.mkjsf.utils.Utils;\r
 \r
 @Named("pz2x") @SessionScoped\r
-public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializable {\r
+public class ServiceProxyExtensions implements ServiceProxyInterface, Serializable {\r
     \r
   private static final long serialVersionUID = 4221824985678758225L;\r
   private static Logger logger = Logger.getLogger(ServiceProxyExtensions.class);  \r
@@ -29,7 +37,7 @@ public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializa
   @Inject ServiceProxyUser user;    \r
   @Inject Pz2Bean pz2;\r
   @Inject Pazpar2Commands pzreq;\r
-  @Inject Pazpar2Responses pzresp;\r
+  @Inject Responses pzresp;\r
 \r
   \r
   public ServiceProxyExtensions() {\r
@@ -37,35 +45,79 @@ public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializa
     // TODO: \r
     //stateMgr.addStateListener(this);\r
   }\r
-    \r
+   \r
+\r
   public void login(String un, String pw) {\r
-    if (user.isAuthenticated() && user.getName().equals(un) && pz2.spClient.checkAuthentication(user)) {\r
+    if (user.isAuthenticated() && user.getName().equals(un) /* && pz2.spClient.checkAuthentication(user) */) {\r
       logger.info("Repeat request from UI to authenticate user. Auth verified for given user name so skipping log-in.");\r
     } else {\r
       logger.info("doing un/pw login");\r
       user.setName(un);\r
       user.setPassword(pw);\r
-      login("dummy");\r
+      login("");\r
     }\r
   }\r
 \r
-  @Override\r
+\r
+  \r
+  @Override  \r
   public String login(String navigateTo) {\r
     logger.info("doing login by " + user + " using " + pz2 + " and client " + pz2.getSpClient());\r
-    pz2.getSpClient().authenticate(user);\r
-    pz2.resetSearchAndResults();\r
+    pz2.resetSearchAndRecordCommands();\r
+    pzresp.resetAllSessionData();\r
+    AuthCommand auth = pzreq.getSp().getAuth(); \r
+    auth.setParametersInState(new CommandParameter("action","=","login"),\r
+                              new CommandParameter("username","=",user.getName()),\r
+                              new CommandParameter("password","=",user.getPassword()));\r
+    ClientCommandResponse commandResponse = pz2.getSpClient().send(auth);\r
+    String renamedResponse = renameResponseElement(commandResponse.getResponseString(), "auth");\r
+    commandResponse.setResponseToParse(renamedResponse);\r
+    AuthResponse responseObject = (AuthResponse) ResponseParser.getParser().getDataObject(commandResponse);\r
+    if (ResponseParser.docTypes.contains(responseObject.getType())) {\r
+      pzresp.put(auth.getCommandName(), responseObject);\r
+    }\r
+    String responseStr = commandResponse.getResponseString();\r
+    logger.info(responseStr);      \r
+    if (responseStr.contains("FAIL")) {\r
+      user.credentialsAuthenticationSucceeded(false);    \r
+    } else {\r
+      user.credentialsAuthenticationSucceeded(true);    \r
+    }      \r
     return navigateTo;\r
   }\r
   \r
+  \r
   public void ipAuthenticate (ServiceProxyUser user) {\r
     if (!user.isIpAuthenticated()) {\r
       if (user.isAuthenticated()) {\r
         user.clear();\r
       }\r
-      pz2.resetSearchAndResults();\r
-      pz2.getSpClient().ipAuthenticate(user);\r
+      pz2.resetSearchAndRecordCommands();\r
+      pzresp.resetAllSessionData();\r
+      AuthCommand auth = pzreq.getSp().getAuth(); \r
+      auth.setParameterInState(new CommandParameter("action","=","ipAuth"));\r
+      ClientCommandResponse commandResponse = pz2.getSpClient().send(auth);      \r
+      String renamedResponse = renameResponseElement(commandResponse.getResponseString(), "auth");\r
+      commandResponse.setResponseToParse(renamedResponse);\r
+      ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(commandResponse);\r
+      if (ResponseParser.docTypes.contains(responseObject.getType())) {\r
+        pzresp.put(auth.getCommandName(), responseObject);\r
+      }\r
+      String responseStr = commandResponse.getResponseString();\r
+      logger.info(responseStr);      \r
+      if (responseStr.contains("FAIL")) {\r
+        user.credentialsAuthenticationSucceeded(false);    \r
+      } else {\r
+        user.credentialsAuthenticationSucceeded(true);    \r
+      }      \r
     }\r
   }\r
+  \r
+  private String renameResponseElement(String responseString, String newName) {\r
+    responseString = responseString.replace("<response>", "<" + newName + ">");\r
+    responseString = responseString.replace("</response>", "</" + newName + ">");\r
+    return responseString;\r
+  }\r
     \r
   public String getInitDocPath () {\r
     return pz2.getSpClient().getConfiguration().get("INIT_DOC_PATH");\r
@@ -87,15 +139,17 @@ public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializa
     String initDocPath = pz2.getSpClient().getInitDocPaths().get(0);\r
     logger.info("Paths: " + pz2.getSpClient().getInitDocPaths());\r
     logger.info("Path: " + initDocPath);\r
-    pz2.resetSearchAndResults();\r
+    pz2.resetSearchAndRecordCommands();\r
+    pzresp.resetAllSessionData();\r
     ClientCommandResponse response = pz2.getSpClient().postInitDoc(initDocPath + getInitFileName());    \r
     return response;\r
   }\r
   \r
   @Override\r
-  public ClientCommandResponse postInit(byte[] initDoc, boolean includeDebug) throws UnsupportedEncodingException, IOException {    \r
-    pz2.resetSearchAndResults();\r
-    ClientCommandResponse response = pz2.getSpClient().postInitDoc(initDoc,includeDebug);    \r
+  public HttpResponseWrapper postInit(byte[] initDoc, boolean includeDebug) throws UnsupportedEncodingException, IOException {    \r
+    pz2.resetSearchAndRecordCommands();\r
+    pzresp.resetAllSessionData();\r
+    HttpResponseWrapper response = pz2.getSpClient().postInitDoc(initDoc,includeDebug);    \r
     return response;\r
   }\r
 \r
@@ -104,8 +158,50 @@ public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializa
     return initDocResponse;\r
   }\r
   \r
+  public void setUploadedInitDoc (UploadedFile uploadedFile) {\r
+    initDocUpload.setUploadedFile(uploadedFile);\r
+  }\r
+  \r
+  public UploadedFile getUploadedInitDoc () {\r
+    return initDocUpload.getUploadedFile();\r
+  }\r
+  \r
+  public void submitInitDoc () throws IOException {\r
+    ClientCommandResponse response =  (ClientCommandResponse) initDocUpload.submit();\r
+    ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);\r
+    logger.info("Putting init response to : " + Utils.objectId(pzresp));\r
+    pzresp.put("init", responseObject);\r
+  }\r
+  \r
+  public void setIncludeInitDocDebug(boolean bool) {\r
+    logger.info(Utils.objectId(this) + " setting debug to " + bool);\r
+    initDocUpload.setIncludeDebug(bool);\r
+  }\r
+\r
+  public boolean getIncludeInitDocDebug() {\r
+    return initDocUpload.getIncludeDebug();\r
+  }\r
+  \r
+  // TODO: Remove when possible\r
   public InitDocUpload getInitDocUpload () {\r
     return initDocUpload;\r
   }\r
   \r
+  public CategoriesResponse getCategories () {\r
+    ResponseDataObject response = pz2.doCommand("categories");\r
+    if (response.hasApplicationError()) {\r
+      logger.debug(response.getXml());\r
+      return new CategoriesResponse();\r
+    } else {\r
+      try {\r
+        return (CategoriesResponse) response;\r
+      } catch (Exception e) {\r
+        e.printStackTrace();\r
+        logger.debug(response.getXml());\r
+        return new CategoriesResponse();\r
+      }\r
+    }\r
+  }\r
+  \r
+  \r
 }\r