fix(jans-config-api): fixes for path conflict for SCIM config and spe…

…c for UMA Resource mandatory fields (#1805) * fix(jans-config-api): fixed swagger link * fix(jans-config-api): swagger spec change to add missing attributes for Client * fix(jans-config-api): swagger spec change to add missing attributes for Client * feat9jans-config-api): fixed GluuAtrribute usageType enum in spec * feat9jans-config-api): jansStatus attribute enum value rectification in spec for User management * feat(jans-config-api): implemented fetch custom script based on script name issue#1754 * fix(jans-config-api): fixed swagger spec for UMA Resource mandatory fields - issue#1752 * fix(jans-config-api): rectified SCIM config endpoint path as it conflicted with fido plugin issue#1615
JanssenProject · Jul 15, 2022 · 6d8cff6 · 6d8cff6
1 parent c6ee884
commit 6d8cff6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml
@@ -2693,7 +2693,7 @@ paths:
         - oauth2: [https://jans.io/oauth/config/user.write]
 
 
-  /jans-config-api/scim/config:
+  /jans-config-api/scim/scim-config:
     get:
       summary: Retrieves SCIM App configuration.
       description: Retrieves SCIM configuration.
@@ -5541,9 +5541,8 @@ components:
       description: UMAResource
       type: object
       required:
-        - id
-        - type
-        - iconUri
+        - name
+        - description
       properties:
         dn:
           type: string

diff --git a/...gins/scim-plugin/src/main/java/io/jans/configapi/plugin/scim/rest/ScimConfigResource.java b/...gins/scim-plugin/src/main/java/io/jans/configapi/plugin/scim/rest/ScimConfigResource.java
@@ -18,7 +18,7 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-@Path(Constants.CONFIG)
+@Path(Constants.SCIM_CONFIG)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public class ScimConfigResource {

diff --git a/...g-api/plugins/scim-plugin/src/main/java/io/jans/configapi/plugin/scim/util/Constants.java b/...g-api/plugins/scim-plugin/src/main/java/io/jans/configapi/plugin/scim/util/Constants.java
@@ -13,7 +13,7 @@ private Constants() {}
     public static final String SCIM_CONFIGURATION_ENTRY = "scim_ConfigurationEntryDN";
     public static final String BASE_API_URL = "/";
     public static final String SCIM = "/scim";
-    public static final String CONFIG = "/config";
+    public static final String SCIM_CONFIG = "/scim-config";
     public static final String USER = "/user"; 
 
 }
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_config_url: baseUrl + '/jans-config-api/scim/config',
+		scim_config_url: baseUrl + '/jans-config-api/scim/scim-config',
     };
 
     karate.configure('connectTimeout', 30000);

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_config_url: baseUrl + '/jans-config-api/scim/config',
+		scim_config_url: baseUrl + '/jans-config-api/scim/scim-config',
     };
 
     karate.configure('connectTimeout', 30000);

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
@@ -598,7 +598,7 @@
         ]
     },
     {
-        "path":"/jans-config-api/scim/config",
+        "path":"/jans-config-api/scim/scim-config",
         "conditions":[
             {
                 "httpMethods":["GET"],