From 33b9e5516302fcf49aa3f79c117915fd6cd609ca Mon Sep 17 00:00:00 2001
From: Okke Harsta <oharsta@zilverline.com>
Date: Tue, 26 Sep 2023 16:08:36 +0200
Subject: [PATCH] Bugfix for RemoteManage query for applications by GUID

---
 client/src/components/User.js                        | 7 ++++---
 client/src/locale/nl.js                              | 1 +
 server/src/main/java/access/manage/RemoteManage.java | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/src/components/User.js b/client/src/components/User.js
index af0e712d..77742139 100644
--- a/client/src/components/User.js
+++ b/client/src/components/User.js
@@ -18,13 +18,14 @@ export const User = ({user, other}) => {
     const [query, setQuery] = useState("");
     const [queryApplication, setQueryApplication] = useState("");
 
+    if (user.institutionAdmin) {
+        (user.applications || []).forEach(application => deriveRemoteApplicationAttributes(application, I18n.locale));
+    }
+
     useEffect(() => {
         if (searchRef && searchRef.current) {
             searchRef.current.focus();
         }
-        if (user.institutionAdmin) {
-            (user.applications || []).forEach(application => deriveRemoteApplicationAttributes(application, I18n.locale));
-        }
     }, [searchRef, user])
 
     const attribute = (index, name, isDate = false) => {
diff --git a/client/src/locale/nl.js b/client/src/locale/nl.js
index 5584348d..8175bc2d 100644
--- a/client/src/locale/nl.js
+++ b/client/src/locale/nl.js
@@ -137,6 +137,7 @@ const nl = {
         edit: "Bewerk rol {{name}}",
         urn: "URN",
         advanced: "Advanced settings",
+        override: "Kunnen de instellingen worden veranderd bij een uitnodiging?",
         manage: "Dienst",
         manageMetaData: "Entity",
         provisioning: "Provisioning",
diff --git a/server/src/main/java/access/manage/RemoteManage.java b/server/src/main/java/access/manage/RemoteManage.java
index 8d05e0b0..183eb3ff 100644
--- a/server/src/main/java/access/manage/RemoteManage.java
+++ b/server/src/main/java/access/manage/RemoteManage.java
@@ -74,7 +74,7 @@ public List<Map<String, Object>> allowedEntries(EntityType entityType, String id
     @Override
     public List<Map<String, Object>> providersByInstitutionalGUID(String organisationGUID) {
         Map<String, Object> baseQuery = (Map<String, Object>) this.queries.get("base_query");
-        baseQuery.put("coin:institution_guid", organisationGUID);
+        baseQuery.put("metaDataFields.coin:institution_guid", organisationGUID);
         List serviceProviders = restTemplate.postForObject(
                 String.format("%s/manage/api/internal/search/%s", this.url, EntityType.SAML20_SP.collectionName()),
                 baseQuery, List.class);