Fixes #654

Author: oharsta

.gitignore

@@ -26,4 +26,5 @@ SabClientIntegrationTest.java
 sso.txt
 TODO.txt
 queries.md
+ssh_docker.sh
 

dashboard-gui/yarn.lock

@@ -3513,9 +3513,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001219:
-  version "1.0.30001636"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz"
-  integrity sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==
+  version "1.0.30001690"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz"
+  integrity sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==
 
 capture-exit@^2.0.0:
   version "2.0.0"

dashboard-server/src/main/java/dashboard/Application.java

@@ -6,10 +6,9 @@
 import dashboard.manage.Manage;
 import dashboard.manage.UrlResourceManage;
 import dashboard.pdp.*;
-import dashboard.sab.HttpClientTransport;
 import dashboard.sab.Sab;
-import dashboard.sab.SabClient;
 import dashboard.sab.SabClientMock;
+import dashboard.sab.SabRest;
 import dashboard.service.Services;
 import dashboard.service.impl.*;
 import dashboard.stats.Stats;
@@ -40,9 +39,12 @@ public Services services(Manage manage, @Value("${guestidp.entityids}") String g
     }
 
     @Bean
-    public Sab sab(HttpClientTransport httpClientTransport,
-                   @Value("${dashboard.feature.sab}") boolean sabEnabled) {
-        return sabEnabled ? new SabClient(httpClientTransport) : new SabClientMock();
+    public Sab sab(Manage manage,
+                   @Value("${dashboard.feature.sab}") boolean sabEnabled,
+                   @Value("${sab-rest.username}") String sabRestUserName,
+                   @Value("${sab-rest.password}") String sabRestPassword,
+                   @Value("${sab-rest.endpoint}") String restEndPointURL) {
+        return sabEnabled ? new SabRest(manage, sabRestUserName, sabRestPassword, restEndPointURL) : new SabClientMock();
     }
 
     @Bean

dashboard-server/src/main/java/dashboard/sab/HttpClientTransport.java

@@ -17,30 +17,21 @@
 package dashboard.sab;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
 
 /**
  * Interface for SAB, the SURFnet Authorisation Beheer interface
  */
 public interface Sab {
 
-    /**
-     * Get the Role/organisation info for the given userId
-     *
-     * @param userId the userId to query for
-     * @return SabRoleHolder
-     */
-    Optional<SabRoleHolder> getRoles(String userId);
-
     /**
      * Get all persons within the given organisation that have the given role.
      */
-    Collection<SabPerson> getPersonsInRoleForOrganization(String organisationGuid, String role);
+    List<SabPerson> getPersonsInRoleForOrganization(String organisationGuid, String role);
 
     /**
      * Get all persons from the given organization that have the given role
-     *
-     * @return
      */
-    Collection<SabPerson> getSabEmailsForOrganization(String entityId, String role);
+    List<SabPerson> getSabEmailsForOrganization(String entityId, String role);
 }

dashboard-server/src/main/java/dashboard/sab/Sab.java

@@ -18,10 +18,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 import static java.util.Arrays.asList;
-import static java.util.stream.Collectors.toList;
 
 /**
  * Mock implementation of SAB client that uses a predefined mapping of userIds to SabRoleHolders
@@ -47,19 +49,14 @@ public class SabClientMock implements Sab {
     );
 
     @Override
-    public Optional<SabRoleHolder> getRoles(String userId) {
-        return Optional.ofNullable(rolesMapping.get(userId));
-    }
-
-    @Override
-    public Collection<SabPerson> getPersonsInRoleForOrganization(String organisationGuid, String role) {
+    public List<SabPerson> getPersonsInRoleForOrganization(String organisationGuid, String role) {
         return sabPersons.stream()
                 .filter(person -> person.getRoles().stream().anyMatch(r -> r.roleName.equals(role)))
-                .collect(toList());
+                .toList();
     }
 
     @Override
-    public Collection<SabPerson> getSabEmailsForOrganization(String entityId, String role) {
-        return sabPersons;
+    public List<SabPerson> getSabEmailsForOrganization(String entityId, String role) {
+        return this.getPersonsInRoleForOrganization(null, role);
     }
 }