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.

Sign up for GitHub

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

Jump to bottom

fix(jans-config-api): fixes for path conflict for SCIM config and spec for UMA Resource mandatory fields #1805

Merged
merged 13 commits into from
Jul 15, 2022
Merged

fix(jans-config-api): fixes for path conflict for SCIM config and spec for UMA Resource mandatory fields #1805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fd4cd63
fix(jans-config-api): fixed swagger link
pujavs Jul 7, 2022
f1f5dc1
fix(jans-config-api): sync with main
pujavs Jul 7, 2022
1c69bd9
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jul 12, 2022
1d29669
MQ:wq!
pujavs Jul 13, 2022
681c346
fix(jans-config-api): swagger spec change to add missing attributes f…
pujavs Jul 13, 2022
96e9aa8
fix(jans-config-api): swagger spec change to add missing attributes f…
pujavs Jul 13, 2022
1ddf14a
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jul 14, 2022
e9fd2e0
feat9jans-config-api): fixed GluuAtrribute usageType enum in spec
pujavs Jul 14, 2022
fbdb295
feat9jans-config-api): jansStatus attribute enum value rectification …
pujavs Jul 14, 2022
3315143
feat(jans-config-api): implemented fetch custom script based on scrip…
pujavs Jul 14, 2022
e80ad41
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jul 15, 2022
c1d3c47
fix(jans-config-api): fixed swagger spec for UMA Resource mandatory f…
pujavs Jul 15, 2022
7dcb8c3
fix(jans-config-api): rectified SCIM config endpoint path as it confl…
pujavs Jul 15, 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
7 changes: 3 additions & 4 deletions jans-config-api/docs/jans-config-api-swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -5541,9 +5541,8 @@ components:
description: UMAResource
type: object
required:
- id
- type
- iconUri
- name
- description
properties:
dn:
type: string
Expand Down
2 changes: 1 addition & 1 deletion ...gins/scim-plugin/src/main/java/io/jans/configapi/plugin/scim/rest/ScimConfigResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...g-api/plugins/scim-plugin/src/main/java/io/jans/configapi/plugin/scim/util/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

}
2 changes: 1 addition & 1 deletion jans-config-api/plugins/scim-plugin/src/test/resources/karate-config-jenkins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion jans-config-api/plugins/scim-plugin/src/test/resources/karate-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion jans-config-api/server/src/main/resources/config-api-rs-protect.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@
]
},
{
"path":"/jans-config-api/scim/config",
"path":"/jans-config-api/scim/scim-config",
"conditions":[
{
"httpMethods":["GET"],
Expand Down