fix(config-api): scim user management endpoint failing due to conflic…

…t with user mgmt path (#1181)
JanssenProject · Apr 8, 2022 · 8ee47a0 · 8ee47a0
1 parent dfa19f0
commit 8ee47a0
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/jans-cli/cli/jca.yaml b/jans-cli/cli/jca.yaml
@@ -2585,7 +2585,8 @@ paths:
       security:
         - oauth2: [https://jans.io/oauth/config/user.write]
 
-  /jans-config-api/scim/user:
+
+  /jans-config-api/scim/resource/user:
     get:
       tags:
         - SCIM - User Management
@@ -2735,7 +2736,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
 
-  /jans-config-api/scim/user/{id}:
+  /jans-config-api/scim/resource/user/{id}:
     get:
       tags:
         - SCIM - User Management
@@ -2986,7 +2987,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
 
-  /jans-config-api/scim/user/.search:
+  /jans-config-api/scim/resource/user/.search:
     post:
       tags:
         - SCIM - User Management

diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml
@@ -2555,7 +2555,7 @@ paths:
         - oauth2: [https://jans.io/oauth/config/user.delete]
 
 
-  /jans-config-api/scim/user:
+  /jans-config-api/scim/resource/user:
     get:
       tags:
         - SCIM - User Management
@@ -2705,7 +2705,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
 
-  /jans-config-api/scim/user/{id}:
+  /jans-config-api/scim/resource/user/{id}:
     get:
       tags:
         - SCIM - User Management
@@ -2956,7 +2956,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
 
-  /jans-config-api/scim/user/.search:
+  /jans-config-api/scim/resource/user/.search:
     post:
       tags:
         - SCIM - User Management

diff --git a/...pi/plugins/scim-plugin/src/main/java/io/jans/configapi/plugin/scim/rest/ScimResource.java b/...pi/plugins/scim-plugin/src/main/java/io/jans/configapi/plugin/scim/rest/ScimResource.java
@@ -23,7 +23,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Path("/user")
+@Path("/resource/user")
 public class ScimResource {
 
     public static final String SEARCH_SUFFIX = ".search";

diff --git a/jans-config-api/plugins/scim-plugin/src/test/resources/karate-config-jenkins.js b/jans-config-api/plugins/scim-plugin/src/test/resources/karate-config-jenkins.js
@@ -44,7 +44,7 @@ function() {
         accessToken: '123',
 
         //scim
-        scim_user_url: baseUrl + '/jans-config-api/scim/user',
+        scim_user_url: baseUrl + '/jans-config-api/scim/resource/user',
 		scim_config_url: baseUrl + '/jans-config-api/scim/config',
     };
 

diff --git a/jans-config-api/plugins/scim-plugin/src/test/resources/karate-config.js b/jans-config-api/plugins/scim-plugin/src/test/resources/karate-config.js
@@ -45,7 +45,7 @@ function() {
 
 
         //scim
-        scim_user_url: baseUrl + '/jans-config-api/scim/user',
+        scim_user_url: baseUrl + '/jans-config-api/scim/resource/user',
 		scim_config_url: baseUrl + '/jans-config-api/scim/config',
     };
 

diff --git a/jans-config-api/server/src/main/resources/config-api-rs-protect.json b/jans-config-api/server/src/main/resources/config-api-rs-protect.json
@@ -592,7 +592,7 @@
         ]
     },
     {
-        "path":"/jans-config-api/scim/user",
+        "path":"/jans-config-api/scim/resource/user",
         "conditions":[
             {
                 "httpMethods":["GET"],
@@ -612,7 +612,7 @@
         ]
     },
     {
-        "path":"/jans-config-api/scim/user/{id}",
+        "path":"/jans-config-api/scim/resource/user/{id}",
         "conditions":[
             {
                 "httpMethods":["GET"],
@@ -646,7 +646,7 @@
         ]
     },
     {
-        "path":"/jans-config-api/scim/user/.search",
+        "path":"/jans-config-api/scim/resource/user/.search",
         "conditions":[
             {
                 "httpMethods":["GET"],

diff --git a/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java b/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java
@@ -92,9 +92,12 @@ public String getDisplayValue() {
             return values.get(0).toString();
         }
 
-        StringBuilder sb = new StringBuilder(values.get(0).toString());
-        for (int i = 1; i < values.size(); i++) {
-            sb.append(", ").append(values.get(i).toString());
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < values.size(); i++) {
+            if (i > 0) {
+                sb.append(", ");
+            }
+            sb.append(values.get(i).toString());           
         }
 
         return sb.toString();