fix(config-api): client default value handling (#2585)

* fix(config-api): fix for assosiated client not fetched for scope * fix(config-api): validation and defaults for client creation * fix(config-api): custom object attribute fix * fix(config-api): custom object attribute fix * fix(config-api): client default value handling * fix(config-api): client default value handling
JanssenProject · Oct 11, 2022 · fbcbbad · fbcbbad
1 parent 529745d
commit fbcbbad
Show file tree

Hide file tree

Showing 5 changed files with 252 additions and 33 deletions.
diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java b/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java
@@ -411,7 +411,7 @@ public void setFeatureFlags(List<String> featureFlags) {
         this.featureFlags = featureFlags;
     }
 
-    public Boolean getUseNestedJwtDuringEncryption() {
+    public Boolean isUseNestedJwtDuringEncryption() {
         if (useNestedJwtDuringEncryption == null) useNestedJwtDuringEncryption = true;
         return useNestedJwtDuringEncryption;
     }

diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/JwrService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/JwrService.java
@@ -92,7 +92,7 @@ private Jwt signJwt(Jwt jwt, Client client) throws Exception {
 
     private Jwe encryptJwe(Jwe jwe, Client client) throws Exception {
 
-        if (BooleanUtils.isTrue(appConfiguration.getUseNestedJwtDuringEncryption())) {
+        if (BooleanUtils.isTrue(appConfiguration.isUseNestedJwtDuringEncryption()) ){
             JwtSigner jwtSigner = JwtSigner.newJwtSigner(appConfiguration, webKeysConfiguration, client);
             Jwt jwt = jwtSigner.newJwt();
             jwt.setClaims(jwe.getClaims());

diff --git a/jans-config-api/docs/jans-config-api-swagger-auto.yaml b/jans-config-api/docs/jans-config-api-swagger-auto.yaml
@@ -2947,18 +2947,18 @@ components:
           type: string
         whitePagesCanView:
           type: boolean
-        adminCanEdit:
+        adminCanAccess:
+          type: boolean
+        userCanView:
           type: boolean
         adminCanView:
           type: boolean
         userCanAccess:
           type: boolean
-        userCanView:
-          type: boolean
-        adminCanAccess:
-          type: boolean
         userCanEdit:
           type: boolean
+        adminCanEdit:
+          type: boolean
         baseDn:
           type: string
     PatchRequest:
@@ -3284,8 +3284,6 @@ components:
           format: int32
         displayName:
           type: string
-        tokenBindingSupported:
-          type: boolean
         authenticationMethod:
           type: string
           enum:
@@ -3297,6 +3295,8 @@ components:
           - tls_client_auth
           - self_signed_tls_client_auth
           - none
+        tokenBindingSupported:
+          type: boolean
         baseDn:
           type: string
         inum:
@@ -3386,24 +3386,24 @@ components:
           type: array
           items:
             type: object
-        value:
-          type: object
         displayValue:
           type: string
+        value:
+          type: object
     LocalizedString:
       type: object
       properties:
         values:
           type: object
           additionalProperties:
             type: string
-        value:
-          type: string
         languageTags:
           uniqueItems: true
           type: array
           items:
             type: string
+        value:
+          type: string
     AppConfiguration:
       type: object
       properties:
@@ -4092,6 +4092,15 @@ components:
           $ref: '#/components/schemas/SsaConfiguration'
         fapi:
           type: boolean
+        allResponseTypesSupported:
+          uniqueItems: true
+          type: array
+          items:
+            type: string
+            enum:
+            - code
+            - token
+            - id_token
         enabledFeatureFlags:
           uniqueItems: true
           type: array
@@ -4119,15 +4128,6 @@ components:
             - STAT
             - PAR
             - SSA
-        allResponseTypesSupported:
-          uniqueItems: true
-          type: array
-          items:
-            type: string
-            enum:
-            - code
-            - token
-            - id_token
     AuthenticationFilter:
       required:
       - baseDn
@@ -4384,13 +4384,13 @@ components:
           type: boolean
         internal:
           type: boolean
-        locationPath:
-          type: string
         locationType:
           type: string
           enum:
           - ldap
           - file
+        locationPath:
+          type: string
         baseDn:
           type: string
     ScriptError:

diff --git a/jans-config-api/plugins/docs/user-mgt-plugin-swagger.yaml b/jans-config-api/plugins/docs/user-mgt-plugin-swagger.yaml
@@ -225,10 +225,10 @@ components:
           type: array
           items:
             type: object
-        value:
-          type: object
         displayValue:
           type: string
+        value:
+          type: object
     CustomUser:
       type: object
       properties: