feat: implement resolve trust chain

Sphereon-Opensource · Oct 8, 2024 · 371223f · 371223f
1 parent 1c90e8d
commit 371223f
Show file tree

Hide file tree

Showing 22 changed files with 276 additions and 1,929 deletions.
diff --git a/modules/local-kms/build.gradle.kts b/modules/local-kms/build.gradle.kts
@@ -1,6 +1,3 @@
-import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
-import kotlin.apply
-
 plugins {
     kotlin("multiplatform") version "2.0.0"
     id("app.cash.sqldelight") version "2.0.2"
@@ -52,18 +49,10 @@ kotlin {
             }
         }
 
-//        jsMain {
-//            dependencies {
-//                implementation(npm("typescript", "5.5.3"))
-//                implementation(npm("jose", "5.6.3"))
-//                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
-//            }
-//        }
-
         jvmTest {
             dependencies {
                 implementation(kotlin("test-junit"))
             }
         }
     }
-}
+}
diff --git a/modules/local-kms/src/commonMain/kotlin/com/sphereon/oid/fed/kms/local/Constants.kt b/modules/local-kms/src/commonMain/kotlin/com/sphereon/oid/fed/kms/local/Constants.kt
@@ -6,7 +6,5 @@ class Constants {
         const val LOCAL_KMS_DATASOURCE_USER = "LOCAL_KMS_DATASOURCE_USER"
         const val LOCAL_KMS_DATASOURCE_PASSWORD = "LOCAL_KMS_DATASOURCE_PASSWORD"
         const val SQLITE_IS_NOT_SUPPORTED_IN_JVM = "SQLite is not supported in JVM"
-        const val SQLITE_IS_NOT_SUPPORTED_IN_JS = "SQLite is not supported in JS"
-        const val POSTGRESQL_IS_NOT_SUPPORTED_IN_JS = "PostgreSQL is not supported in JS"
     }
 }
diff --git a/modules/local-kms/src/commonMain/kotlin/com/sphereon/oid/fed/kms/local/LocalKms.kt b/modules/local-kms/src/commonMain/kotlin/com/sphereon/oid/fed/kms/local/LocalKms.kt
@@ -33,7 +33,7 @@ class LocalKms {
 
         val jwkObject: Jwk = Json.decodeFromString(aesEncryption.decrypt(jwk.key))
 
-        val mHeader = header.copy(alg = jwkObject.alg, kid = jwkObject.kid)
+        val mHeader = header.copy(alg = jwkObject.alg, kid = jwkObject.kid!!)
 
         return sign(header = mHeader, payload = payload, key = jwkObject)
     }

diff --git a/...ocal-kms/src/jsMain/kotlin/com/sphereon/oid/fed/kms/local/database/LocalKmsDatabase.js.kt b/...ocal-kms/src/jsMain/kotlin/com/sphereon/oid/fed/kms/local/database/LocalKmsDatabase.js.kt
diff --git a/.../local-kms/src/jsMain/kotlin/com/sphereon/oid/fed/kms/local/database/PlatformSqlDriver.kt b/.../local-kms/src/jsMain/kotlin/com/sphereon/oid/fed/kms/local/database/PlatformSqlDriver.kt
diff --git a/modules/local-kms/src/jsMain/kotlin/com/sphereon/oid/fed/kms/local/jwk/Jwk.kt b/modules/local-kms/src/jsMain/kotlin/com/sphereon/oid/fed/kms/local/jwk/Jwk.kt
diff --git a/modules/local-kms/src/jsMain/kotlin/com/sphereon/oid/fed/kms/local/jwt/JoseJwt.js.kt b/modules/local-kms/src/jsMain/kotlin/com/sphereon/oid/fed/kms/local/jwt/JoseJwt.js.kt
diff --git a/modules/openapi/src/commonMain/kotlin/com/sphereon/oid/fed/openapi/openapi.yaml b/modules/openapi/src/commonMain/kotlin/com/sphereon/oid/fed/openapi/openapi.yaml
@@ -1829,6 +1829,8 @@ components:
       type: object
       x-tags:
         - federation
+      required:
+        - kid
       properties:
         alg:
           type: string

diff --git a/modules/openid-federation-client/build.gradle.kts b/modules/openid-federation-client/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
-//    alias(libs.plugins.androidLibrary)
     kotlin("plugin.serialization") version "2.0.0"
 }
 
