Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(jans-config-api): Scope object changes for creator details #2033

Merged
merged 41 commits into from
Aug 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
9d444bd
bug(jans-config-api): fixed swagger format issue
pujavs Jul 22, 2022
4c253a2
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jul 25, 2022
f6eb80b
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jul 25, 2022
ac97cc6
fix(jans-config-api): fixed due to couchbase clustter change
pujavs Jul 25, 2022
cd554ae
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jul 25, 2022
f4bd7aa
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jul 26, 2022
b313aae
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jul 27, 2022
c8003fd
feat(jans-config-api): new endpoint to get UmaResource based on assoc…
pujavs Jul 27, 2022
fc5ebe0
fix(jans-config-api): swagger spec fix for client attributes
pujavs Jul 27, 2022
77d19bb
fix(jans-config-api): reverted the local test properties
pujavs Jul 27, 2022
d4f8194
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jul 27, 2022
a977d1f
test(jans-config-api): commented test case
pujavs Jul 27, 2022
15dee7f
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jul 28, 2022
b409633
feat(jans-config-api): scim config endpoint enhancment
pujavs Jul 28, 2022
1498d74
feat(jans-config-api): swagger and DTO change for new fields for scim…
pujavs Jul 29, 2022
6940645
Merge branch 'jans-config-api-fixes' of https://github.com/JanssenPro…
pujavs Jul 29, 2022
3ac7ea1
feat(jans-config-api): swagger and DTO change for new fields for scim…
pujavs Jul 29, 2022
8db181b
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jul 29, 2022
1faa93f
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Aug 1, 2022
0e40cbe
fix(jans-config-api): rectified endpoint url in swagger spec for uma …
pujavs Aug 1, 2022
e40c219
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Aug 2, 2022
ef33d5c
feat(jans-config-api): agama endpoint fixes
pujavs Aug 2, 2022
0c76af8
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Aug 3, 2022
084c853
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Aug 3, 2022
1a80d8e
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Aug 3, 2022
0477b09
fix(jans-config-api): agama endpoint enhancements
pujavs Aug 3, 2022
44415b9
fix(jans-config-api): fixed swagger spec for Uma Resource delete
pujavs Aug 3, 2022
77547bb
fix(jans-config-api): agama endpoint enhancements
pujavs Aug 3, 2022
ee4afb3
fix(jans-config-api): agama endpoint enhancements
pujavs Aug 3, 2022
f22cd3b
fix(jans-config-api): agama endpoint enhancements
pujavs Aug 3, 2022
7ac9cde
fix(jans-config-api): agama endpoint enhancements
pujavs Aug 3, 2022
3a05019
fix(jans-config-api): agama endpoint enhancements
pujavs Aug 3, 2022
153c746
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Aug 4, 2022
d740c68
feat(jans-config-api): agama patch endpoint
pujavs Aug 4, 2022
0a8e5e6
feat(jans-config-api): agama patch endpoint
pujavs Aug 4, 2022
8ed2ba8
feat(jans-config-api): agama patch endpoint
pujavs Aug 4, 2022
c57ad28
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Aug 4, 2022
bfafc93
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Aug 5, 2022
f47a977
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Aug 5, 2022
060c139
feat(jans-config-api): Scope object changes for creator details
pujavs Aug 5, 2022
3ba103a
feat(jans-config-api): Scope object changes for creator details
pujavs Aug 5, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions jans-config-api/docs/jans-config-api-swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5071,7 +5071,7 @@ components:
description: Enable/Disable usage of highest level script in case ACR script does not exist.
agamaConfiguration:
type: object
desciption: Engine Config which offers an alternative way to build authentication flows in Janssen server
description: Engine Config which offers an alternative way to build authentication flows in Janssen server
$ref: '#/components/schemas/EngineConfig'

GluuAttribute:
Expand Down Expand Up @@ -5273,14 +5273,32 @@ components:
type: object
description: ScopeAttributes
properties:
spontaneousClientId:
type: string
spontaneousClientScopes:
type: array
items:
type: string
showInConfigurationEndpoint:
type: boolean
creatorId:
description: Id of the scope creator. If creator is client then client_id if user then user_id
type: string
creatorType:
description: Scope creator type
type: string
enum:
- NONE
- CLIENT
- USER
- AUTO
creationDate:
description: Scope creation date time.
type: string
format: date
creatorAttributes:
description: Stores creator attributes
type: object
additionalProperties:
type: string
umaType:
description: Specifies if the scope is of type UMA.
type: boolean
Expand All @@ -5293,6 +5311,9 @@ components:
description: Expiry date of the Scope.
type: string
format: date



ExtendedScope:
allOf: # Combines the Scope and the inline model
- $ref: '#/components/schemas/Scope'
Expand All @@ -5304,6 +5325,7 @@ components:
type: array
items:
$ref: '#/components/schemas/Client'

CustomAttribute:
title: CustomAttribute
description: Attribute.
Expand Down
4 changes: 2 additions & 2 deletions jans-config-api/profiles/local/test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ test.scopes=https://jans.io/oauth/config/acrs.readonly https://jans.io/oauth/con
# jans.server
token.endpoint=https://jans.server1/jans-auth/restv1/token
token.grant.type=client_credentials
test.client.id=1800.c3d63983-6883-438d-b974-38348645de42
test.client.secret=QzZFg9RnQjSP
test.client.id=1800.e9131b86-f39f-421c-9dde-b7f90c21a2fe
test.client.secret=zur7eMIXyDTu
test.issuer=https://jans.server1
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ private CustomScope setClients(Scope scope, List<Client> clients, List<UmaResour
customScope.getClients().add(client);
}
} else if (scope.getScopeType() == ScopeType.SPONTANEOUS) {
if (client.getClientId().equals(customScope.getAttributes().getSpontaneousClientId())) {
if (client.getClientId().equals(customScope.getCreatorId())) {
customScope.getClients().add(client);
}
}
Expand Down