X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FServiceProxyExtensions.java;h=6aeb6ffd174c8ab5825c266dc337f713c8804374;hb=dfcad4c5faeefc5915130c99f1508dee59820f2e;hp=8629b38e623d0e11bec12ddc6c21583df81cac31;hpb=d739ecb22a85d8f982add6d429e069edf7e0dde2;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 8629b38..6aeb6ff 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
@@ -16,12 +16,11 @@ 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.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.pazpar2.data.sp.SpResponseDataObject;
 import com.indexdata.mkjsf.utils.Utils;
 
 @Named("pz2x") @SessionScoped
@@ -34,7 +33,6 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   private InitDocUpload initDocUpload; 
     
   @Inject ConfigurationReader configurator;  
-  @Inject ServiceProxyUser user;    
   @Inject Pz2Bean pz2;
   @Inject Pazpar2Commands pzreq;
   @Inject Responses pzresp;
@@ -46,71 +44,43 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
     //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.");
-    } else {
-      logger.info("doing un/pw login");
-      user.setName(un);
-      user.setPassword(pw);
-      login("");
-    }
-  }
-
-
-  
-  @Override  
-  public String login(String navigateTo) {
-    logger.info("doing login by " + user + " using " + pz2 + " and client " + pz2.getSpClient());
+  public void authenticate() {
     pz2.resetSearchAndRecordCommands();
-    pzresp.resetAllSessionData();
-    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);
+    pzresp.getSp().resetAuthAndBeyond(true);
+    AuthCommand auth = pzreq.getSp().getAuth();     
+    ClientCommandResponse commandResponse = pz2.getSpClient().send(auth);      
     String renamedResponse = renameResponseElement(commandResponse.getResponseString(), "auth");
     commandResponse.setResponseToParse(renamedResponse);
-    AuthResponse responseObject = (AuthResponse) ResponseParser.getParser().getDataObject(commandResponse);
+    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);    
-    }      
-    return navigateTo;
+    logger.info(responseStr);          
   }
   
+  public void login(String un, String pw) {      
+      login(un,pw,"");
+  }
   
-  public void ipAuthenticate (ServiceProxyUser user) {
-    if (!user.isIpAuthenticated()) {
-      if (user.isAuthenticated()) {
-        user.clear();
-      }
-      pz2.resetSearchAndRecordCommands();
-      pzresp.resetAllSessionData();
-      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);    
-      }      
-    }
+  public void login(String un, String pw, String navigateTo) {      
+    pzreq.getSp().getAuth().setUsername(un);
+    pzreq.getSp().getAuth().setPassword(pw);
+    login("");
+  }  
+    
+  @Override  
+  public String login(String navigateTo) {
+    AuthCommand auth = pzreq.getSp().getAuth(); 
+    auth.setParameterInState(new CommandParameter("action","=","login"));
+    authenticate();
+    return navigateTo;
+  }
+    
+  public void ipAuthenticate () {  
+    AuthCommand auth = pzreq.getSp().getAuth(); 
+    auth.setParameterInState(new CommandParameter("action","=","ipAuth"));
+    authenticate();
   }
   
   private String renameResponseElement(String responseString, String newName) {
@@ -138,9 +108,9 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   public ClientCommandResponse postInit() throws UnsupportedEncodingException, IOException {    
     String initDocPath = pz2.getSpClient().getInitDocPaths().get(0);
     logger.info("Paths: " + pz2.getSpClient().getInitDocPaths());
-    logger.info("Path: " + initDocPath);
+    logger.info("Path: " + initDocPath);   
     pz2.resetSearchAndRecordCommands();
-    pzresp.resetAllSessionData();
+    pzresp.getSp().resetAuthAndBeyond(true);
     ClientCommandResponse response = pz2.getSpClient().postInitDoc(initDocPath + getInitFileName());    
     return response;
   }
@@ -148,7 +118,7 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   @Override
   public HttpResponseWrapper postInit(byte[] initDoc, boolean includeDebug) throws UnsupportedEncodingException, IOException {    
     pz2.resetSearchAndRecordCommands();
-    pzresp.resetAllSessionData();
+    pzresp.getSp().resetAuthAndBeyond(true);
     HttpResponseWrapper response = pz2.getSpClient().postInitDoc(initDoc,includeDebug);    
     return response;
   }
@@ -189,17 +159,22 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   
   public CategoriesResponse getCategories () {
     if (pz2.isServiceProxyService()) {
-      ResponseDataObject response = pz2.doCommand("categories");
-      if (response.hasApplicationError()) {
-        logger.debug(response.getXml());
+      SpResponseDataObject response = (SpResponseDataObject) pz2.doCommand("categories");
+      if (response.unsupportedCommand()) {
+        logger.warn("Command 'categories' not supported by this Service Proxy");        
         return new CategoriesResponse();
       } else {
-        try {
-          return (CategoriesResponse) response;
-        } catch (Exception e) {
-          e.printStackTrace();
+        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();
+          }
         }
       }
     } else {