fix(kc-saml-plugin): fixed IDP creation issue, enum values and remove…

…d kc lib dependency (#7238) * fix(kc-saml-plugin): remove kc lib dependency - wip Signed-off-by: pujavs <pujas.works@gmail.com> * fix(kc-saml-plugin): removing dependency of kc lib wip Signed-off-by: pujavs <pujas.works@gmail.com> * fix(kc-saml-plugin): removing dependency of kc lib wip Signed-off-by: pujavs <pujas.works@gmail.com> * fix(config-api) keycloak lib conflict issue Signed-off-by: pujavs <pujas.works@gmail.com> * fix(config-api) keycloak lib conflict issue Signed-off-by: pujavs <pujas.works@gmail.com> * fix(config-api) keycloak lib conflict issue Signed-off-by: pujavs <pujas.works@gmail.com> * fix(config-api) keycloak lib conflict issue Signed-off-by: pujavs <pujas.works@gmail.com> * fix(config-api) keycloak lib conflict issue Signed-off-by: pujavs <pujas.works@gmail.com> * fix(kc-config-api): removing kc lib dependency - wip Signed-off-by: pujavs <pujas.works@gmail.com> * fix(kc-config-api): removing kc lib dependency - wip Signed-off-by: pujavs <pujas.works@gmail.com> * fix(kc-config-api): removing kc lib dependency - wip Signed-off-by: pujavs <pujas.works@gmail.com> * feat(kc-config-api): removed kc lib dependency Signed-off-by: pujavs <pujas.works@gmail.com> * feat(kc-config-api): removed kc lib dependency Signed-off-by: pujavs <pujas.works@gmail.com> * feat(kc-config-api): removed kc lib dependency Signed-off-by: pujavs <pujas.works@gmail.com> * feat(kc-config-api): removed kc lib dependency Signed-off-by: pujavs <pujas.works@gmail.com> * feat(kc-config-api): sync with main Signed-off-by: pujavs <pujas.works@gmail.com> * feat(kc-saml-plugin): sonar code issue fixed Signed-off-by: pujavs <pujas.works@gmail.com> --------- Signed-off-by: pujavs <pujas.works@gmail.com>
JanssenProject · Jan 3, 2024 · d3401e3 · d3401e3
1 parent 0e1099d
commit d3401e3
Show file tree

Hide file tree

Showing 26 changed files with 1,035 additions and 861 deletions.
diff --git a/docs/admin/reference/openapi.md b/docs/admin/reference/openapi.md
@@ -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 
 

diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml
@@ -7862,19 +7862,19 @@ components:
           type: string
         selected:
           type: boolean
-        userCanEdit:
-          type: boolean
         userCanView:
           type: boolean
-        userCanEdit:
+        adminCanEdit:
           type: boolean
         adminCanView:
           type: boolean
-        adminCanEdit:
+        userCanEdit:
+          type: boolean
+        adminCanAccess:
           type: boolean
         userCanAccess:
           type: boolean
-        adminCanAccess:
+        whitePagesCanView:
           type: boolean
         baseDn:
           type: string
@@ -8675,6 +8675,8 @@ components:
           type: boolean
         skipAuthenticationFilterOptionsMethod:
           type: boolean
+        fapi:
+          type: boolean
         allResponseTypesSupported:
           uniqueItems: true
           type: array
@@ -8684,8 +8686,6 @@ components:
             - code
             - token
             - id_token
-        fapi:
-          type: boolean
     AuthenticationFilter:
       required:
       - baseDn
@@ -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:
@@ -9412,6 +9422,10 @@ components:
           type: string
         introspectionEncryptedResponseEnc:
           type: string
+        authorizationDetailsTypes:
+          type: array
+          items:
+            type: string
     CustomObjectAttribute:
       type: object
       properties:
@@ -9867,29 +9881,29 @@ components:
     PostgresMessageConfiguration:
       type: object
       properties:
-        jdbc.driver.class-name:
+        driverClassName:
           type: string
-        db-schema-name:
+        dbSchemaName:
           type: string
-        connection-uri:
+        connectionUri:
           type: string
-        auth-user-name:
+        authUserName:
           type: string
-        auth-user-password:
+        authUserPassword:
           type: string
-        connection-pool-max-total:
+        connectionPoolMaxTotal:
           type: integer
           format: int32
-        connection-pool-max-idle:
+        connectionPoolMaxIdle:
           type: integer
           format: int32
-        connection-pool-min-idle:
+        connectionPoolMinIdle:
           type: integer
           format: int32
-        message-wait-millis:
+        messageWaitMillis:
           type: integer
           format: int32
-        message-sleep-thread-millis:
+        messageSleepThreadTime:
           type: integer
           format: int32
     RedisMessageConfiguration:

diff --git a/jans-config-api/plugins/docs/kc-saml-plugin-swagger.yaml b/jans-config-api/plugins/docs/kc-saml-plugin-swagger.yaml
@@ -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
@@ -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
@@ -517,7 +517,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/JsonNode'
+                type: string
         "401":
           description: Unauthorized
         "500":
@@ -857,7 +857,7 @@ components:
           type: string
         enabled:
           type: boolean
-        signingCertificates:
+        signingCertificate:
           type: string
         validateSignature:
           type: string
@@ -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:
@@ -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:

diff --git a/jans-config-api/plugins/kc-saml-plugin/pom.xml b/jans-config-api/plugins/kc-saml-plugin/pom.xml
@@ -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>
@@ -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>

diff --git a/jans-config-api/plugins/kc-saml-plugin/src/main/assembly/assembly.xml b/jans-config-api/plugins/kc-saml-plugin/src/main/assembly/assembly.xml
@@ -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>