WIP for #360

Author: oharsta

client/src/api/index.js

@@ -265,6 +265,10 @@ export function allowedAttributes() {
     return fetchJson("/api/v1/manage/allowed-attributes", {}, {}, false);
 }
 
+export function autoCompleteEntities(query, entityType) {
+    return fetchJson(`/api/v1/manage/autocomplete/${entityType}?query=${encodeURIComponent(query)}`);
+}
+
 //Connections
 export function newConnection(connection) {
     return postPutJson("/api/v1/connections", connection, "POST");

client/src/locale/en.js

@@ -115,7 +115,8 @@ const en = {
         system: "System",
         users: "Users",
         organizations: "Organizations",
-        organizationPendingApproval: "Pending approval"
+        organizationPendingApproval: "Pending approval",
+        manage: "Manage"
     },
     welcome: {
         greeting: "Welcome {{name}}",
@@ -186,7 +187,8 @@ const en = {
         joins: "Join Requests",
         invitations: "Invitations",
         access: "Access",
-        information: "App information"
+        information: "App information",
+        manage: "Manage"
     },
     joinRequest: {
         info: "You do not have access to <strong>{{name}}</strong>'s environment. You can request access from the administrator.",
@@ -1165,6 +1167,14 @@ const en = {
             stepExplanation:"→ Users may access the application, but must log in with a higher LoA or MFA"
         },
         negateApplication: "Select <strong>Negate selection</strong> to apply this policy to all service providers except the ones you chose.",
+    },
+    manage: {
+        name: "Name",
+        organization: "Organization",
+        type: "Entity type",
+        oidc10_rp: "OIDC Relying Party",
+        saml20_sp: "SAML Service Provider",
+        searchPlaceHolder: "Search for Manage entities"
     }
 
 }

client/src/pages/ApplicationDetail.jsx

@@ -92,8 +92,9 @@ const ApplicationDetail = ({anonymous, refreshUser}) => {
                 setShowNewPolicyChoice(true);
                 return;
             } else {
-                newCurrentPolicy = policyType === policyTypes.step ? policyTemplateStepUp(user.identityProvider.data.entityid) :
-                    policyTemplateRegular(user.identityProvider.data.entityid);
+                newCurrentPolicy = policyType === policyTypes.step ?
+                    policyTemplateStepUp(user.identityProvider.data.entityid, serviceProvider.data.entityid) :
+                    policyTemplateRegular(user.identityProvider.data.entityid, serviceProvider.data.entityid);
             }
         } else {
             newCurrentPolicy = allPolicies.find(policy => policy.id === policyIdentifier);

client/src/pages/System.jsx

@@ -8,8 +8,11 @@ import {Organizations} from "./Organizations.jsx";
 import {useAppStore} from "../stores/AppStore.js";
 import {mainMenuItems} from "../utils/MenuItems.js";
 import {useShallow} from "zustand/react/shallow";
+import {Manage} from "./Manage.jsx";
 
-const tabNames = ["users", "organizations", "organizationPendingApproval"]
+const tabNames = ["users", "organizations", "organizationPendingApproval", "manage"]
+
+const organizationTabs = ["organizations", "organizationPendingApproval"];
 
 const System = () => {
     const {tab = "users"} = useParams();
@@ -37,11 +40,14 @@ const System = () => {
         activeMenuItem: null
     });
 
-    const tabChanged = (name) => {
+    const tabChanged = name => {
+        const refreshRequired = name !== currentTab && organizationTabs.includes(name) &&
+            organizationTabs.includes(currentTab);
+        debugger;
         setCurrentTab(name);
         const path = encodeURIComponent(`/system/${name}`);
         //We need to force a refresh of the Organization component that is used twice
-        navigate(`/refresh-route/${path}`);
+        navigate(refreshRequired ? `/refresh-route/${path}` : path);
     }
 
     const renderCurrentTab = () => {
@@ -55,6 +61,9 @@ const System = () => {
             case  "organizationPendingApproval": {
                 return <Organizations pendingApproval={true}/>
             }
+            case "manage": {
+                return <Manage />
+            }
         }
     }
 

server/src/main/java/access/api/ManageController.java

@@ -24,6 +24,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -183,6 +184,16 @@ public ResponseEntity<List<Map<String, Object>>> uniquePolicyName(@RequestBody M
         List<Map<String, Object>> policies = manage.uniquePolicyName(properties);
         return ResponseEntity.ok(policies);
     }
+    @GetMapping("/autocomplete/{type}")
+    public List<Map<String, Object>> autoCompleteEntities(@PathVariable EntityType type,
+                                                                        @RequestParam("query") String query) {
+        Map<String, List<Map<String, Object>>> entities = manage.autoCompleteEntities(type, query);
+        //We concat the suggestions and alternatives
+        List<Map<String, Object>> alternatives = entities.getOrDefault("alternatives", new ArrayList<>());
+        List<Map<String, Object>> suggestions = entities.getOrDefault("suggestions", new ArrayList<>());
+        alternatives.addAll(suggestions);
+        return alternatives;
+    }
 
 
     @GetMapping("/allowed-attributes")

server/src/main/java/access/manage/LocalManage.java

@@ -1,7 +1,11 @@
 package access.manage;
 
 import access.exception.NotFoundException;
-import access.model.*;
+import access.model.Connection;
+import access.model.EntityType;
+import access.model.Environment;
+import access.model.Organization;
+import access.model.User;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
@@ -12,7 +16,12 @@
 import org.springframework.core.io.Resource;
 import org.springframework.util.StringUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
@@ -272,7 +281,7 @@ public List<Map<String, Object>> policiesByIdentityProvider(String identityProvi
                     List<Map<String, String>> identityProviderIds = (List<Map<String, String>>)
                             data.getOrDefault("identityProviderIds", List.of());
                     return identityProviderIds.stream()
-                                    .anyMatch(m -> m.get("name").equals(identityProviderEntityId));
+                            .anyMatch(m -> m.get("name").equals(identityProviderEntityId));
                 })
                 .toList();
     }
