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(kc-saml-plugin): fixed IDP creation issue, enum values and removed kc lib dependency #7238

Merged
merged 26 commits into from
Jan 3, 2024
Merged

fix(kc-saml-plugin): fixed IDP creation issue, enum values and removed kc lib dependency #7238

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
564241f
fix(kc-saml-plugin): remove kc lib dependency - wip
pujavs Dec 27, 2023
7e5db38
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Dec 28, 2023
c64cc58
fix(kc-saml-plugin): removing dependency of kc lib wip
pujavs Dec 28, 2023
2c3e11e
fix(kc-saml-plugin): removing dependency of kc lib wip
pujavs Dec 28, 2023
4e69482
fix(config-api) keycloak lib conflict issue
pujavs Dec 29, 2023
2e0e53d
fix(config-api) keycloak lib conflict issue
pujavs Dec 29, 2023
3640052
fix(config-api) keycloak lib conflict issue
pujavs Dec 29, 2023
d20392b
fix(config-api) keycloak lib conflict issue
pujavs Dec 29, 2023
6318fe4
fix(config-api) keycloak lib conflict issue
pujavs Dec 29, 2023
9bd5ae5
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 1, 2024
5de05ca
fix(kc-config-api): removing kc lib dependency - wip
pujavs Jan 1, 2024
9a0e889
fix(kc-config-api): removing kc lib dependency - wip
pujavs Jan 1, 2024
30b2d4c
fix(kc-config-api): removing kc lib dependency - wip
pujavs Jan 1, 2024
d54c7f4
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 2, 2024
cf1880b
feat(kc-config-api): removed kc lib dependency
pujavs Jan 2, 2024
185b3c1
feat(kc-config-api): removed kc lib dependency
pujavs Jan 2, 2024
06ad38c
feat(kc-config-api): removed kc lib dependency
pujavs Jan 2, 2024
c7e3a9a
feat(kc-config-api): removed kc lib dependency
pujavs Jan 2, 2024
bc186a3
feat(kc-config-api): sync with main
pujavs Jan 2, 2024
ab4799d
feat(kc-config-api): sync with main
pujavs Jan 2, 2024
e63ef9e
feat(kc-saml-plugin): sonar code issue fixed
pujavs Jan 2, 2024
dd0a9e6
feat(kc-saml-plugin): saml plugin config changes
pujavs Jan 3, 2024
ba617e3
feat(kc-saml-plugin): spec changes
pujavs Jan 3, 2024
cef74d9
feat(kc-saml-plugin): saml config changes
pujavs Jan 3, 2024
ab703d2
feat(kc-saml-plugin): saml config changes
pujavs Jan 3, 2024
a8ef70d
Merge branch 'main' into jans-config-fix
devrimyatar Jan 3, 2024
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
1 change: 1 addition & 0 deletions docs/admin/reference/openapi.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Follow the links below to access respective documentation.
| Jans Core | NA |
| Jans FIDO 2 | [Swagger](https://gluu.org/swagger-ui/?url=https://raw.githubusercontent.com/JanssenProject/jans/vreplace-janssen-version/jans-fido2/docs/jansFido2Swagger.yaml) |
| Jans SCIM API | [Swagger](https://gluu.org/swagger-ui/?url=https://raw.githubusercontent.com/JanssenProject/jans/vreplace-janssen-version/jans-scim/server/src/main/resources/jans-scim-openapi.yaml) |
| Jans KC SAML API | [Swagger](https://gluu.org/swagger-ui/?url=https://raw.githubusercontent.com/JanssenProject/jans/main/jans-config-api/plugins/docs/kc-saml-plugin-swagger.yaml) |

## Javadocs

Expand Down
26 changes: 20 additions & 6 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 @@ -7862,19 +7862,19 @@ components:
type: string
selected:
type: boolean
userCanEdit:
type: boolean
userCanView:
whitePagesCanView:
type: boolean
adminCanView:
type: boolean
adminCanEdit:
type: boolean
userCanAccess:
userCanEdit:
type: boolean
userCanView:
type: boolean
adminCanAccess:
type: boolean
whitePagesCanView:
userCanAccess:
type: boolean
baseDn:
type: string
Expand Down Expand Up @@ -9195,6 +9195,16 @@ components:
type: string
tokenEndpointAuthMethod:
type: string
format: enum
enum:
- client_secret_basic
- client_secret_post
- client_secret_jwt
- private_key_jwt
- access_token
- tls_client_auth
- self_signed_tls_client_auth
- none
tokenEndpointAuthSigningAlg:
type: string
defaultMaxAge:
Expand Down Expand Up @@ -9412,6 +9422,10 @@ components:
type: string
introspectionEncryptedResponseEnc:
type: string
authorizationDetailsTypes:
type: array
items:
type: string
CustomObjectAttribute:
type: object
properties:
Expand Down Expand Up @@ -9857,7 +9871,7 @@ components:
messageProviderType:
type: string
enum:
- DISABLED
- "NULL"
- REDIS
- POSTGRES
redisConfiguration:
Expand Down
38 changes: 27 additions & 11 deletions jans-config-api/plugins/docs/kc-saml-plugin-swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,13 +469,13 @@ paths:
security:
- oauth2:
- https://jans.io/idp/saml.readonly
/kc/saml/idp/sp-metadata-file/{inum}:
/kc/saml/idp/sp-metadata/{inum}:
get:
tags:
- SAML - Identity Broker
summary: Get SAML SP Metadata Endpoint URL
description: Get SAML SP Metadata Endpoint URL
operationId: get-saml-sp-metadata-url
summary: Get SAML SP Metadata as Json
description: Get SAML SP Metadata as Json
operationId: get-saml-sp-metadata-json
parameters:
- name: inum
in: path
Expand All @@ -489,21 +489,21 @@ paths:
content:
application/json:
schema:
type: string
$ref: '#/components/schemas/JsonNode'
"401":
description: Unauthorized
"500":
description: InternalServerError
security:
- oauth2:
- https://jans.io/idp/saml.readonly
/kc/saml/idp/sp-metadata/{inum}:
/kc/saml/idp/sp-metadata-file/{inum}:
get:
tags:
- SAML - Identity Broker
summary: Get SAML SP Metadata as Json
description: Get SAML SP Metadata as Json
operationId: get-saml-sp-metadata-json
summary: Get SAML SP Metadata Endpoint URL
description: Get SAML SP Metadata Endpoint URL
operationId: get-saml-sp-metadata-url
parameters:
- name: inum
in: path
Expand All @@ -517,7 +517,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/JsonNode'
type: string
"401":
description: Unauthorized
"500":
Expand Down Expand Up @@ -857,7 +857,7 @@ components:
type: string
enabled:
type: boolean
signingCertificates:
signingCertificate:
type: string
validateSignature:
type: string
Expand Down Expand Up @@ -956,12 +956,20 @@ components:
type: string
grantType:
type: string
scope:
type: string
username:
type: string
password:
type: string
spMetadataUrl:
type: string
tokenUrl:
type: string
idpUrl:
type: string
idpMetadataImportUrl:
type: string
idpRootDir:
type: string
idpMetadataDir:
Expand All @@ -986,6 +994,14 @@ components:
type: array
items:
type: string
kcAttributes:
type: array
items:
type: string
kcSamlConfig:
type: array
items:
type: string
JsonPatch:
type: object
ProfileConfiguration:
Expand Down
28 changes: 0 additions & 28 deletions jans-config-api/plugins/kc-saml-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
<httpclient.version>4.5.13</httpclient.version>
<jans.version>${project.version}</jans.version>
<saml.version>3.4.6</saml.version>
<keycloak.version>21.1.1</keycloak.version>
<keycloak.spi.version>22.0.5</keycloak.spi.version>
<mapstruct.version>1.5.3.Final</mapstruct.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -143,32 +140,7 @@
<artifactId>java-support</artifactId>
<version>7.5.2</version>
</dependency>

<!-- keycloak dependencies -->
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-jakarta</artifactId>
<version>${keycloak.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<version>${keycloak.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-common</artifactId>
<version>${keycloak.version}</version>
</dependency>
<!-- end keycloak dependencies-->

<!-- mapstruct-->
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${mapstruct.version}</version>
</dependency>

<!-- Testing -->
<dependency>
<groupId>io.rest-assured</groupId>
Expand Down
4 changes: 0 additions & 4 deletions jans-config-api/plugins/kc-saml-plugin/src/main/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
<include>org.opensaml:opensaml-xmlsec-api</include>
<include>org.opensaml:opensaml-core</include>
<include>net.shibboleth.utilities:java-support</include>
<include>org.mapstruct:mapstruct</include>
<include>org.keycloak:keycloak-admin-client-jakarta</include>
<include>org.keycloak:keycloak-core</include>
<include>org.keycloak:keycloak-common</include>
</includes>
<scope>runtime</scope>
</dependencySet>
Expand Down
Loading