@@ -34,19 +33,6 @@ kotlin {
         }
     }
 
-    // wasmJs is not available yet for ktor until v3.x is released which is still in alpha
-
-//    androidTarget {
-//        @OptIn(ExperimentalKotlinGradlePluginApi::class)
-//        compilerOptions {
-//            jvmTarget.set(JvmTarget.JVM_11)
-//        }
-//    }
-
-//    iosX64()
-//    iosArm64()
-//    iosSimulatorArm64()
-
     sourceSets {
 
         all {
@@ -67,112 +53,16 @@ kotlin {
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.1")
                 implementation(libs.kermit.logging)
                 implementation(libs.kotlinx.datetime)
-                implementation(project(":modules:openid-federation-common"))
             }
         }
         val commonTest by getting {
             dependencies {
+                implementation(libs.kotlin.test)
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
                 implementation("io.ktor:ktor-client-mock:$ktorVersion")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0-RC")
             }
         }
-        val jvmMain by getting {
-            dependencies {
-                implementation("io.ktor:ktor-client-core-jvm:$ktorVersion")
-                runtimeOnly("io.ktor:ktor-client-cio-jvm:$ktorVersion")
-                implementation(project(":modules:openid-federation-common"))
-            }
-        }
-        val jvmTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit"))
-                implementation("com.nimbusds:nimbus-jose-jwt:9.40")
-            }
-        }
-//  TODO Should be placed back at a later point in time: https://sphereon.atlassian.net/browse/OIDF-50
-//        val androidMain by getting {
-//            dependencies {
-//                implementation("io.ktor:ktor-client-core-jvm:$ktorVersion")
-//                implementation("io.ktor:ktor-client-cio-jvm:$ktorVersion")
-//            }
-//        }
-//        val androidUnitTest by getting {
-//            dependencies {
-//                implementation(kotlin("test-junit"))
-//            }
-//        }
-
-//        val iosMain by creating {
-//            dependsOn(commonMain)
-//        }
-//        val iosX64Main by getting {
-//            dependsOn(iosMain)
-//            dependencies {
-//                implementation("io.ktor:ktor-client-core-iosx64:$ktorVersion")
-//                implementation("io.ktor:ktor-client-cio-iosx64:$ktorVersion")
-//            }
-//        }
-//        val iosArm64Main by getting {
-//            dependsOn(iosMain)
-//            dependencies {
-//                implementation("io.ktor:ktor-client-core-iosarm64:$ktorVersion")
-//                implementation("io.ktor:ktor-client-cio-iosarm64:$ktorVersion")
-//            }
-//        }
-//        val iosSimulatorArm64Main by getting {
-//            dependsOn(iosMain)
-//            dependencies {
-//                implementation("io.ktor:ktor-client-core-iossimulatorarm64:$ktorVersion")
-//                implementation("io.ktor:ktor-client-cio-iossimulatorarm64:$ktorVersion")
-//            }
-//        }
-//
-//        val iosTest by creating {
-//            dependsOn(commonTest)
-//            dependencies {
-//                implementation(kotlin("test"))
-//            }
-//        }
-
-        val jsMain by getting {
-            dependencies {
-                runtimeOnly("io.ktor:ktor-client-core-js:$ktorVersion")
-                runtimeOnly("io.ktor:ktor-client-js:$ktorVersion")
-                implementation(npm("typescript", "5.5.3"))
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0-RC")
-                implementation(project(":modules:openid-federation-common"))
-            }
-        }
-
-        val jsTest by getting {
-            dependencies {
-                implementation(kotlin("test-js"))
-                implementation(npm("jose", "5.6.3"))
-                implementation(kotlin("test-annotations-common"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0-RC")
-            }
-        }
     }
 }
-
-//tasks.register("printSdkLocation") {
-//    doLast {
-//        println("Android SDK Location: ${android.sdkDirectory}")
-//    }
-//}
-//
-//android {
-//    namespace = "com.sphereon.oid.fed.common"
-//    compileSdk = libs.versions.android.compileSdk.get().toInt()
-//    compileOptions {
-//        sourceCompatibility = JavaVersion.VERSION_11
-//        targetCompatibility = JavaVersion.VERSION_11
-//    }
-//    defaultConfig {
-//        minSdk = libs.versions.android.minSdk.get().toInt()
-//    }
-//}
-