@@ -315,4 +324,24 @@ public void deletePolicy(Map<String, Object> policy) {
     public void connectWithoutInteraction(Map<String, Object> identityProvider, Map<String, Object> serviceProvider, User currentUser) {
         //nope
     }
+
+    @Override
+    public Map<String, List<Map<String, Object>>> autoCompleteEntities(EntityType type, String query) {
+        String lowerCaseQuery = query.toLowerCase();
+        return Map.of("suggestions", this.allProviders.get(type).stream()
+                .filter(entity -> {
+                    Map<String, Object> data = getData(entity);
+                    String entityid = (String) data.get("entityid");
+                    if (entityid.toLowerCase().contains(lowerCaseQuery)) {
+                        return true;
+                    }
+                    Map<String, Object> metaDataFields = getMetaDataFields(data);
+                    return Stream.of("name:en", "name:nl", "OrganizationName:en", "OrganizationName:nl")
+                            .anyMatch(attr -> {
+                                String val = (String) metaDataFields.get("attr");
+                                return StringUtils.hasText(val) && val.toLowerCase().contains(query);
+                            });
+                })
+                .toList());
+    }
 }

server/src/main/java/access/manage/Manage.java

@@ -1,6 +1,8 @@
 package access.manage;
 
 import access.model.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.*;
 
@@ -57,6 +59,8 @@ List<Map<String, Object>> policiesByServiceProvider(String identityProviderEntit
 
     List<Map<String, Object>> uniquePolicyName(Map<String, Object> properties);
 
+    Map<String, List<Map<String, Object>>> autoCompleteEntities(EntityType type, String query);
+
     List<Map<String, Object>> allowedAttributes();
 
     void deletePolicy(Map<String, Object> policy);

server/src/main/java/access/manage/RemoteManage.java

@@ -26,6 +26,8 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -421,6 +423,16 @@ public void deletePolicy(Map<String, Object> policy) {
         restTemplate.delete(url);
     }
 
+    @Override
+    public Map<String, List<Map<String, Object>>> autoCompleteEntities(EntityType type, String query) {
+        RestTemplate restTemplate = environmentRestTemplate(Environment.PROD);
+        String url = String.format("%s/manage/api/internal/autocomplete/%s?query=%s",
+                environmentUrl(Environment.PROD),
+                type.name(),
+                URLEncoder.encode(query, Charset.defaultCharset()));
+        return restTemplate.getForObject(url, Map.class);
+    }
+
     @Override
     public void connectWithoutInteraction(Map<String, Object> identityProvider, Map<String, Object> serviceProvider, User user) {
         RestTemplate restTemplate = environmentRestTemplate(Environment.PROD);