Cleans up auth logic

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / mkjsf / pazpar2 / ServiceProxyExtensions.java

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
index ff69dcc..da21541 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
@@ -21,7 +21,6 @@ import com.indexdata.mkjsf.pazpar2.data.ResponseParser;
 import com.indexdata.mkjsf.pazpar2.data.Responses;\r
 import com.indexdata.mkjsf.pazpar2.data.sp.AuthResponse;\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
@@ -34,7 +33,6 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   private InitDocUpload initDocUpload; \r
     \r
   @Inject ConfigurationReader configurator;  \r
-  @Inject ServiceProxyUser user;    \r
   @Inject Pz2Bean pz2;\r
   @Inject Pazpar2Commands pzreq;\r
   @Inject Responses pzresp;\r
@@ -47,28 +45,23 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   }\r
    \r
 \r
+  \r
   public void login(String un, String pw) {\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
+      pzreq.getSp().getAuth().setUsername(un);\r
+      pzreq.getSp().getAuth().setPassword(pw);\r
       login("");\r
-    }\r
   }\r
 \r
 \r
   \r
   @Override  \r
   public String login(String navigateTo) {\r
-    logger.info("doing login by " + user + " using " + pz2 + " and client " + pz2.getSpClient());\r
+    logger.info("doing login using " + pz2 + " and client " + pz2.getSpClient());\r
     pz2.resetSearchAndRecordCommands();\r
     pzresp.getSp().resetAuthAndBeyond(true);\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
+    auth.setParameterInState(new CommandParameter("action","=","login"));\r
     ClientCommandResponse commandResponse = pz2.getSpClient().send(auth);\r
     String renamedResponse = renameResponseElement(commandResponse.getResponseString(), "auth");\r
     commandResponse.setResponseToParse(renamedResponse);\r
@@ -78,39 +71,24 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
     }\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.resetSearchAndRecordCommands();\r
-      pzresp.getSp().resetAuthAndBeyond(true);\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
+  public void ipAuthenticate () {  \r
+    pz2.resetSearchAndRecordCommands();\r
+    pzresp.getSp().resetAuthAndBeyond(true);\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
   }\r
   \r
   private String renameResponseElement(String responseString, String newName) {\r