Skip to content

Commit bb3ac95

Browse files
pujavsyuriyzdevrimyatarnynymike
authored
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 <[email protected]> Co-authored-by: Devrim <[email protected]> Co-authored-by: Michael Schwartz <[email protected]>
1 parent 5ffece1 commit bb3ac95

File tree

5 files changed

+34
-44
lines changed

5 files changed

+34
-44
lines changed

jans-config-api/docs/jans-config-api-swagger-auto.yaml

+22-37
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ paths:
188188
in: query
189189
schema:
190190
type: string
191-
default: qname
191+
default: agFlowQname
192192
- name: sortOrder
193193
in: query
194194
schema:
@@ -2945,18 +2945,18 @@ components:
29452945
$ref: '#/components/schemas/AttributeValidation'
29462946
tooltip:
29472947
type: string
2948-
adminCanAccess:
2949-
type: boolean
29502948
adminCanView:
29512949
type: boolean
2952-
adminCanEdit:
2953-
type: boolean
29542950
userCanAccess:
29552951
type: boolean
2952+
adminCanEdit:
2953+
type: boolean
29562954
userCanView:
29572955
type: boolean
29582956
userCanEdit:
29592957
type: boolean
2958+
adminCanAccess:
2959+
type: boolean
29602960
whitePagesCanView:
29612961
type: boolean
29622962
baseDn:
@@ -3224,7 +3224,7 @@ components:
32243224
customAttributes:
32253225
type: array
32263226
items:
3227-
$ref: '#/components/schemas/CustomAttribute'
3227+
$ref: '#/components/schemas/CustomObjectAttribute'
32283228
customObjectClasses:
32293229
type: array
32303230
items:
@@ -3375,7 +3375,7 @@ components:
33753375
type: string
33763376
jansDefaultPromptLogin:
33773377
type: boolean
3378-
CustomAttribute:
3378+
CustomObjectAttribute:
33793379
type: object
33803380
properties:
33813381
name:
@@ -3385,9 +3385,9 @@ components:
33853385
values:
33863386
type: array
33873387
items:
3388-
type: string
3388+
type: object
33893389
value:
3390-
type: string
3390+
type: object
33913391
displayValue:
33923392
type: string
33933393
LocalizedString:
@@ -4090,6 +4090,17 @@ components:
40904090
$ref: '#/components/schemas/EngineConfig'
40914091
ssaConfiguration:
40924092
$ref: '#/components/schemas/SsaConfiguration'
4093+
fapi:
4094+
type: boolean
4095+
allResponseTypesSupported:
4096+
uniqueItems: true
4097+
type: array
4098+
items:
4099+
type: string
4100+
enum:
4101+
- code
4102+
- token
4103+
- id_token
40934104
enabledFeatureFlags:
40944105
uniqueItems: true
40954106
type: array
@@ -4117,17 +4128,6 @@ components:
41174128
- STAT
41184129
- PAR
41194130
- SSA
4120-
fapi:
4121-
type: boolean
4122-
allResponseTypesSupported:
4123-
uniqueItems: true
4124-
type: array
4125-
items:
4126-
type: string
4127-
enum:
4128-
- code
4129-
- token
4130-
- id_token
41314131
AuthenticationFilter:
41324132
required:
41334133
- baseDn
@@ -4384,13 +4384,13 @@ components:
43844384
type: boolean
43854385
internal:
43864386
type: boolean
4387+
locationPath:
4388+
type: string
43874389
locationType:
43884390
type: string
43894391
enum:
43904392
- ldap
43914393
- file
4392-
locationPath:
4393-
type: string
43944394
baseDn:
43954395
type: string
43964396
ScriptError:
@@ -4756,21 +4756,6 @@ components:
47564756
type: boolean
47574757
baseDn:
47584758
type: string
4759-
CustomObjectAttribute:
4760-
type: object
4761-
properties:
4762-
name:
4763-
type: string
4764-
multiValued:
4765-
type: boolean
4766-
values:
4767-
type: array
4768-
items:
4769-
type: object
4770-
value:
4771-
type: object
4772-
displayValue:
4773-
type: string
47744759
SessionId:
47754760
type: object
47764761
properties:

jans-config-api/docs/jans-config-api-swagger.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2304,7 +2304,7 @@ paths:
23042304
description: The 1-based index of the first query result.
23052305
- schema:
23062306
type: string
2307-
default: qname
2307+
default: agFlowQname
23082308
in: query
23092309
name: sortBy
23102310
description: Attribute whose value will be used to order the returned response.

jans-config-api/profiles/local/test.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
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
33

44
# jans.server
5-
token.endpoint=https://jans.server4.sql/jans-auth/restv1/token
5+
token.endpoint=https://jans.server1/jans-auth/restv1/token
66
token.grant.type=client_credentials
7-
test.client.id=1802.0f581b7e-aa5b-48c3-80a7-ed6a1ba7e3fa
8-
test.client.secret=XkTQLc8oyTvy
9-
test.issuer=https://jans.server4.sql
7+
test.client.id=1800.ed3327bb-0924-44f9-84c7-6778b5479011
8+
test.client.secret=enZafGCW9afd
9+
test.issuer=https://jans.server1/

jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/AgamaResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public class AgamaResource extends ConfigBaseResource {
7171
public Response getFlows(@DefaultValue("") @QueryParam(value = ApiConstants.PATTERN) String pattern,
7272
@DefaultValue(ApiConstants.DEFAULT_LIST_SIZE) @QueryParam(value = ApiConstants.LIMIT) int limit,
7373
@DefaultValue(ApiConstants.DEFAULT_LIST_START_INDEX) @QueryParam(value = ApiConstants.START_INDEX) int startIndex,
74-
@DefaultValue("qname") @QueryParam(value = ApiConstants.SORT_BY) String sortBy,
74+
@DefaultValue("agFlowQname") @QueryParam(value = ApiConstants.SORT_BY) String sortBy,
7575
@DefaultValue(ApiConstants.ASCENDING) @QueryParam(value = ApiConstants.SORT_ORDER) String sortOrder,
7676
@DefaultValue("false") @QueryParam(value = ApiConstants.INCLUDE_SOURCE) boolean includeSource) {
7777

jans-config-api/server/src/test/resources/feature/openid/clients/client.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,10 @@
4646
"includeClaimsInIdToken": false,
4747
"rptAsJwt": false,
4848
"subjectType": "pairwise",
49-
"tokenEndpointAuthMethod": "client_secret_basic"
49+
"tokenEndpointAuthMethod": "client_secret_basic",
50+
"dynamicRegistrationCustomObjectClass": "MyDynamicRegistrationCustomObject",
51+
"dynamicRegistrationCustomAttributes": [
52+
"jansTrustedClnt",
53+
"myAttr1"
54+
]
5055
}

0 commit comments

Comments
 (0)