Back to SNAPSHOT dev cycle

OpenConext · Jan 16, 2024 · f1e9da5 · f1e9da5
1 parent 45af05f
commit f1e9da5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/dashboard-gui/pom.xml b/dashboard-gui/pom.xml
@@ -2,7 +2,7 @@
    <parent>
        <groupId>org.openconext</groupId>
        <artifactId>dashboard</artifactId>
-       <version>12.3.13</version>
+       <version>12.3.14-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/dashboard-server/pom.xml b/dashboard-server/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>dashboard</artifactId>
-        <version>12.3.13</version>
+        <version>12.3.14-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/dashboard-server/src/main/java/dashboard/manage/UrlResourceManage.java b/dashboard-server/src/main/java/dashboard/manage/UrlResourceManage.java
@@ -29,18 +29,15 @@ public class UrlResourceManage implements Manage {
     private final RestTemplate restTemplate = new RestTemplate();
     private final HttpHeaders httpHeaders;
 
-    private String requestedAttributes = "\"ALL_ATTRIBUTES\":true";
-    private String body = "{" + requestedAttributes + "}";
-    private String bodyForEntity = "{\"entityid\":\"@@entityid@@\", " + requestedAttributes + "}";
-    private String bodyForEid = "{\"eid\":@@eid@@, " + requestedAttributes + "}";
-    private String bodyForInstitutionId =
+    private final String requestedAttributes = "\"ALL_ATTRIBUTES\":true";
+    private final String body = "{" + requestedAttributes + "}";
+    private final String bodyForEntity = "{\"entityid\":\"@@entityid@@\", " + requestedAttributes + "}";
+    private final String bodyForInstitutionId =
             "{\"metaDataFields.coin:institution_id\":\"@@institution_id@@\", \"ALL_ATTRIBUTES\":true}";
 
-    private String linkedQuery = "{$and: [{$or:[{\"data.allowedEntities.name\": {$in: [\"@@entityid@@\"]}}, {\"data" +
+    private final String linkedQuery = "{$and: [{$or:[{\"data.allowedEntities.name\": {$in: [\"@@entityid@@\"]}}, {\"data" +
             ".allowedall\": true}]}]}";
 
-    private String findByEntityIdIn = "{\"data.entityid\":{\"$in\":[@@entityids@@]}}";
-
     public UrlResourceManage(
             String username,
             String password,
@@ -109,6 +106,7 @@ public Optional<ServiceProvider> getServiceProviderById(Long spId, EntityType en
         if (spId == null) {
             return Optional.empty();
         }
+        String bodyForEid = "{\"eid\":@@eid@@, " + requestedAttributes + "}";
         String body = bodyForEid.replace("@@eid@@", spId.toString());
         List<Map<String, Object>> providers = getMaps(providerInputStream(entityType, body));
         return providers.stream().map(this::transformManageMetadata).map(sp -> this.serviceProvider(sp, entityType)).findFirst();
@@ -163,6 +161,7 @@ public List<ServiceProvider> getLinkedServiceProviders(String idpId) {
     @Override
     public List<ServiceProvider> getByEntityIdin(List<String> entityIds) {
         String split = entityIds.stream().map(s -> "\"" + s + "\"").collect(Collectors.joining(","));
+        String findByEntityIdIn = "{\"data.entityid\":{\"$in\":[@@entityids@@]}}";
         String query = findByEntityIdIn.replace("@@entityids@@", split);
         return rawSearchProviders(query, EntityType.saml20_sp, EntityType.oidc10_rp, EntityType.oauth20_rs);
     }

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>org.openconext</groupId>
     <artifactId>dashboard</artifactId>
-    <version>12.3.13</version>
+    <version>12.3.14-SNAPSHOT</version>
     <name>dashboard</name>
     <description>OpenConext-Dashboard</description>
     <inceptionYear>2012</inceptionYear>