feat(bpdm-cert): updated application version with enabling feature of…

… open id scheme
SujitMBRDI · Jan 9, 2024 · 447020f · 447020f
1 parent db07590
commit 447020f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.eclipse.tractusx</groupId>
     <artifactId>bpdm-certificate-management</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.0.4-SNAPSHOT</version>
     <name>bpdm-certificate-management</name>
     <description>bpdm-certificate-management</description>
 

diff --git a/...main/kotlin/org/eclipse/tractusx/bpdmcertificatemanagement/config/OpenApiConfiguration.kt b/...main/kotlin/org/eclipse/tractusx/bpdmcertificatemanagement/config/OpenApiConfiguration.kt
@@ -22,8 +22,7 @@ package org.eclipse.tractusx.bpdmcertificatemanagement.config
 import io.swagger.v3.oas.models.Components
 import io.swagger.v3.oas.models.OpenAPI
 import io.swagger.v3.oas.models.info.Info
-import io.swagger.v3.oas.models.security.SecurityRequirement
-import io.swagger.v3.oas.models.security.SecurityScheme
+import io.swagger.v3.oas.models.security.*
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
@@ -42,27 +41,27 @@ class OpenApiConfiguration (
     private fun OpenAPI.withSecurity(): OpenAPI {
         return this.components(
             Components()
-//                .addSecuritySchemes(
-//                    "open_id_scheme",
-//                    SecurityScheme().type(SecurityScheme.Type.OAUTH2).flows(
-//                        OAuthFlows().authorizationCode(
-//                            OAuthFlow().authorizationUrl(securityProperties.authUrl)
-//                                .tokenUrl(securityProperties.tokenUrl)
-//                                .refreshUrl(securityProperties.refreshUrl)
-//                                .scopes(Scopes())
-//                        ).clientCredentials(
-//                            OAuthFlow().tokenUrl(securityProperties.tokenUrl)
-//                        )
-//                    )
-//                )
+                .addSecuritySchemes(
+                    "open_id_scheme",
+                    SecurityScheme().type(SecurityScheme.Type.OAUTH2).flows(
+                        OAuthFlows().authorizationCode(
+                            OAuthFlow().authorizationUrl(securityProperties.authUrl)
+                                .tokenUrl(securityProperties.tokenUrl)
+                                .refreshUrl(securityProperties.refreshUrl)
+                                .scopes(Scopes())
+                        ).clientCredentials(
+                            OAuthFlow().tokenUrl(securityProperties.tokenUrl)
+                        )
+                    )
+                )
                 .addSecuritySchemes(
                     "bearer_scheme",
                     SecurityScheme().type(SecurityScheme.Type.HTTP)
                         .scheme("bearer")
                         .bearerFormat("JWT")
                 )
         )
-            //.addSecurityItem(SecurityRequirement().addList("open_id_scheme", emptyList()))
+            .addSecurityItem(SecurityRequirement().addList("open_id_scheme", emptyList()))
             .addSecurityItem(SecurityRequirement().addList("bearer_scheme", emptyList()))
     }
 

diff --git a/src/main/kotlin/org/eclipse/tractusx/bpdmcertificatemanagement/controller/MetadataApi.kt b/src/main/kotlin/org/eclipse/tractusx/bpdmcertificatemanagement/controller/MetadataApi.kt
@@ -62,7 +62,7 @@ interface MetadataApi {
         description = "Get a list of all currently registered certificate types.",
         responses = [
             ApiResponse(responseCode = "200", description = "List of registered certificate types, or can be empty"),
-            ApiResponse(responseCode = "400", description = "Malformed URL")
+            ApiResponse(responseCode = "400", description = "Malformed URL", content = [Content()])
         ]
     )
     @GetMapping("/certificate-types")

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -24,7 +24,8 @@ bpdm-cert:
     name: "BPDM Certificate Management"
     description: "Service that manages and shares business partner certificates"
     version: "0.0.1"
-
+    datasource:
+        host: localhost
     security:
         enabled: false
 
@@ -43,7 +44,7 @@ spring:
     datasource:
         driverClassName: org.postgresql.Driver
         password: ''
-        url: jdbc:postgresql://localhost:5432/bpdm_certificates
+        url: jdbc:postgresql://${bpdm-cert.datasource.host}:5432/bpdm_certificates
         username: bpdm_certificates
     # Flyway configuration
     flyway: