X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FServiceProxyExtensions.java;h=f09176d4e4221d9c3548fc3037dbc8a24067b567;hb=d400a082759c1a58cb79713f04ab2f3d62bca97c;hp=87a732203c7da96596a61d2bea3344cbd13b38be;hpb=641505fae22dcf83a1794707dcc39e821dbdd0ea;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
index 87a7322..f09176d 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
@@ -12,12 +12,15 @@ import org.apache.log4j.Logger;
 import org.apache.myfaces.custom.fileupload.UploadedFile;
 
 import com.indexdata.mkjsf.config.ConfigurationReader;
+import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;
+import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;
 import com.indexdata.mkjsf.pazpar2.commands.sp.InitDocUpload;
-import com.indexdata.mkjsf.pazpar2.data.InitResponse;
+import com.indexdata.mkjsf.pazpar2.data.AuthResponse;
 import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;
 import com.indexdata.mkjsf.pazpar2.data.ResponseParser;
 import com.indexdata.mkjsf.pazpar2.data.Responses;
+import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;
 import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;
 import com.indexdata.mkjsf.utils.Utils;
 
@@ -42,7 +45,8 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
     // TODO: 
     //stateMgr.addStateListener(this);
   }
-    
+   
+  /*
   public void login(String un, String pw) {
     if (user.isAuthenticated() && user.getName().equals(un) && pz2.spClient.checkAuthentication(user)) {
       logger.info("Repeat request from UI to authenticate user. Auth verified for given user name so skipping log-in.");
@@ -53,16 +57,36 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
       login("dummy");
     }
   }
+  */
 
-  @Override
+  
+  @Override  
   public String login(String navigateTo) {
     logger.info("doing login by " + user + " using " + pz2 + " and client " + pz2.getSpClient());
     pz2.resetSearchAndRecordCommands();
     pzresp.resetAllSessionData();
-    pz2.getSpClient().authenticate(user);    
+    AuthCommand auth = pzreq.getSp().getAuth(); 
+    auth.setParametersInState(new CommandParameter("action","=","login"),
+                              new CommandParameter("username","=",user.getName()),
+                              new CommandParameter("password","=",user.getPassword()));
+    ClientCommandResponse commandResponse = pz2.getSpClient().send(auth);
+    String renamedResponse = renameResponseElement(commandResponse.getResponseString(), "auth");
+    commandResponse.setResponseToParse(renamedResponse);
+    AuthResponse responseObject = (AuthResponse) ResponseParser.getParser().getDataObject(commandResponse);
+    if (ResponseParser.docTypes.contains(responseObject.getType())) {
+      pzresp.put(auth.getCommandName(), responseObject);
+    }
+    String responseStr = commandResponse.getResponseString();
+    logger.info(responseStr);      
+    if (responseStr.contains("FAIL")) {
+      user.credentialsAuthenticationSucceeded(false);    
+    } else {
+      user.credentialsAuthenticationSucceeded(true);    
+    }      
     return navigateTo;
   }
   
+  
   public void ipAuthenticate (ServiceProxyUser user) {
     if (!user.isIpAuthenticated()) {
       if (user.isAuthenticated()) {
@@ -70,9 +94,30 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
       }
       pz2.resetSearchAndRecordCommands();
       pzresp.resetAllSessionData();
-      pz2.getSpClient().ipAuthenticate(user);
+      AuthCommand auth = pzreq.getSp().getAuth(); 
+      auth.setParameterInState(new CommandParameter("action","=","ipAuth"));
+      ClientCommandResponse commandResponse = pz2.getSpClient().send(auth);      
+      String renamedResponse = renameResponseElement(commandResponse.getResponseString(), "auth");
+      commandResponse.setResponseToParse(renamedResponse);
+      ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(commandResponse);
+      if (ResponseParser.docTypes.contains(responseObject.getType())) {
+        pzresp.put(auth.getCommandName(), responseObject);
+      }
+      String responseStr = commandResponse.getResponseString();
+      logger.info(responseStr);      
+      if (responseStr.contains("FAIL")) {
+        user.credentialsAuthenticationSucceeded(false);    
+      } else {
+        user.credentialsAuthenticationSucceeded(true);    
+      }      
     }
   }
+  
+  private String renameResponseElement(String responseString, String newName) {
+    responseString = responseString.replace("<response>", "<" + newName + ">");
+    responseString = responseString.replace("</response>", "</" + newName + ">");
+    return responseString;
+  }
     
   public String getInitDocPath () {
     return pz2.getSpClient().getConfiguration().get("INIT_DOC_PATH");
@@ -101,10 +146,10 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   }
   
   @Override
-  public ClientCommandResponse postInit(byte[] initDoc, boolean includeDebug) throws UnsupportedEncodingException, IOException {    
+  public HttpResponseWrapper postInit(byte[] initDoc, boolean includeDebug) throws UnsupportedEncodingException, IOException {    
     pz2.resetSearchAndRecordCommands();
     pzresp.resetAllSessionData();
-    ClientCommandResponse response = pz2.getSpClient().postInitDoc(initDoc,includeDebug);    
+    HttpResponseWrapper response = pz2.getSpClient().postInitDoc(initDoc,includeDebug);    
     return response;
   }
 
@@ -122,8 +167,8 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   }
   
   public void submitInitDoc () throws IOException {
-    HttpResponseWrapper response =  initDocUpload.submit();
-    ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response.getResponseString());
+    ClientCommandResponse response =  (ClientCommandResponse) initDocUpload.submit();
+    ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);
     logger.info("Putting init response to : " + Utils.objectId(pzresp));
     pzresp.put("init", responseObject);
   }
@@ -141,8 +186,22 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   public InitDocUpload getInitDocUpload () {
     return initDocUpload;
   }
-
   
+  public CategoriesResponse getCategories () {
+    ResponseDataObject response = pz2.doCommand("categories");
+    if (response.hasApplicationError()) {
+      logger.debug(response.getXml());
+      return new CategoriesResponse();
+    } else {
+      try {
+        return (CategoriesResponse) response;
+      } catch (Exception e) {
+        e.printStackTrace();
+        logger.debug(response.getXml());
+        return new CategoriesResponse();
+      }
+    }
+  }
   
   
 }