Feature/oidf 15 2 (#34)

* feat: implement entity config builder * feat: implement subordinate relationship create * feat: implement published entity configuration statement persistence * feat: implement published entity configuration statement persistence * fix: entity configuration database constraint * feat: implement entity configuration metadata * fix: add return on end of files * fix: add return on end of files * fix: return constants on errors
Sphereon-Opensource · Aug 21, 2024 · f1293da · f1293da
1 parent efbee24
commit f1293da
Show file tree

Hide file tree

Showing 38 changed files with 857 additions and 840 deletions.
diff --git a/.env b/.env
@@ -3,3 +3,4 @@ DATASOURCE_USER=openid-federation-db-user
 DATASOURCE_PASSWORD=openid-federation-db-password
 DATASOURCE_DB=openid-federation-db
 APP_KEY=Nit5tWts42QeCynT1Q476LyStDeSd4xb
+ROOT_IDENTIFIER=http://localhost:8080
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -13,7 +13,7 @@ services:
     networks:
       - openid_network
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d ${DATASOURCE_DB} -U ${DATASOURCE_USER}"]
+      test: [ "CMD-SHELL", "pg_isready -d ${DATASOURCE_DB} -U ${DATASOURCE_USER}" ]
       interval: 3s
       timeout: 5s
       retries: 20

diff --git a/modules/admin-server/build.gradle.kts b/modules/admin-server/build.gradle.kts
@@ -30,6 +30,7 @@ dependencies {
     testImplementation(libs.testcontainer.postgres)
     runtimeOnly(libs.postgres)
     runtimeOnly(libs.springboot.devtools)
+    implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.11")
 }
 
 kotlin {

diff --git a/...in/com/sphereon/oid/fed/server/admin/controllers/EntityConfigurationMetadataController.kt b/...in/com/sphereon/oid/fed/server/admin/controllers/EntityConfigurationMetadataController.kt
@@ -0,0 +1,39 @@
+package com.sphereon.oid.fed.server.admin.controllers
+
+import com.sphereon.oid.fed.openapi.models.CreateMetadataDTO
+import com.sphereon.oid.fed.persistence.models.EntityConfigurationMetadata
+import com.sphereon.oid.fed.services.EntityConfigurationMetadataService
+import org.springframework.web.bind.annotation.*
+
+@RestController
+@RequestMapping("/accounts/{accountUsername}/metadata")
+class EntityConfigurationMetadataController {
+    private val entityConfigurationMetadataService = EntityConfigurationMetadataService()
+
+    @GetMapping
+    fun get(
+        @PathVariable accountUsername: String
+    ): Array<EntityConfigurationMetadata> {
+        return entityConfigurationMetadataService.findByAccountUsername(accountUsername)
+    }
+
+    @PostMapping
+    fun create(
+        @PathVariable accountUsername: String,
+        @RequestBody metadata: CreateMetadataDTO
+    ): EntityConfigurationMetadata {
+        return entityConfigurationMetadataService.createEntityConfigurationMetadata(
+            accountUsername,
+            metadata.key,
+            metadata.value
+        )
+    }
+
+    @DeleteMapping("/{id}")
+    fun delete(
+        @PathVariable accountUsername: String,
+        @PathVariable id: Int
+    ): EntityConfigurationMetadata {
+        return entityConfigurationMetadataService.deleteEntityConfigurationMetadata(accountUsername, id)
+    }
+}
diff --git a/...rc/main/kotlin/com/sphereon/oid/fed/server/admin/controllers/EntityStatementController.kt b/...rc/main/kotlin/com/sphereon/oid/fed/server/admin/controllers/EntityStatementController.kt
@@ -0,0 +1,21 @@
+package com.sphereon.oid.fed.server.admin.controllers
+
+import com.sphereon.oid.fed.openapi.models.EntityConfigurationStatement
+import com.sphereon.oid.fed.services.EntityStatementService
+import org.springframework.web.bind.annotation.*
+
+@RestController
+@RequestMapping("/accounts/{accountUsername}/entity-statement")
+class EntityStatementController {
+    private val entityStatementService = EntityStatementService()
+
+    @GetMapping
+    fun getEntityStatement(@PathVariable accountUsername: String): EntityConfigurationStatement {
+        return entityStatementService.findByUsername(accountUsername)
+    }
+
+    @PostMapping
+    fun publishEntityStatement(@PathVariable accountUsername: String): EntityConfigurationStatement {
+        return entityStatementService.publishByUsername(accountUsername)
+    }
+}
diff --git a/...min-server/src/main/kotlin/com/sphereon/oid/fed/server/admin/controllers/KeyController.kt b/...min-server/src/main/kotlin/com/sphereon/oid/fed/server/admin/controllers/KeyController.kt
@@ -19,7 +19,7 @@ class KeyController {
     @GetMapping
     fun getKeys(@PathVariable accountUsername: String): List<JwkAdminDTO> {
         val keys = keyService.getKeys(accountUsername)
-        return keys
+        return keys.map { it.toJwkAdminDTO() }
     }
 
     @DeleteMapping("/{keyId}")

diff --git a/...er/src/main/kotlin/com/sphereon/oid/fed/server/admin/controllers/SubordinateController.kt b/...er/src/main/kotlin/com/sphereon/oid/fed/server/admin/controllers/SubordinateController.kt
@@ -1,9 +1,14 @@
 package com.sphereon.oid.fed.server.admin.controllers
 
+import com.sphereon.oid.fed.openapi.models.CreateSubordinateDTO
+import com.sphereon.oid.fed.openapi.models.SubordinateAdminDTO
 import com.sphereon.oid.fed.persistence.models.Subordinate
 import com.sphereon.oid.fed.services.SubordinateService
+import com.sphereon.oid.fed.services.extensions.toSubordinateAdminDTO
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 
@@ -13,7 +18,16 @@ class SubordinateController {
     private val subordinateService = SubordinateService()
 
     @GetMapping
-    fun getSubordinates(@PathVariable accountUsername: String): List<Subordinate> {
-        return subordinateService.findSubordinatesByAccount(accountUsername)
+    fun getSubordinates(@PathVariable accountUsername: String): Array<SubordinateAdminDTO> {
+        return subordinateService.findSubordinatesByAccount(accountUsername).map { it.toSubordinateAdminDTO() }
+            .toTypedArray()
     }
-}
+
+    @PostMapping
+    fun createSubordinate(
+        @PathVariable accountUsername: String,
+        @RequestBody subordinate: CreateSubordinateDTO
+    ): Subordinate {
+        return subordinateService.createSubordinate(accountUsername, subordinate)
+    }
+}
diff --git a/modules/admin-server/src/main/resources/application.properties b/modules/admin-server/src/main/resources/application.properties
@@ -6,4 +6,4 @@ spring.datasource.password=${DATASOURCE_PASSWORD}
 spring.datasource.driver-class-name=org.postgresql.Driver
 # Mapping /actuator/health to /status
 management.endpoints.web.base-path=/
-management.endpoints.web.path-mapping.health=status
+management.endpoints.web.path-mapping.health=status
diff --git a/...rc/main/kotlin/com/sphereon/oid/fed/server/federation/controllers/FederationController.kt b/...rc/main/kotlin/com/sphereon/oid/fed/server/federation/controllers/FederationController.kt
@@ -1,34 +1,50 @@
 package com.sphereon.oid.fed.server.federation.controllers
 
+import com.sphereon.oid.fed.persistence.Persistence
 import com.sphereon.oid.fed.services.SubordinateService
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 
+
 @RestController
 @RequestMapping()
 class FederationController {
+    private val accountQueries = Persistence.accountQueries
+    private val entityConfigurationStatementQueries = Persistence.entityConfigurationStatementQueries
     private val subordinateService = SubordinateService()
 
     @GetMapping("/.well-known/openid-federation")
     fun getRootEntityConfigurationStatement(): String {
-        throw NotImplementedError()
+        val account = accountQueries.findByUsername("root").executeAsOneOrNull()
+            ?: throw IllegalArgumentException("Account not found")
+        val entityConfigurationStatement =
+            entityConfigurationStatementQueries.findLatestByAccountId(account.id).executeAsOneOrNull()
+                ?: throw IllegalArgumentException("Entity Configuration Statement not found")
+
+        return entityConfigurationStatement.statement
     }
 
     @GetMapping("/{username}/.well-known/openid-federation")
     fun getAccountEntityConfigurationStatement(@PathVariable username: String): String {
-        throw NotImplementedError()
+        val account = accountQueries.findByUsername(username).executeAsOneOrNull()
+            ?: throw IllegalArgumentException("Account not found")
+        val entityConfigurationStatement =
+            entityConfigurationStatementQueries.findLatestByAccountId(account.id).executeAsOneOrNull()
+                ?: throw IllegalArgumentException("Entity Configuration Statement not found")
+
+        return entityConfigurationStatement.statement
     }
 
     @GetMapping("/list")
-    fun getRootSubordinatesList(): List<String> {
-        return subordinateService.findSubordinatesByAccountAsList("root")
+    fun getRootSubordinatesList(): Array<String> {
+        return subordinateService.findSubordinatesByAccountAsArray("root")
     }
 
     @GetMapping("/{username}/list")
-    fun getSubordinatesList(@PathVariable username: String): List<String> {
-        return subordinateService.findSubordinatesByAccountAsList(username)
+    fun getSubordinatesList(@PathVariable username: String): Array<String> {
+        return subordinateService.findSubordinatesByAccountAsArray(username)
     }
 
     @GetMapping("/fetch")

diff --git a/modules/federation-server/src/main/resources/application.properties b/modules/federation-server/src/main/resources/application.properties
@@ -5,4 +5,5 @@ spring.datasource.username=${DATASOURCE_USER}
 spring.datasource.password=${DATASOURCE_PASSWORD}
 # Mapping /actuator/health to /status
 management.endpoints.web.base-path=/
-management.endpoints.web.path-mapping.health=status
+management.endpoints.web.path-mapping.health=status
+server.port=8080
diff --git a/modules/openapi/build.gradle.kts b/modules/openapi/build.gradle.kts
@@ -60,7 +60,8 @@ kotlin {
                 outputDir.set("$projectDir/build/generated")
                 configOptions.set(
                     mapOf(
-                        "dateLibrary" to "string"
+                        "dateLibrary" to "string",
+                        "collectionType" to "array",
                     )
                 )