fix(config-api): rectified sortBy field for Agama resource (#2513)

* fix(config-api): removing CB and MySqlDB endpoints * fix(config-api): removing CB and MySqlDB endpoints * fix(orm): length check added before accessing CustomObjectAttribute values * fix(jans-auth-server): npe in discovery if SSA endpoint is absent #2497 (#2498) docs: no docs #2497 * docs: add remote connection section (#2499) * Add remote connection section * replace domain by demoexmple.gluu.org * fix(jans-auth-server): perform redirect_uri validation if FAPI flag is true #2500 (#2502) docs: no docs #2500 * Added Deployment README and Platform goals page. * fix: jans-linux-setup upgrade to MDS3 in fido2 (#2507) * fix(config-api): rectified sortBy field for Agama resource * fix(config-api): rectified sortBy field for Agama resource * fix(config-api): rectified sortBy field for Agama resource Co-authored-by: YuriyZ <yzabrovarniy@gmail.com> Co-authored-by: Devrim <devrimyatar@gluu.org> Co-authored-by: Michael Schwartz <mike@gluu.org>
JanssenProject · Sep 30, 2022 · bb3ac95 · bb3ac95
1 parent 5ffece1
commit bb3ac95
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 44 deletions.
diff --git a/jans-config-api/docs/jans-config-api-swagger-auto.yaml b/jans-config-api/docs/jans-config-api-swagger-auto.yaml
@@ -188,7 +188,7 @@ paths:
         in: query
         schema:
           type: string
-          default: qname
+          default: agFlowQname
       - name: sortOrder
         in: query
         schema:
@@ -2945,18 +2945,18 @@ components:
           $ref: '#/components/schemas/AttributeValidation'
         tooltip:
           type: string
-        adminCanAccess:
-          type: boolean
         adminCanView:
           type: boolean
-        adminCanEdit:
-          type: boolean
         userCanAccess:
           type: boolean
+        adminCanEdit:
+          type: boolean
         userCanView:
           type: boolean
         userCanEdit:
           type: boolean
+        adminCanAccess:
+          type: boolean
         whitePagesCanView:
           type: boolean
         baseDn:
@@ -3224,7 +3224,7 @@ components:
         customAttributes:
           type: array
           items:
-            $ref: '#/components/schemas/CustomAttribute'
+            $ref: '#/components/schemas/CustomObjectAttribute'
         customObjectClasses:
           type: array
           items:
@@ -3375,7 +3375,7 @@ components:
             type: string
         jansDefaultPromptLogin:
           type: boolean
-    CustomAttribute:
+    CustomObjectAttribute:
       type: object
       properties:
         name:
@@ -3385,9 +3385,9 @@ components:
         values:
           type: array
           items:
-            type: string
+            type: object
         value:
-          type: string
+          type: object
         displayValue:
           type: string
     LocalizedString:
@@ -4090,6 +4090,17 @@ components:
           $ref: '#/components/schemas/EngineConfig'
         ssaConfiguration:
           $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
@@ -4117,17 +4128,6 @@ components:
             - STAT
             - PAR
             - SSA
-        fapi:
-          type: boolean
-        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:
@@ -4756,21 +4756,6 @@ components:
           type: boolean
         baseDn:
           type: string
-    CustomObjectAttribute:
-      type: object
-      properties:
-        name:
-          type: string
-        multiValued:
-          type: boolean
-        values:
-          type: array
-          items:
-            type: object
-        value:
-          type: object
-        displayValue:
-          type: string
     SessionId:
       type: object
       properties:

diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml
@@ -2304,7 +2304,7 @@ paths:
           description: The 1-based index of the first query result.
         - schema:
             type: string
-            default: qname
+            default: agFlowQname
           in: query
           name: sortBy
           description: Attribute whose value will be used to order the returned response.

diff --git a/jans-config-api/profiles/local/test.properties b/jans-config-api/profiles/local/test.properties
@@ -2,8 +2,8 @@
 test.scopes=https://jans.io/oauth/config/acrs.readonly https://jans.io/oauth/config/acrs.write https://jans.io/oauth/config/attributes.readonly https://jans.io/oauth/config/attributes.write https://jans.io/oauth/config/attributes.delete https://jans.io/oauth/config/cache.readonly https://jans.io/oauth/config/cache.write https://jans.io/oauth/config/openid/clients.readonly https://jans.io/oauth/config/openid/clients.write https://jans.io/oauth/config/openid/clients.delete https://jans.io/oauth/jans-auth-server/config/properties.readonly https://jans.io/oauth/jans-auth-server/config/properties.write https://jans.io/oauth/config/smtp.readonly https://jans.io/oauth/config/smtp.write https://jans.io/oauth/config/smtp.delete https://jans.io/oauth/config/database/couchbase.readonly https://jans.io/oauth/config/database/couchbase.write https://jans.io/oauth/config/database/couchbase.delete https://jans.io/oauth/config/scripts.readonly https://jans.io/oauth/config/scripts.write https://jans.io/oauth/config/scripts.delete https://jans.io/oauth/config/fido2.readonly https://jans.io/oauth/config/fido2.write https://jans.io/oauth/config/jwks.readonly https://jans.io/oauth/config/jwks.write https://jans.io/oauth/config/jwks.delete https://jans.io/oauth/config/database/ldap.readonly https://jans.io/oauth/config/database/ldap.write https://jans.io/oauth/config/database/ldap.delete https://jans.io/oauth/config/logging.readonly https://jans.io/oauth/config/logging.write https://jans.io/oauth/config/scopes.readonly https://jans.io/oauth/config/scopes.write https://jans.io/oauth/config/scopes.delete https://jans.io/oauth/config/uma/resources.readonly https://jans.io/oauth/config/uma/resources.write https://jans.io/oauth/config/uma/resources.delete https://jans.io/oauth/config/database/sql.readonly https://jans.io/oauth/config/database/sql.write https://jans.io/oauth/config/database/sql.delete https://jans.io/oauth/config/stats.readonly jans_stat https://jans.io/scim/users.read https://jans.io/scim/users.write https://jans.io/oauth/config/scim/users.read https://jans.io/oauth/config/scim/users.write https://jans.io/scim/config.readonly https://jans.io/scim/config.write https://jans.io/oauth/config/organization.readonly https://jans.io/oauth/config/organization.write https://jans.io/oauth/config/user.readonly https://jans.io/oauth/config/user.write https://jans.io/oauth/config/user.delete https://jans.io/oauth/config/agama.readonly https://jans.io/oauth/config/agama.write https://jans.io/oauth/config/agama.delete https://jans.io/oauth/jans-auth-server/session.readonly https://jans.io/oauth/jans-auth-server/session.delete revoke_session
 
 # jans.server
-token.endpoint=https://jans.server4.sql/jans-auth/restv1/token
+token.endpoint=https://jans.server1/jans-auth/restv1/token
 token.grant.type=client_credentials
-test.client.id=1802.0f581b7e-aa5b-48c3-80a7-ed6a1ba7e3fa
-test.client.secret=XkTQLc8oyTvy
-test.issuer=https://jans.server4.sql
+test.client.id=1800.ed3327bb-0924-44f9-84c7-6778b5479011
+test.client.secret=enZafGCW9afd
+test.issuer=https://jans.server1/
diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/AgamaResource.java b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/AgamaResource.java
@@ -71,7 +71,7 @@ public class AgamaResource extends ConfigBaseResource {
     public Response getFlows(@DefaultValue("") @QueryParam(value = ApiConstants.PATTERN) String pattern,
             @DefaultValue(ApiConstants.DEFAULT_LIST_SIZE) @QueryParam(value = ApiConstants.LIMIT) int limit,
             @DefaultValue(ApiConstants.DEFAULT_LIST_START_INDEX) @QueryParam(value = ApiConstants.START_INDEX) int startIndex,
-            @DefaultValue("qname") @QueryParam(value = ApiConstants.SORT_BY) String sortBy,
+            @DefaultValue("agFlowQname") @QueryParam(value = ApiConstants.SORT_BY) String sortBy,
             @DefaultValue(ApiConstants.ASCENDING) @QueryParam(value = ApiConstants.SORT_ORDER) String sortOrder,
             @DefaultValue("false") @QueryParam(value = ApiConstants.INCLUDE_SOURCE) boolean includeSource) {
 

diff --git a/jans-config-api/server/src/test/resources/feature/openid/clients/client.json b/jans-config-api/server/src/test/resources/feature/openid/clients/client.json
@@ -46,5 +46,10 @@
   "includeClaimsInIdToken": false,
   "rptAsJwt": false,
   "subjectType": "pairwise",
-  "tokenEndpointAuthMethod": "client_secret_basic"   
+  "tokenEndpointAuthMethod": "client_secret_basic",
+  "dynamicRegistrationCustomObjectClass": "MyDynamicRegistrationCustomObject", 
+  "dynamicRegistrationCustomAttributes": [
+    "jansTrustedClnt",
+    "myAttr1"
+  ]  
 }