Adds IP authentication to SP client

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java
index fce82ca..4209aa2 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java
@@ -48,7 +48,7 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   }\r
   \r
   public void login(String un, String pw) {\r
-    if (user.isAuthenticated() && user.getName().equals(un) && ((ServiceProxyClient) searchClient).checkAuthentication()) {\r
+    if (user.isAuthenticated() && user.getName().equals(un) && ((ServiceProxyClient) searchClient).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
@@ -67,6 +67,12 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
     pzresp.reset();\r
     return navigateTo;\r
   }\r
+  \r
+  public void ipAuthenticate (ServiceProxyUser user) {\r
+    if (!user.isAuthenticated()) {\r
+      ((ServiceProxyClient)searchClient).ipAuthenticate(user);\r
+    }\r
+  }\r
 \r
   @Override\r
   public void setServiceProxyUrl(String url) {\r
@@ -129,6 +135,4 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
     return null;\r
     // return getCommandParameterValue("record","acefilter","");\r
   }\r
-\r
-\r
 }\r