From 6c617fcea259c0bd5eae39c2beb7ee403971e957 Mon Sep 17 00:00:00 2001 From: waltkb <68587968+waltkb@users.noreply.github.com> Date: Mon, 17 Feb 2025 23:04:56 +0100 Subject: [PATCH 1/6] Update dependencies, fix build issues --- .run/Verifier.run.xml | 26 ++-- build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 +- .../waltid-android/build.gradle.kts | 7 +- .../waltid-cli/build.gradle.kts | 20 +-- .../cli/commands/WaltIdVCVerifyCmdTest.kt | 6 +- .../shared/build.gradle.kts | 4 +- .../auth/waltid-idpkit/build.gradle.kts | 12 +- .../src/main/kotlin/id/walt/idp/poc/App.kt | 29 +--- .../auth/waltid-ktor-authnz/build.gradle.kts | 16 +- .../docs/new-auth-method.md | 8 +- .../auth/KtorAuthnzAuthenticationHelpers.kt | 20 +-- .../methods/AuthenticationMethod.kt | 16 +- .../id/walt/ktorauthnz/methods/EmailPass.kt | 11 +- .../kotlin/id/walt/ktorauthnz/methods/JWT.kt | 9 +- .../id/walt/ktorauthnz/methods/Kerberos.kt | 6 +- .../kotlin/id/walt/ktorauthnz/methods/LDAP.kt | 9 +- .../kotlin/id/walt/ktorauthnz/methods/OIDC.kt | 13 +- .../id/walt/ktorauthnz/methods/RADIUS.kt | 10 +- .../kotlin/id/walt/ktorauthnz/methods/TOTP.kt | 7 +- .../id/walt/ktorauthnz/methods/UserPass.kt | 9 +- .../methods/VerifiableCredential.kt | 11 +- .../kotlin/id/walt/ktorauthnz/methods/Web3.kt | 9 +- .../methods/virtual/GlobalIdentify.kt | 2 +- .../methods/virtual/IdentifyEmail.kt | 4 +- .../id/walt/AuthFlowExampleApplication.kt | 6 +- .../src/test/kotlin/id/walt/ExampleWeb.kt | 40 ++--- .../kotlin/id/walt/KtorAuthnzDevMockedTest.kt | 6 +- .../src/test/kotlin/id/walt/RouteCollector.kt | 70 ++++----- .../kotlin/id/walt/web/plugins/Monitoring.kt | 2 +- .../kotlin/id/walt/web/plugins/OpenApi.kt | 2 +- .../auth/waltid-permissions/build.gradle.kts | 6 +- .../build.gradle.kts | 8 +- .../waltid-mdoc-credentials/build.gradle.kts | 13 +- .../build.gradle.kts | 16 +- .../build.gradle.kts | 20 +-- .../policies/DynamicPolicyVerificationTest.kt | 9 +- .../waltid-crypto-android/build.gradle.kts | 10 +- .../crypto/waltid-crypto-aws/build.gradle.kts | 8 +- .../crypto/waltid-crypto-ios/build.gradle.kts | 1 + .../crypto/waltid-crypto-oci/build.gradle.kts | 20 +-- .../crypto/waltid-crypto/build.gradle.kts | 30 ++-- .../kotlin/id/walt/crypto/keys/tse/TSEKey.kt | 1 - .../crypto/waltid-target-ios/build.gradle.kts | 5 +- .../waltid-openid4vc/build.gradle.kts | 24 +-- .../sdjwt/waltid-sdjwt-ios/build.gradle.kts | 1 + .../sdjwt/waltid-sdjwt/build.gradle.kts | 8 +- .../util/waltid-reporting/build.gradle.kts | 16 +- .../waltid-core-wallet/build.gradle.kts | 17 +- waltid-libraries/waltid-did/build.gradle.kts | 25 +-- .../did/dids/document/DidCheqdDocument.kt | 2 +- .../local/cheqd/DidCheqdRegistrar.kt | 20 ++- .../didstates/{action => }/ActionDidState.kt | 20 ++- .../didstates/{finished => }/DidDocument.kt | 3 +- .../cheqd/models/job/didstates/DidState.kt | 7 +- .../didstates/{failed => }/FailedDidState.kt | 3 +- .../{finished => }/FinishedDidState.kt | 4 +- .../models/job/didstates/action/Secret.kt | 12 -- .../job/didstates/action/SigningRequest.kt | 15 -- .../dids/resolver/local/DidCheqdResolver.kt | 2 +- .../kotlin/LocalDidWebConsistencyTest.kt | 17 +- .../src/jvmTest/kotlin/TestServer.kt | 13 +- .../registrars/DidCheqdRegistrarTest.kt | 3 + .../jvmTest/resources/simplelogger.properties | 4 + .../waltid-java-compat/build.gradle.kts | 1 + .../waltid-library-commons/build.gradle.kts | 2 +- .../waltid-e2e-tests/build.gradle.kts | 15 +- .../waltid-issuer-api/build.gradle.kts | 12 +- .../id/walt/issuer/NewTestOidcMetadata.kt | 2 +- .../id/walt/issuer/entra/EntraIssuanceApi.kt | 4 +- .../id/walt/issuer/issuance/IssuerApi.kt | 145 +++++++----------- .../kotlin/id/walt/issuer/issuance/OidcApi.kt | 2 +- .../id/walt/issuer/issuance2/NewApiStub.kt | 2 +- .../LspPotentialIssuanceInterop.kt | 4 +- .../id/walt/issuer/web/plugins/Monitoring.kt | 3 +- .../build.gradle.kts | 6 +- .../waltid-service-commons/build.gradle.kts | 24 +-- .../logging/setups/TraceLoggingSetup.kt | 2 +- .../modules/FeatureFlagInformationModule.kt | 4 +- .../walt/commons/web/modules/OpenApiModule.kt | 14 +- .../modules/ServiceHealthchecksDebugModule.kt | 6 +- .../walt/commons/web/plugins/StatusPages.kt | 2 + .../waltid-verifier-api/build.gradle.kts | 10 +- .../kotlin/id/walt/verifier/VerifierApi.kt | 118 ++++++-------- .../walt/verifier/entra/EntraVerifierApi.kt | 24 +-- .../LspPotentialVerificationInterop.kt | 4 +- .../walt/verifier/web/plugins/Monitoring.kt | 2 +- .../waltid-wallet-api/build.gradle.kts | 30 ++-- .../id/walt/webwallet/FeatureCatalog.kt | 3 +- .../main/kotlin/id/walt/webwallet/db/Db.kt | 2 +- .../id/walt/webwallet/db/KotlinxUUIDTable.kt | 11 +- .../webwallet/db/models/WalletCredentials.kt | 9 +- .../db/models/WallletNotifications.kt | 1 - .../webwallet/service/SSIKit2WalletService.kt | 1 - .../webwallet/service/WalletServiceManager.kt | 11 +- .../account/authnz/AuthenticationService.kt | 10 +- .../service/account/x5c/X5CAccountStrategy.kt | 5 +- .../service/credentials/CredentialsService.kt | 8 +- .../walt/webwallet/service/dids/DidService.kt | 6 +- .../endpoint/EntraServiceEndpointProvider.kt | 2 +- .../webwallet/service/events/EventService.kt | 5 +- .../exchange/CredentialOfferProcessor.kt | 18 +-- .../service/exchange/IssuanceService.kt | 11 +- .../exchange/ProcessedCredentialOffer.kt | 6 +- .../exchange/ProofOfPossessionFactory.kt | 80 +++++----- .../webwallet/service/keys/KeysService.kt | 3 +- .../notifications/NotificationService.kt | 5 +- .../service/oidc4vc/TestCredentialWallet.kt | 10 +- .../webwallet/service/push/PushManager.kt | 1 - .../service/settings/SettingsService.kt | 5 +- .../webwallet/usecase/claim/ClaimCommons.kt | 28 ++-- .../claim/ExternalSignatureClaimStrategy.kt | 2 +- .../usecase/claim/SilentClaimStrategy.kt | 2 +- .../entity/EntityNameResolutionUseCase.kt | 2 +- .../usecase/issuer/IssuerUseCaseImpl.kt | 6 +- .../notification/NotificationFilterUseCase.kt | 2 +- .../web/controllers/AccountController.kt | 4 +- .../web/controllers/CategoryController.kt | 23 +-- .../web/controllers/CredentialController.kt | 42 ++--- .../web/controllers/DidController.kt | 23 +-- .../webwallet/web/controllers/DidCreation.kt | 38 ++--- .../controllers/DidWebRegistryController.kt | 6 +- .../web/controllers/EventLogController.kt | 10 +- .../web/controllers/HistoryController.kt | 7 +- .../web/controllers/IssuersController.kt | 26 ++-- .../web/controllers/KeyController.kt | 59 +++---- .../web/controllers/ManifestController.kt | 16 +- .../web/controllers/NotificationController.kt | 12 +- .../web/controllers/ReasonController.kt | 2 +- .../web/controllers/ReportsController.kt | 6 +- .../controllers/SilentExchangeController.kt | 4 +- .../web/controllers/TrustController.kt | 2 +- .../web/controllers/UtilityController.kt | 35 +++-- .../controllers/WalletSettingsController.kt | 15 +- .../web/controllers/Web3Controller.kt | 20 +-- .../web/controllers/auth/AuthController.kt | 43 +++--- .../web/controllers/auth/Controller.kt | 6 +- .../web/controllers/auth/DefaultAuthRoutes.kt | 4 +- .../controllers/auth/KtorAuthnzController.kt | 7 +- .../auth/KtorAuthnzFrontendController.kt | 8 +- .../controllers/auth/LoginControllerBase.kt | 4 +- .../controllers/auth/LogoutControllerBase.kt | 8 +- .../auth/RegisterControllerBase.kt | 6 +- .../auth/keycloak/KeycloakLogoutController.kt | 7 +- .../auth/oidc/OidcLogoutController.kt | 7 +- .../exchange/ExchangeController.kt | 47 +++--- .../ExchangeExternalSignaturesController.kt | 46 +++--- .../src/main/resources/example_klogging.conf | 24 +-- .../src/test/kotlin/E2EWalletTestBase.kt | 2 - ...ltStatusListCredentialFetchStrategyTest.kt | 16 +- .../id/walt/webwallet/utils/PKIXUtilsTest.kt | 6 +- ...n-list-with-status-message-vc-wrapped.json | 14 +- .../revocation-list-with-status-message.json | 11 +- .../build.gradle.kts | 4 +- .../src/main/kotlin/id/walt/NftController.kt | 18 +-- .../main/kotlin/id/walt/plugins/Monitoring.kt | 2 +- 157 files changed, 1008 insertions(+), 1085 deletions(-) rename waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/{action => }/ActionDidState.kt (57%) rename waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/{finished => }/DidDocument.kt (80%) rename waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/{failed => }/FailedDidState.kt (82%) rename waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/{finished => }/FinishedDidState.kt (73%) delete mode 100644 waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/Secret.kt delete mode 100644 waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/SigningRequest.kt create mode 100644 waltid-libraries/waltid-did/src/jvmTest/resources/simplelogger.properties diff --git a/.run/Verifier.run.xml b/.run/Verifier.run.xml index 9f2da2945..3fefd8587 100644 --- a/.run/Verifier.run.xml +++ b/.run/Verifier.run.xml @@ -1,14 +1,14 @@ - - - + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index c9977ea4d..19929cec4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ plugins { kotlin("plugin.serialization") version kotlinVersion apply false - id("love.forte.plugin.suspend-transform") version "2.1.0-0.10.1" apply false + id("love.forte.plugin.suspend-transform") version "2.1.0-0.11.0" apply false id("com.android.library") version "8.7.3" apply false id("com.android.application") version "8.7.3" apply false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b8..cea7a793a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6..f3b75f3b0 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/waltid-applications/waltid-android/build.gradle.kts b/waltid-applications/waltid-android/build.gradle.kts index 6a21e75d4..39ee5b6f8 100644 --- a/waltid-applications/waltid-android/build.gradle.kts +++ b/waltid-applications/waltid-android/build.gradle.kts @@ -3,6 +3,7 @@ plugins { kotlin("android") kotlin("plugin.serialization") kotlin("plugin.compose") + id("com.github.ben-manes.versions") } android { @@ -57,7 +58,7 @@ dependencies { api(project(":waltid-libraries:sdjwt:waltid-sdjwt")) // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // -- Android -- implementation("androidx.biometric:biometric:1.2.0-alpha05") @@ -65,7 +66,7 @@ dependencies { implementation("androidx.navigation:navigation-compose:2.7.7") implementation("androidx.core:core-ktx:1.13.1") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.3") - implementation("androidx.activity:activity-compose:1.9.0") + implementation("androidx.activity:activity-compose:1.10.1") // Compose implementation(platform("androidx.compose:compose-bom:2024.02.01")) @@ -77,7 +78,7 @@ dependencies { // Testing testImplementation(kotlin("test")) - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") testImplementation("junit:junit:4.13.2") testImplementation("androidx.test.ext:junit:1.2.1") testImplementation("androidx.test.espresso:espresso-core:3.6.1") diff --git a/waltid-applications/waltid-cli/build.gradle.kts b/waltid-applications/waltid-cli/build.gradle.kts index 693f9aed6..2316319c8 100644 --- a/waltid-applications/waltid-cli/build.gradle.kts +++ b/waltid-applications/waltid-cli/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget object Versions { - const val KTOR_VERSION = "2.3.12" + const val KTOR_VERSION = "3.1.0" } plugins { @@ -9,7 +9,7 @@ plugins { kotlin("plugin.serialization") id("maven-publish") id("com.github.ben-manes.versions") - id("io.ktor.plugin") version "2.3.12" // Versions.KTOR_VERSION + id("io.ktor.plugin") version "3.1.0" // Versions.KTOR_VERSION // Apply the application plugin to add support for building a CLI application in Java. application } @@ -65,8 +65,8 @@ kotlin { api(project(":waltid-libraries:sdjwt:waltid-sdjwt")) api(project(":waltid-libraries:protocols:waltid-openid4vc")) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") implementation("com.google.code.gson:gson:2.11.0") // CLI @@ -74,16 +74,16 @@ kotlin { implementation("com.github.ajalt.clikt:clikt:4.4.0") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") } } val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { @@ -95,15 +95,15 @@ kotlin { implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") // BouncyCastle for PEM import - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") } } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation("com.wolpl.clikt-testkit:clikt-testkit:2.0.0") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") // Ktor server implementation("io.ktor:ktor-server-core-jvm:${Versions.KTOR_VERSION}") diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCVerifyCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCVerifyCmdTest.kt index 0a8d08293..79993b10d 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCVerifyCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCVerifyCmdTest.kt @@ -56,7 +56,7 @@ class WaltIdVCVerifyCmdTest { val schemaFilePath = "${resourcesPath}/schema/OpenBadgeV3_schema.json" - private val webhookTestServer: NettyApplicationEngine + private val webhookTestServer: EmbeddedServer private val webhookTestServerURL: String private val webhookTestServerSuccessURL: String private val webhookTestServerFailURL: String @@ -78,8 +78,8 @@ class WaltIdVCVerifyCmdTest { } }.start(false) runBlocking { - url = "http://" + webhookTestServer.resolvedConnectors() - .first().host + ":${webhookTestServer.resolvedConnectors().first().port}" + url = "http://" + webhookTestServer.engine.resolvedConnectors() + .first().host + ":${webhookTestServer.engine.resolvedConnectors().first().port}" } webhookTestServerURL = url webhookTestServerSuccessURL = "$webhookTestServerURL/success" diff --git a/waltid-applications/waltid-openid4vc-ios-testApp/shared/build.gradle.kts b/waltid-applications/waltid-openid4vc-ios-testApp/shared/build.gradle.kts index 74d95af4d..6fba93497 100644 --- a/waltid-applications/waltid-openid4vc-ios-testApp/shared/build.gradle.kts +++ b/waltid-applications/waltid-openid4vc-ios-testApp/shared/build.gradle.kts @@ -24,7 +24,7 @@ kotlin { } sourceSets { - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" commonMain.dependencies { implementation(project(":waltid-libraries:sdjwt:waltid-sdjwt")) @@ -53,7 +53,7 @@ kotlin { iosSimulatorArm64Main.dependsOn(this) dependencies { implementation(project(":waltid-libraries:crypto:waltid-crypto-ios")) - implementation("io.ktor:ktor-client-darwin:2.3.12") + implementation("io.ktor:ktor-client-darwin:3.1.0") } } } diff --git a/waltid-libraries/auth/waltid-idpkit/build.gradle.kts b/waltid-libraries/auth/waltid-idpkit/build.gradle.kts index 305443d29..5c3705d1c 100644 --- a/waltid-libraries/auth/waltid-idpkit/build.gradle.kts +++ b/waltid-libraries/auth/waltid-idpkit/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("jvm") - id("io.ktor.plugin") version "2.3.12" + id("io.ktor.plugin") version "3.1.0" kotlin("plugin.serialization") id("maven-publish") @@ -38,8 +38,8 @@ dependencies { implementation("io.ktor:ktor-client-content-negotiation") // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") implementation("com.eygraber:jsonpathkt-kotlinx:3.0.2") // OIDC @@ -47,14 +47,14 @@ dependencies { implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") // for Ed25519 - implementation("com.google.crypto.tink:tink:1.15.0") { + implementation("com.google.crypto.tink:tink:1.16.0") { exclude("org.slf4j.simple") } // Logging - implementation("io.klogging:klogging-jvm:0.7.2") - implementation("io.klogging:slf4j-klogging:0.7.2") + implementation("io.klogging:klogging-jvm:0.9.1") + implementation("io.klogging:slf4j-klogging:0.9.1") testImplementation("io.ktor:ktor-server-test-host-jvm") testImplementation("org.jetbrains.kotlin:kotlin-test-junit") diff --git a/waltid-libraries/auth/waltid-idpkit/src/main/kotlin/id/walt/idp/poc/App.kt b/waltid-libraries/auth/waltid-idpkit/src/main/kotlin/id/walt/idp/poc/App.kt index 0ff4a2c46..3d926cb65 100644 --- a/waltid-libraries/auth/waltid-idpkit/src/main/kotlin/id/walt/idp/poc/App.kt +++ b/waltid-libraries/auth/waltid-idpkit/src/main/kotlin/id/walt/idp/poc/App.kt @@ -24,7 +24,7 @@ import io.ktor.serialization.kotlinx.json.* import io.ktor.server.application.* import io.ktor.server.cio.* import io.ktor.server.engine.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.CallLogging import io.ktor.server.plugins.contentnegotiation.* import io.ktor.server.plugins.doublereceive.* import io.ktor.server.plugins.statuspages.* @@ -107,31 +107,6 @@ fun main() { } } - fun toLogString(subject: Any): String = when (subject) { - is TextContent -> subject.text - is OutputStreamContent -> { - val channel = ByteChannel(true) - runBlocking { - subject.writeTo(channel) - StringBuilder().apply { - while (!channel.isClosedForRead) channel.readUTF8LineTo(this) - }.toString() - } - } - - else -> "???" - } - - suspend fun PipelineContext.logResponseBody(call: ApplicationCall) { - call.response.pipeline.intercept(ApplicationSendPipeline.Engine) { message -> - this@embeddedServer.log.debug("Response Body (${call.request.uri}): ${toLogString(message)}") - } - } - - intercept(ApplicationCallPipeline.Call) { - logResponseBody(call) - } - install(StatusPages) { exception { call, cause -> cause.printStackTrace() @@ -175,7 +150,7 @@ fun Application.test() { routing { get("/jwks") { - context.respond(mapOf( + call.respond(mapOf( "keys" to listOf(key).map { it.toPublicJWK().toJSONObject() } )) } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/build.gradle.kts b/waltid-libraries/auth/waltid-ktor-authnz/build.gradle.kts index 8e5bd3ad7..78cd07b9a 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/build.gradle.kts +++ b/waltid-libraries/auth/waltid-ktor-authnz/build.gradle.kts @@ -4,7 +4,7 @@ plugins { kotlin("jvm") kotlin("plugin.power-assert") kotlin("plugin.serialization") - id("io.ktor.plugin") version "2.3.12" + id("io.ktor.plugin") version "3.1.0" id("maven-publish") application @@ -85,24 +85,24 @@ dependencies { implementation("io.ktor:ktor-serialization-kotlinx-json-jvm") // Ktor server external - implementation("io.github.smiley4:ktor-swagger-ui:3.5.1") + implementation("io.github.smiley4:ktor-swagger-ui:4.1.6") // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") implementation("com.eygraber:jsonpathkt-kotlinx:3.0.2") // Logging - implementation("io.klogging:klogging-jvm:0.7.2") - implementation("io.klogging:slf4j-klogging:0.7.2") + implementation("io.klogging:klogging-jvm:0.9.1") + implementation("io.klogging:slf4j-klogging:0.9.1") /* --- Testing --- */ testImplementation("io.ktor:ktor-client-logging") - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") // Ktor testImplementation("io.ktor:ktor-server-cio-jvm") - testImplementation("io.ktor:ktor-server-tests-jvm") + testImplementation("io.ktor:ktor-server-test-host") // Kotlin testImplementation("org.jetbrains.kotlin:kotlin-test-junit") diff --git a/waltid-libraries/auth/waltid-ktor-authnz/docs/new-auth-method.md b/waltid-libraries/auth/waltid-ktor-authnz/docs/new-auth-method.md index 42922e9a7..b2375d849 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/docs/new-auth-method.md +++ b/waltid-libraries/auth/waltid-ktor-authnz/docs/new-auth-method.md @@ -126,10 +126,10 @@ object MultiStepExample : AuthenticationMethod("multistep-example") { val publicKey: String ) - override fun Route.register(authContext: PipelineContext.() -> AuthContext) { + override fun Route.register(authContext: ApplicationCall.() -> AuthContext) { route("multistep-example") { get("nonce") { // Step 1 - context.respond(makeNonce()) + call.respond(makeNonce()) } post("signed", { // Step 2 @@ -191,7 +191,7 @@ fun Route.globalMultistepExample() { """.trimIndent() val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( tenant = call.request.host(), sessionId = call.parameters["sessionId"], @@ -225,7 +225,7 @@ fun Application.testApp() { post("register-by-identifier") { identifier -> val newAccountId = Uuid.random().toString() KtorAuthnzManager.accountStore.addAccountIdentifierToAccount(newAccountId, identifier) - context.respond(newAccountId) + call.respond(newAccountId) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/auth/KtorAuthnzAuthenticationHelpers.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/auth/KtorAuthnzAuthenticationHelpers.kt index acbac43d3..230f43610 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/auth/KtorAuthnzAuthenticationHelpers.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/auth/KtorAuthnzAuthenticationHelpers.kt @@ -4,25 +4,21 @@ import id.walt.ktorauthnz.KtorAuthnzManager import id.walt.ktorauthnz.sessions.AuthSession import io.ktor.server.application.* import io.ktor.server.auth.* +import io.ktor.server.routing.RoutingContext import io.ktor.util.pipeline.* -fun PipelineContext.getAuthToken(): String { - val token = call.principal()?.name +fun ApplicationCall.getAuthToken(): String { + val token = principal()?.name check(token != null) { "No token for request principal" } return token } // TODO: switch to @OptIn instead of @Deprecated -@Deprecated("Externally provided JWT token cannot resolve to authenticated session") -suspend fun PipelineContext.getAuthenticatedSession(): AuthSession { - val token = getAuthToken() - - return KtorAuthnzManager.tokenHandler.resolveTokenToSession(token) -} -suspend fun PipelineContext.getAuthenticatedAccount(): String { - val token = getAuthToken() +@Deprecated("Externally provided JWT token cannot resolve to authenticated session") +suspend fun RoutingContext.getAuthenticatedSession(): AuthSession = KtorAuthnzManager.tokenHandler.resolveTokenToSession(call.getAuthToken()) +@Deprecated("Externally provided JWT token cannot resolve to authenticated session") +suspend fun PipelineContext.getAuthenticatedSession(): AuthSession = KtorAuthnzManager.tokenHandler.resolveTokenToSession(call.getAuthToken()) - return KtorAuthnzManager.tokenHandler.getTokenAccountId(token) -} +suspend fun ApplicationCall.getAuthenticatedAccount(): String = KtorAuthnzManager.tokenHandler.getTokenAccountId(getAuthToken()) diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/AuthenticationMethod.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/AuthenticationMethod.kt index 8a51db578..7b2e42db7 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/AuthenticationMethod.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/AuthenticationMethod.kt @@ -13,7 +13,6 @@ import id.walt.ktorauthnz.sessions.SessionTokenCookieHandler import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.serialization.EncodeDefault import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable @@ -37,7 +36,7 @@ abstract class AuthenticationMethod(open val id: String) { /** Login routes */ abstract fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? = null ) @@ -81,7 +80,7 @@ abstract class AuthenticationMethod(open val id: String) { * - [supportsRegistration] does this method support automatic registration (set to true) * - [authenticationHandlesRegistration] Login & registration is not a combined step (set to false) */ - open fun Route.registerRegistrationRoutes(authContext: PipelineContext.() -> AuthContext): Unit = + open fun Route.registerRegistrationRoutes(authContext: ApplicationCall.() -> AuthContext): Unit = throw NotImplementedError("Authentication method ${this::class.simpleName} does not offer registration routes. Authentication routes handle registration: $authenticationHandlesRegistration") @@ -98,9 +97,7 @@ abstract class AuthenticationMethod(open val id: String) { return (storedData as? V) ?: error("${storedData::class.simpleName} is not requested ${V::class.simpleName}") } - suspend fun PipelineContext.getSession(authContext: PipelineContext.() -> AuthContext): AuthSession { - val currentContext = authContext.invoke(this) - + private suspend fun sessionForAuthContext(currentContext: AuthContext): AuthSession { val session = if (currentContext.implicitSessionGeneration && currentContext.sessionId == null) { // Implicit session start SessionManager.openImplicitGlobalSession(currentContext.initialFlow!!) @@ -112,6 +109,9 @@ abstract class AuthenticationMethod(open val id: String) { return session } + suspend fun ApplicationCall.getAuthSession(authContext: ApplicationCall.() -> AuthContext): AuthSession = + sessionForAuthContext(currentContext = authContext.invoke(this)) + // Relations open val relatedAuthMethodStoredData: KClass? = null open val relatedAuthMethodConfiguration: KClass? = null @@ -120,7 +120,7 @@ abstract class AuthenticationMethod(open val id: String) { fun Route.registerAuthenticationMethod( method: AuthenticationMethod, - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? = null ) { method.apply { @@ -130,7 +130,7 @@ fun Route.registerAuthenticationMethod( fun Route.registerAuthenticationMethods( methods: List, - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>>? = null ) { methods.forEach { method -> diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/EmailPass.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/EmailPass.kt index 92fbea279..1d386e876 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/EmailPass.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/EmailPass.kt @@ -16,7 +16,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.auth.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -62,24 +61,24 @@ object EmailPass : UserPassBasedAuthMethod("email", usernameName = "email") { data class EmailPassCredentials(val email: String, val password: String) override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("emailpass", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val credential = call.getUsernamePasswordFromRequest() - val identifier = auth(session, credential, context) + val identifier = auth(session, credential, call) - context.handleAuthSuccess(session, identifier.resolveToAccountId()) + call.handleAuthSuccess(session, identifier.resolveToAccountId()) } } - /*override fun Route.registerRegistrationRoutes(authContext: PipelineContext.() -> AuthContext) { + /*override fun Route.registerRegistrationRoutes(authContext: ApplicationCall.() -> AuthContext) { post("emailpass", { request { body() } response { HttpStatusCode.OK to { body() } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/JWT.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/JWT.kt index 3c90869d6..c8fc704fa 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/JWT.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/JWT.kt @@ -13,7 +13,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* object JWT : AuthenticationMethod("jwt") { @@ -30,20 +29,20 @@ object JWT : AuthenticationMethod("jwt") { } override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("jwt", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val config = session.lookupConfiguration(this@JWT) - val jwt = context.receiveText() + val jwt = call.receiveText() val id = auth(jwt, config) - context.handleAuthSuccess(session, id.resolveToAccountId()) + call.handleAuthSuccess(session, id.resolveToAccountId()) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Kerberos.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Kerberos.kt index c3667b445..21ff0343c 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Kerberos.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Kerberos.kt @@ -31,9 +31,9 @@ fun auth(kerberosRealm: String, kerberosKdc: String, servicePrincipal: String, u ) return try { - context.requestMutualAuth(true) - context.requestConf(true) - context.requestInteg(true) + call.requestMutualAuth(true) + call.requestConf(true) + call.requestInteg(true) val token = ByteArray(0) val outToken = context.initSecContext(token, 0, token.size) diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/LDAP.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/LDAP.kt index f4b5c70c7..06e41a6c8 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/LDAP.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/LDAP.kt @@ -13,7 +13,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.auth.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import org.apache.directory.api.ldap.model.exception.LdapException import org.apache.directory.ldap.client.api.LdapConnection import org.apache.directory.ldap.client.api.LdapNetworkConnection @@ -45,20 +44,20 @@ object LDAP : UserPassBasedAuthMethod("ldap") { } override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("ldap", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val credential = call.getUsernamePasswordFromRequest() - val identifier = auth(session, credential, context) + val identifier = auth(session, credential, call) - context.handleAuthSuccess(session, identifier.resolveToAccountId()) + call.handleAuthSuccess(session, identifier.resolveToAccountId()) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/OIDC.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/OIDC.kt index 879dca440..c96943fe6 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/OIDC.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/OIDC.kt @@ -17,7 +17,6 @@ import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.routing.* import io.ktor.server.util.* -import io.ktor.util.pipeline.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json @@ -151,24 +150,24 @@ object OIDC : AuthenticationMethod("oidc") { } override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { route("oidc") { get("auth") { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val config = session.lookupConfiguration(this@OIDC) val oidcAuthSession = createOidcSession(context = Unit, config) - context.respondRedirect(oidcAuthSession.authUrl) + call.respondRedirect(oidcAuthSession.authUrl) } get("callback") { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val config = session.lookupConfiguration(this@OIDC) - val params = context.parameters + val params = call.parameters val code = params.getOrFail("code") val state = params.getOrFail("state") @@ -182,7 +181,7 @@ object OIDC : AuthenticationMethod("oidc") { // TODO: better OIDC Identifier (make sure malicious cannot generate a clash per URL) val identifier = OIDCIdentifier(config.openIdConfiguration.authorizationEndpoint, sub) - context.handleAuthSuccess(session, identifier.resolveToAccountId()) + call.handleAuthSuccess(session, identifier.resolveToAccountId()) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/RADIUS.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/RADIUS.kt index 0e3ac948a..ef6b42abd 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/RADIUS.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/RADIUS.kt @@ -13,7 +13,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.auth.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import org.aaa4j.radius.client.RadiusClient import org.aaa4j.radius.client.clients.UdpRadiusClient import org.aaa4j.radius.core.attribute.StringData @@ -54,21 +53,20 @@ object RADIUS : UserPassBasedAuthMethod("radius") { return identifier } - override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("radius", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val credential = call.getUsernamePasswordFromRequest() - val identifier = auth(session, credential, context) - context.handleAuthSuccess(session, identifier.resolveToAccountId()) + val identifier = auth(session, credential, call) + call.handleAuthSuccess(session, identifier.resolveToAccountId()) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/TOTP.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/TOTP.kt index 75585efcf..3a582cdfb 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/TOTP.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/TOTP.kt @@ -17,7 +17,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.serialization.Serializable object TOTP : AuthenticationMethod("totp") { @@ -40,14 +39,14 @@ object TOTP : AuthenticationMethod("totp") { data class TOTPCode(val code: String) override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("totp", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val otp = when (call.request.contentType()) { ContentType.Application.Json -> call.receive().code @@ -59,7 +58,7 @@ object TOTP : AuthenticationMethod("totp") { auth(session, otp) - context.handleAuthSuccess(session, null) + call.handleAuthSuccess(session, null) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/UserPass.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/UserPass.kt index b77c21577..913f9d7b4 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/UserPass.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/UserPass.kt @@ -16,7 +16,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.auth.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.serialization.Serializable @Serializable @@ -44,20 +43,20 @@ object UserPass : UserPassBasedAuthMethod("userpass") { } override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("userpass", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val credential = call.getUsernamePasswordFromRequest() - val identifier = auth(session, credential, context) + val identifier = auth(session, credential, call) - context.handleAuthSuccess(session, identifier.resolveToAccountId()) + call.handleAuthSuccess(session, identifier.resolveToAccountId()) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/VerifiableCredential.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/VerifiableCredential.kt index 23c04c5ca..520b6ddfc 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/VerifiableCredential.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/VerifiableCredential.kt @@ -20,7 +20,6 @@ import io.ktor.server.request.* import io.ktor.server.response.* import io.ktor.server.routing.* import io.ktor.server.util.* -import io.ktor.util.pipeline.* import kotlinx.serialization.Serializable import kotlinx.serialization.json.* import kotlin.io.encoding.Base64 @@ -33,24 +32,24 @@ object VerifiableCredential : AuthenticationMethod("vc") { val verifierUrl = "http://localhost:7003" override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { route("vc", { }) { get("start-presentation") { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val config = session.lookupConfiguration(this@VerifiableCredential) - val redirectUrl = context.request.uri.removeSuffix("/start-presentation") + "/callback" + val redirectUrl = call.request.uri.removeSuffix("/start-presentation") + "/callback" val resp = Verifier.verify(verifierUrl, config.verification, redirectUrl) - context.respond(resp.presentationRequest) + call.respond(resp.presentationRequest) } get("callback") { - context.respond("handle further...") + call.respond("handle further...") //val session = getSession(authContext) //context.handleAuthSuccess(session, ) } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Web3.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Web3.kt index b2ed0e7e1..b940cd9de 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Web3.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Web3.kt @@ -14,7 +14,6 @@ import io.klogging.logger import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.coroutines.runBlocking import kotlinx.datetime.Clock import kotlinx.serialization.Serializable @@ -119,19 +118,19 @@ object Web3 : AuthenticationMethod("web3") { } override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { route("web3") { get("nonce") { val newNonce = makeNonce() - context.respond(newNonce) + call.respond(newNonce) } post("signed", { request { body() } }) { req -> - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val address = verifySiweLogin(req) val identifier = Web3Identifier(address) @@ -142,7 +141,7 @@ object Web3 : AuthenticationMethod("web3") { registrationFunction.invoke(identifier) } - context.handleAuthSuccess(session, identifierResolved ?: identifier.resolveToAccountId()) + call.handleAuthSuccess(session, identifierResolved ?: identifier.resolveToAccountId()) } } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/GlobalIdentify.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/GlobalIdentify.kt index 79c784f1f..1d204bc16 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/GlobalIdentify.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/GlobalIdentify.kt @@ -9,7 +9,7 @@ import io.ktor.util.pipeline.* object GlobalIdentify : IdentifyVirtualAuth("identify-global") { override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { throw NotImplementedError("This method is internally referenced and not to be used by the caller.") diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/IdentifyEmail.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/IdentifyEmail.kt index 531dd3b44..1e7a4c68d 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/IdentifyEmail.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/IdentifyEmail.kt @@ -18,13 +18,13 @@ object IdentifyEmail : IdentifyVirtualAuth("identify") { @Serializable data class IdentifyEmailRequest(val email: String) - override fun Route.register(authContext: PipelineContext.() -> AuthContext) { + override fun Route.register(authContext: ApplicationCall.() -> AuthContext) { post("identify-email", { request { body() } }) { // TODO: support the others (form, etc) - val email = context.receive().email + val email = call.receive().email val identifier = EmailIdentifier(email) val store = KtorAuthnzManager.accountStore diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/AuthFlowExampleApplication.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/AuthFlowExampleApplication.kt index 16493b8b8..72f01b3d2 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/AuthFlowExampleApplication.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/AuthFlowExampleApplication.kt @@ -47,7 +47,7 @@ fun loggingSetup() { } } -fun startExample(wait: Boolean = true, jwt: Boolean): ApplicationEngine { +fun startExample(wait: Boolean = true, jwt: Boolean): EmbeddedServer { loggingSetup() return embeddedServer(CIO, port = 8088, host = "0.0.0.0", module = { this.module(jwt) }) .start(wait = wait) @@ -63,7 +63,7 @@ fun Application.module(jwt: Boolean) { testApp(jwt) - collectRoutes().forEach { + /*collectRoutes().forEach { println(it) - } + }*/ } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/ExampleWeb.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/ExampleWeb.kt index 70f62d93b..732df7047 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/ExampleWeb.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/ExampleWeb.kt @@ -33,10 +33,10 @@ fun Route.globalMultistepExample() { """.trimIndent() val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"], + tenant = request.host(), + sessionId = parameters["sessionId"], implicitSessionGeneration = true, initialFlow = authFlow ) @@ -59,10 +59,10 @@ fun Route.globalImplicitSingleStep() { val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"], + tenant = request.host(), + sessionId = parameters["sessionId"], implicitSessionGeneration = true, initialFlow = authFlow ) @@ -87,10 +87,10 @@ fun Route.globalImplicitMultiStep() { val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"], + tenant = request.host(), + sessionId = parameters["sessionId"], implicitSessionGeneration = true, initialFlow = authFlow ) @@ -107,10 +107,10 @@ fun Route.globalExplicitMultiStep() { route("global-explicit2") { val methods = listOf(UserPass, TOTP) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"] ?: error("Missing sessionId") + tenant = request.host(), + sessionId = parameters["sessionId"] ?: error("Missing sessionId") ) } @@ -132,7 +132,7 @@ fun Route.globalExplicitMultiStep() { post("start") { val session = SessionManager.openExplicitGlobalSession(authFlow) - context.respond(session.toInformation()) + call.respond(session.toInformation()) } } } @@ -156,10 +156,10 @@ fun Route.globalImplicitVc() { val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"], + tenant = request.host(), + sessionId = parameters["sessionId"], implicitSessionGeneration = true, initialFlow = authFlow ) @@ -184,7 +184,7 @@ fun Route.globalImplicitVc() { val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( tenant = call.request.host(), sessionId = call.parameters["sessionId"], @@ -202,7 +202,7 @@ fun Route.globalImplicitVc() { post("start") { val session = SessionManager.openExplicitGlobalSession(authFlow) - context.respond(session.toInformation()) + call.respond(session.toInformation()) } } }*/ @@ -245,8 +245,8 @@ fun Application.testApp(jwt: Boolean) { authenticate("ktor-authnz") { get("/protected") { - val token = getAuthToken() - val accountId = getAuthenticatedAccount() + val token = call.getAuthToken() + val accountId = call.getAuthenticatedAccount() call.respondText("Hello token ${token}, you are $accountId") } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/KtorAuthnzDevMockedTest.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/KtorAuthnzDevMockedTest.kt index 298240625..bb0f258ab 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/KtorAuthnzDevMockedTest.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/KtorAuthnzDevMockedTest.kt @@ -27,7 +27,7 @@ class KtorAuthnzDevMockedTest { routing { authenticate { get("/protected") { - context.respond("protected") + call.respond("protected") } } } @@ -56,8 +56,8 @@ class KtorAuthnzDevMockedTest { routing { authenticate("dev-auth") { get("/protected") { - val acc = getAuthenticatedAccount() - context.respond("protected! you are: $acc") + val acc = call.getAuthenticatedAccount() + call.respond("protected! you are: $acc") } } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/RouteCollector.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/RouteCollector.kt index 72c0a1bc4..108ab36f6 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/RouteCollector.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/RouteCollector.kt @@ -28,41 +28,41 @@ fun Application.collectRoutes(): List { */ private fun Route.allRoutes(prefix: String = ""): List { val routes = mutableListOf() - - /** - * Checks if the route is a prefix (non-terminal) route. - * A prefix route is identified by having children with specific HTTP method selectors. - * - * @return True if the route is a prefix route, false otherwise. - */ - fun Route.isPrefixRoute(): Boolean { - return this.children.any { it.selector is HttpMethodRouteSelector } - } - - /** - * Recursive function to traverse the route tree and collect terminal routes. - * - * @param currentPath The current path accumulated from the parent routes. - */ - fun Route.collectRoutes(currentPath: String) { - val pathSegment = when (val selector = this.selector) { - is PathSegmentConstantRouteSelector -> "${currentPath}/${selector.value}" - is PathSegmentParameterRouteSelector -> "${currentPath}/{${selector.name}}" - is PathSegmentWildcardRouteSelector -> "${currentPath}/*" - else -> currentPath - } - - // Add the route if it's a terminal route (has an HttpMethodRouteSelector and is not a prefix route). - if (this.selector is HttpMethodRouteSelector && !this.isPrefixRoute()) { - val method = (this.selector as HttpMethodRouteSelector).method.value - routes.add("$method $pathSegment") - } - - // Recursively collect routes from children. - this.children.forEach { it.collectRoutes(pathSegment) } - } - - this.collectRoutes(prefix) +// +// /** +// * Checks if the route is a prefix (non-terminal) route. +// * A prefix route is identified by having children with specific HTTP method selectors. +// * +// * @return True if the route is a prefix route, false otherwise. +// */ +// fun Route.isPrefixRoute(): Boolean { +// return this.children.any { it.selector is HttpMethodRouteSelector } +// } +// +// /** +// * Recursive function to traverse the route tree and collect terminal routes. +// * +// * @param currentPath The current path accumulated from the parent routes. +// */ +// fun Route.collectRoutes(currentPath: String) { +// val pathSegment = when (val selector = this.selector) { +// is PathSegmentConstantRouteSelector -> "${currentPath}/${selector.value}" +// is PathSegmentParameterRouteSelector -> "${currentPath}/{${selector.name}}" +// is PathSegmentWildcardRouteSelector -> "${currentPath}/*" +// else -> currentPath +// } +// +// // Add the route if it's a terminal route (has an HttpMethodRouteSelector and is not a prefix route). +// if (this.selector is HttpMethodRouteSelector && !this.isPrefixRoute()) { +// val method = (this.selector as HttpMethodRouteSelector).method.value +// routes.add("$method $pathSegment") +// } +// +// // Recursively collect routes from children. +// this.children.forEach { it.collectRoutes(pathSegment) } +// } +// +// this.collectRoutes(prefix) return routes.distinct() } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/Monitoring.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/Monitoring.kt index 3616dd9d3..4781b61a3 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/Monitoring.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/Monitoring.kt @@ -2,7 +2,7 @@ package id.walt.web.plugins import io.ktor.http.* import io.ktor.server.application.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.CallLogging import io.ktor.server.plugins.statuspages.* import io.ktor.server.response.* diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/OpenApi.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/OpenApi.kt index 7b991c6bb..b0928f6db 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/OpenApi.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/OpenApi.kt @@ -39,7 +39,7 @@ fun Application.configureOpenApi() { get("/", { summary = "Redirect to swagger interface for API documentation" }) { - context.respondRedirect("swagger") + call.respondRedirect("swagger") } } } diff --git a/waltid-libraries/auth/waltid-permissions/build.gradle.kts b/waltid-libraries/auth/waltid-permissions/build.gradle.kts index de5f59211..7e49c6032 100644 --- a/waltid-libraries/auth/waltid-permissions/build.gradle.kts +++ b/waltid-libraries/auth/waltid-permissions/build.gradle.kts @@ -65,15 +65,15 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") implementation("${SuspendTransPluginConstants.ANNOTATION_GROUP}:${SuspendTransPluginConstants.ANNOTATION_NAME}:${SuspendTransPluginConstants.ANNOTATION_VERSION}") } } val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } } diff --git a/waltid-libraries/credentials/waltid-dif-definitions-parser/build.gradle.kts b/waltid-libraries/credentials/waltid-dif-definitions-parser/build.gradle.kts index a0674332d..d2444570c 100644 --- a/waltid-libraries/credentials/waltid-dif-definitions-parser/build.gradle.kts +++ b/waltid-libraries/credentials/waltid-dif-definitions-parser/build.gradle.kts @@ -52,16 +52,16 @@ kotlin { dependencies { // JSON implementation("com.eygraber:jsonpathkt-kotlinx:3.0.2") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation("io.github.optimumcode:json-schema-validator:0.2.3") implementation(project(":waltid-libraries:credentials:waltid-verifiable-credentials")) // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") } } val commonTest by getting { @@ -71,7 +71,7 @@ kotlin { } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation("org.slf4j:slf4j-simple:2.0.16") } } diff --git a/waltid-libraries/credentials/waltid-mdoc-credentials/build.gradle.kts b/waltid-libraries/credentials/waltid-mdoc-credentials/build.gradle.kts index 3507a6cd4..2492ca874 100644 --- a/waltid-libraries/credentials/waltid-mdoc-credentials/build.gradle.kts +++ b/waltid-libraries/credentials/waltid-mdoc-credentials/build.gradle.kts @@ -3,6 +3,7 @@ plugins { kotlin("plugin.serialization") id("dev.petuska.npm.publish") version "3.4.3" `maven-publish` + id("com.github.ben-manes.versions") } group = "id.walt.mdoc-credentials" @@ -55,10 +56,10 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") //implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.5.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") implementation("com.soywiz.korlibs.krypto:krypto:4.0.10") } } @@ -74,9 +75,9 @@ kotlin { } val jvmTest by getting { dependencies { - implementation("org.bouncycastle:bcprov-lts8on:2.73.6") - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") - implementation("io.mockk:mockk:1.13.11") + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") + implementation("io.mockk:mockk:1.13.16") implementation(kotlin("reflect")) } diff --git a/waltid-libraries/credentials/waltid-verifiable-credentials/build.gradle.kts b/waltid-libraries/credentials/waltid-verifiable-credentials/build.gradle.kts index 3a18a7692..dcda20ec9 100644 --- a/waltid-libraries/credentials/waltid-verifiable-credentials/build.gradle.kts +++ b/waltid-libraries/credentials/waltid-verifiable-credentials/build.gradle.kts @@ -84,12 +84,12 @@ kotlin { iosSimulatorArm64() } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { val commonMain by getting { dependencies { // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation("io.github.optimumcode:json-schema-validator:0.2.3") // Ktor client @@ -101,14 +101,14 @@ kotlin { implementation("io.ktor:ktor-client-logging:$ktor_version") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Kotlinx - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") implementation("app.softwork:kotlinx-uuid-core:0.1.2") // Loggin - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") // walt.id api(project(":waltid-libraries:crypto:waltid-crypto")) @@ -122,7 +122,7 @@ kotlin { val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { @@ -136,9 +136,9 @@ kotlin { } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation("org.slf4j:slf4j-simple:2.0.16") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") } } val jsMain by getting { diff --git a/waltid-libraries/credentials/waltid-verification-policies/build.gradle.kts b/waltid-libraries/credentials/waltid-verification-policies/build.gradle.kts index fa1842617..e5515804b 100644 --- a/waltid-libraries/credentials/waltid-verification-policies/build.gradle.kts +++ b/waltid-libraries/credentials/waltid-verification-policies/build.gradle.kts @@ -61,21 +61,21 @@ kotlin { iosSimulatorArm64() } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { val commonMain by getting { dependencies { implementation("com.eygraber:jsonpathkt-kotlinx:3.0.2") // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1") - implementation("io.github.optimumcode:json-schema-validator:0.2.2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("io.github.optimumcode:json-schema-validator:0.4.0") implementation(project(":waltid-libraries:credentials:waltid-verifiable-credentials")) implementation(project(":waltid-libraries:credentials:waltid-dif-definitions-parser")) implementation(project(":waltid-libraries:sdjwt:waltid-sdjwt")) // Kotlinx - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Ktor client implementation("io.ktor:ktor-client-core:$ktor_version") @@ -86,10 +86,10 @@ kotlin { implementation("io.ktor:ktor-client-logging:$ktor_version") // Loggin - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // suspend-transform plugin annotations (required in the current version to avoid "compileOnly" warning) implementation("${SuspendTransPluginConstants.ANNOTATION_GROUP}:${SuspendTransPluginConstants.ANNOTATION_NAME}:${SuspendTransPluginConstants.ANNOTATION_VERSION}") @@ -98,14 +98,14 @@ kotlin { val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1") - implementation("org.slf4j:slf4j-simple:2.0.13") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0-M2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.slf4j:slf4j-simple:2.0.16") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") } } diff --git a/waltid-libraries/credentials/waltid-verification-policies/src/commonTest/kotlin/id/walt/policies/DynamicPolicyVerificationTest.kt b/waltid-libraries/credentials/waltid-verification-policies/src/commonTest/kotlin/id/walt/policies/DynamicPolicyVerificationTest.kt index 827ac7165..99227ad4c 100644 --- a/waltid-libraries/credentials/waltid-verification-policies/src/commonTest/kotlin/id/walt/policies/DynamicPolicyVerificationTest.kt +++ b/waltid-libraries/credentials/waltid-verification-policies/src/commonTest/kotlin/id/walt/policies/DynamicPolicyVerificationTest.kt @@ -11,7 +11,6 @@ import io.ktor.client.statement.* import io.ktor.http.* import io.ktor.serialization.kotlinx.json.* import kotlinx.coroutines.test.runTest -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.jsonArray @@ -30,8 +29,8 @@ class DynamicPolicyTest { return try { val response: HttpResponse = http.get("http://localhost:8181") response.status == HttpStatusCode.OK - } catch (e: Exception) { - println("Error connecting to OPA server: ${e.message}") + } catch (e: Throwable) { + println("OPA server is not available: ${e.stackTraceToString()}") false } finally { http.close() @@ -42,7 +41,7 @@ class DynamicPolicyTest { @Test fun testPresentationVerificationWithDynamicPolicy() = runTest { if (!isOpaServerRunning()) { - println("Skipping test: OPA server is not running.") + println("Skipping test: OPA server is not available.") return@runTest } DidService.apply { @@ -122,4 +121,4 @@ class DynamicPolicyTest { println("Results: " + x.size) println("OK: ${x.count { it.isSuccess() }}") } -} \ No newline at end of file +} diff --git a/waltid-libraries/crypto/waltid-crypto-android/build.gradle.kts b/waltid-libraries/crypto/waltid-crypto-android/build.gradle.kts index b22f70793..ac86764c9 100644 --- a/waltid-libraries/crypto/waltid-crypto-android/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-crypto-android/build.gradle.kts @@ -88,14 +88,14 @@ kotlin { val androidMain by getting { dependencies { api(project(":waltid-libraries:crypto:waltid-crypto")) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") } } val androidInstrumentedTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") implementation("androidx.test.ext:junit:1.2.1") implementation("androidx.test:runner:1.6.1") implementation("androidx.test:rules:1.6.1") @@ -104,8 +104,8 @@ kotlin { val androidUnitTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.junit.jupiter:junit-jupiter-api:5.11.0") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-api:5.11.4") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") } } publishing { diff --git a/waltid-libraries/crypto/waltid-crypto-aws/build.gradle.kts b/waltid-libraries/crypto/waltid-crypto-aws/build.gradle.kts index 4366a969b..4900eccb2 100644 --- a/waltid-libraries/crypto/waltid-crypto-aws/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-crypto-aws/build.gradle.kts @@ -14,19 +14,19 @@ repositories { dependencies { testImplementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") // walt.id api(project(":waltid-libraries:crypto:waltid-crypto")) // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // AWS - implementation("aws.sdk.kotlin:kms:1.3.91") + implementation("aws.sdk.kotlin:kms:1.4.22") // JOSE implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") diff --git a/waltid-libraries/crypto/waltid-crypto-ios/build.gradle.kts b/waltid-libraries/crypto/waltid-crypto-ios/build.gradle.kts index 06e79c98b..8ab44423c 100644 --- a/waltid-libraries/crypto/waltid-crypto-ios/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-crypto-ios/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") kotlin("native.cocoapods") + id("com.github.ben-manes.versions") } kotlin { diff --git a/waltid-libraries/crypto/waltid-crypto-oci/build.gradle.kts b/waltid-libraries/crypto/waltid-crypto-oci/build.gradle.kts index a49ed9a65..7d0b7383a 100644 --- a/waltid-libraries/crypto/waltid-crypto-oci/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-crypto-oci/build.gradle.kts @@ -74,17 +74,17 @@ kotlin { val commonMain by getting { dependencies { // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Crypto - implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.5.3")) + implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.6.1")) implementation("org.kotlincrypto.hash:sha2") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") // walt.id api(project(":waltid-libraries:crypto:waltid-crypto")) @@ -94,16 +94,16 @@ kotlin { dependencies { implementation(kotlin("test-common")) implementation(kotlin("test-annotations-common")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { dependencies { // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.10.1") // OCI - implementation("com.oracle.oci.sdk:oci-java-sdk-shaded-full:3.49.0") + implementation("com.oracle.oci.sdk:oci-java-sdk-shaded-full:3.57.1") // JOSE implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") @@ -114,15 +114,15 @@ kotlin { } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Logging implementation("org.slf4j:slf4j-simple:2.0.16") // Test implementation(kotlin("test")) - implementation("org.junit.jupiter:junit-jupiter-api:5.11.0") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-api:5.11.4") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") } } // val androidMain by getting { diff --git a/waltid-libraries/crypto/waltid-crypto/build.gradle.kts b/waltid-libraries/crypto/waltid-crypto/build.gradle.kts index a15ffb3d3..2251b2283 100644 --- a/waltid-libraries/crypto/waltid-crypto/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-crypto/build.gradle.kts @@ -86,7 +86,7 @@ kotlin { iosSimulatorArm64() } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { @@ -97,7 +97,7 @@ kotlin { val commonMain by getting { dependencies { // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Ktor client implementation("io.ktor:ktor-client-core:$ktor_version") @@ -107,25 +107,25 @@ kotlin { implementation("io.ktor:ktor-client-json:$ktor_version") implementation("io.ktor:ktor-client-logging:$ktor_version") - implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.5.3")) + implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.6.1")) implementation("org.kotlincrypto.hash:sha2") // Date - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Cache implementation("io.github.reactivecircus.cache4k:cache4k:0.13.0") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") implementation("${SuspendTransPluginConstants.ANNOTATION_GROUP}:${SuspendTransPluginConstants.ANNOTATION_NAME}:${SuspendTransPluginConstants.ANNOTATION_VERSION}") - implementation(platform("org.kotlincrypto.macs:bom:0.5.3")) + implementation(platform("org.kotlincrypto.macs:bom:0.6.1")) implementation("org.kotlincrypto.macs:hmac-sha2") } @@ -134,21 +134,21 @@ kotlin { dependencies { implementation(kotlin("test-common")) implementation(kotlin("test-annotations-common")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { dependencies { - implementation("com.google.crypto.tink:tink:1.15.0") // for JOSE using Ed25519 + implementation("com.google.crypto.tink:tink:1.16.0") // for JOSE using Ed25519 - implementation("org.bouncycastle:bcprov-lts8on:2.73.6") // for secp256k1 (which was removed with Java 17) - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") // PEM import + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") // for secp256k1 (which was removed with Java 17) + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") // PEM import // Ktor client implementation("io.ktor:ktor-client-okhttp:$ktor_version") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.10.1") // JOSE implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") @@ -163,9 +163,9 @@ kotlin { // Test implementation(kotlin("test")) - implementation("org.junit.jupiter:junit-jupiter-api:5.11.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-api:5.11.4") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") } } val jsMain by getting { diff --git a/waltid-libraries/crypto/waltid-crypto/src/commonMain/kotlin/id/walt/crypto/keys/tse/TSEKey.kt b/waltid-libraries/crypto/waltid-crypto/src/commonMain/kotlin/id/walt/crypto/keys/tse/TSEKey.kt index e6d917adf..256fdb6e9 100644 --- a/waltid-libraries/crypto/waltid-crypto/src/commonMain/kotlin/id/walt/crypto/keys/tse/TSEKey.kt +++ b/waltid-libraries/crypto/waltid-crypto/src/commonMain/kotlin/id/walt/crypto/keys/tse/TSEKey.kt @@ -326,7 +326,6 @@ class TSEKey( else -> throw KeyTypeNotSupportedException(type) } - @OptIn(InternalAPI::class) @JvmBlocking @JvmAsync @JsPromise diff --git a/waltid-libraries/crypto/waltid-target-ios/build.gradle.kts b/waltid-libraries/crypto/waltid-target-ios/build.gradle.kts index 719c63fbd..660f3d209 100644 --- a/waltid-libraries/crypto/waltid-target-ios/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-target-ios/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("multiplatform") kotlin("native.cocoapods") kotlin("plugin.serialization") + id("com.github.ben-manes.versions") } kotlin { @@ -55,8 +56,8 @@ kotlin { val commonMain by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") } } diff --git a/waltid-libraries/protocols/waltid-openid4vc/build.gradle.kts b/waltid-libraries/protocols/waltid-openid4vc/build.gradle.kts index a0c29eecf..c829be4ae 100644 --- a/waltid-libraries/protocols/waltid-openid4vc/build.gradle.kts +++ b/waltid-libraries/protocols/waltid-openid4vc/build.gradle.kts @@ -76,7 +76,7 @@ kotlin { iosSimulatorArm64() } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { @@ -86,17 +86,17 @@ kotlin { val commonMain by getting { dependencies { // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // HTTP implementation("io.ktor:ktor-client-core:$ktor_version") implementation("io.ktor:ktor-client-content-negotiation:$ktor_version") implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version") - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // walt.id implementation(project(":waltid-libraries:crypto:waltid-crypto")) @@ -111,10 +111,10 @@ kotlin { implementation("app.softwork:kotlinx-uuid-core:0.1.2") // Multiplatform / Date & time - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Multiplatform / Hashes - implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.5.3")) + implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.6.1")) implementation("org.kotlincrypto.hash:sha2") } } @@ -124,7 +124,7 @@ kotlin { implementation(project(":waltid-libraries:crypto:waltid-crypto")) implementation(project(":waltid-libraries:waltid-did")) implementation(project(":waltid-libraries:credentials:waltid-verifiable-credentials")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { @@ -140,10 +140,10 @@ kotlin { implementation("io.kotest:kotest-runner-junit5:5.9.1") implementation("io.kotest:kotest-assertions-core:5.9.1") implementation("io.kotest:kotest-assertions-json:5.9.1") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") - implementation("com.google.crypto.tink:tink:1.15.0") // for JOSE using Ed25519 - implementation("org.bouncycastle:bcprov-lts8on:2.73.6") // for secp256k1 (which was removed with Java 17) - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") // PEM import + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") + implementation("com.google.crypto.tink:tink:1.16.0") // for JOSE using Ed25519 + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") // for secp256k1 (which was removed with Java 17) + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") // PEM import implementation("io.ktor:ktor-server-core-jvm:$ktor_version") implementation("io.ktor:ktor-server-netty-jvm:$ktor_version") @@ -156,7 +156,7 @@ kotlin { implementation("io.ktor:ktor-client-content-negotiation:$ktor_version") implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version") implementation("io.ktor:ktor-client-logging-jvm:$ktor_version") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.1") implementation("io.ktor:ktor-client-okhttp:$ktor_version") implementation("com.augustcellars.cose:cose-java:1.1.0") diff --git a/waltid-libraries/sdjwt/waltid-sdjwt-ios/build.gradle.kts b/waltid-libraries/sdjwt/waltid-sdjwt-ios/build.gradle.kts index ab4167693..49e00a8fd 100644 --- a/waltid-libraries/sdjwt/waltid-sdjwt-ios/build.gradle.kts +++ b/waltid-libraries/sdjwt/waltid-sdjwt-ios/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("multiplatform") kotlin("native.cocoapods") kotlin("plugin.serialization") + id("com.github.ben-manes.versions") } kotlin { diff --git a/waltid-libraries/sdjwt/waltid-sdjwt/build.gradle.kts b/waltid-libraries/sdjwt/waltid-sdjwt/build.gradle.kts index c050dccd6..f9f51c8f4 100644 --- a/waltid-libraries/sdjwt/waltid-sdjwt/build.gradle.kts +++ b/waltid-libraries/sdjwt/waltid-sdjwt/build.gradle.kts @@ -104,11 +104,11 @@ kotlin { val commonMain by getting { dependencies { implementation("dev.whyoleg.cryptography:cryptography-random:0.3.1") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") implementation("com.soywiz.korlibs.krypto:krypto:4.0.10") - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") } } val commonTest by getting { diff --git a/waltid-libraries/util/waltid-reporting/build.gradle.kts b/waltid-libraries/util/waltid-reporting/build.gradle.kts index 58a80b106..e68716e92 100644 --- a/waltid-libraries/util/waltid-reporting/build.gradle.kts +++ b/waltid-libraries/util/waltid-reporting/build.gradle.kts @@ -46,12 +46,12 @@ kotlin { } } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { val commonMain by getting { dependencies { // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Ktor client implementation("io.ktor:ktor-client-core:$ktor_version") @@ -67,20 +67,20 @@ kotlin { implementation("it.justwrote:kjob-kron:0.2.0")*/ // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // datetime - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") } } val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") - implementation("org.junit.jupiter:junit-jupiter-api:5.11.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") + implementation("org.junit.jupiter:junit-jupiter-api:5.11.4") } } val jvmMain by getting { @@ -97,7 +97,7 @@ kotlin { } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") } } publishing { diff --git a/waltid-libraries/waltid-core-wallet/build.gradle.kts b/waltid-libraries/waltid-core-wallet/build.gradle.kts index faa86686b..3f701d8bc 100644 --- a/waltid-libraries/waltid-core-wallet/build.gradle.kts +++ b/waltid-libraries/waltid-core-wallet/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") id("maven-publish") + id("com.github.ben-manes.versions") } group = "id.walt.wallet" @@ -18,12 +19,12 @@ kotlin { jvmToolchain(21) sourceSets { - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" val commonMain by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") implementation("io.github.oshai:kotlin-logging-jvm:7.0.0") @@ -44,8 +45,8 @@ kotlin { implementation("io.ktor:ktor-client-logging:$ktor_version") // Bouncy Castle - implementation("org.bouncycastle:bcprov-lts8on:2.73.6") - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") // Problematic libraries: implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") @@ -61,13 +62,13 @@ kotlin { val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmTest by getting { dependencies { - implementation("org.junit.jupiter:junit-jupiter-api:5.11.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.junit.jupiter:junit-jupiter-api:5.11.4") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation("org.slf4j:slf4j-simple:2.0.16") } } diff --git a/waltid-libraries/waltid-did/build.gradle.kts b/waltid-libraries/waltid-did/build.gradle.kts index c2bf49c50..9d5deed0a 100644 --- a/waltid-libraries/waltid-did/build.gradle.kts +++ b/waltid-libraries/waltid-did/build.gradle.kts @@ -84,12 +84,12 @@ kotlin { iosSimulatorArm64() } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { val commonMain by getting { dependencies { // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Ktor client implementation("io.ktor:ktor-client-core:$ktor_version") @@ -100,10 +100,10 @@ kotlin { implementation("io.ktor:ktor-client-logging:$ktor_version") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Date - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Uuid implementation("app.softwork:kotlinx-uuid-core:0.1.2") @@ -112,10 +112,11 @@ kotlin { api(project(":waltid-libraries:crypto:waltid-crypto")) // Encodings - implementation("net.thauvin.erik.urlencoder:urlencoder-lib:1.5.0") + implementation("net.thauvin.erik.urlencoder:urlencoder-lib:1.6.0") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") + // suspend-transform plugin annotations (required in the current version to avoid "compileOnly" warning) implementation("${SuspendTransPluginConstants.ANNOTATION_GROUP}:${SuspendTransPluginConstants.ANNOTATION_NAME}:${SuspendTransPluginConstants.ANNOTATION_VERSION}") @@ -124,7 +125,7 @@ kotlin { val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { @@ -141,12 +142,16 @@ kotlin { } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.slf4j:slf4j-simple:2.0.16") + + + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation(kotlin("test")) - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") implementation("io.ktor:ktor-server-test-host:$ktor_version") implementation("io.ktor:ktor-server-content-negotiation:$ktor_version") - implementation("io.ktor:ktor-server-netty:2.3.12") + implementation("io.ktor:ktor-server-netty:$ktor_version") + implementation("io.ktor:ktor-network-tls-certificates:$ktor_version") } } val jsMain by getting { diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidCheqdDocument.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidCheqdDocument.kt index a02f55e06..c386f0864 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidCheqdDocument.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidCheqdDocument.kt @@ -1,7 +1,7 @@ package id.walt.did.dids.document import id.walt.did.dids.DidUtils -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished.DidDocument +import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.DidDocument import kotlinx.serialization.EncodeDefault import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.SerialName diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/DidCheqdRegistrar.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/DidCheqdRegistrar.kt index d471138d1..c94e80bd4 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/DidCheqdRegistrar.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/DidCheqdRegistrar.kt @@ -10,11 +10,11 @@ import id.walt.did.dids.registrar.dids.DidCreateOptions import id.walt.did.dids.registrar.local.LocalRegistrarMethod import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.Secret import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.SigningResponse -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.action.ActionDidState +import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.ActionDidState import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.didStateSerializationModule -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.failed.FailedDidState -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished.DidDocument -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished.FinishedDidState +import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.FailedDidState +import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.DidDocument +import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.FinishedDidState import id.walt.did.dids.registrar.local.cheqd.models.job.request.JobCreateRequest import id.walt.did.dids.registrar.local.cheqd.models.job.request.JobDeactivateRequest import id.walt.did.dids.registrar.local.cheqd.models.job.request.JobSignRequest @@ -24,6 +24,8 @@ import io.github.oshai.kotlinlogging.KotlinLogging import io.ktor.client.* import io.ktor.client.call.* import io.ktor.client.plugins.contentnegotiation.* +import io.ktor.client.plugins.logging.LogLevel +import io.ktor.client.plugins.logging.Logging import io.ktor.client.request.* import io.ktor.client.statement.* import io.ktor.http.* @@ -68,6 +70,9 @@ class DidCheqdRegistrar : LocalRegistrarMethod("cheqd") { install(ContentNegotiation) { json(json) } + install(Logging) { + level = LogLevel.BODY + } } @JvmBlocking @@ -133,11 +138,14 @@ class DidCheqdRegistrar : LocalRegistrarMethod("cheqd") { TODO() } - private suspend fun initiateDidJob(url: String, body: JsonElement) = + private suspend fun initiateDidJob(url: String, body: JsonElement): JobActionResponse = client.post(url) { contentType(ContentType.Application.Json) setBody(body) - }.body() + }.bodyAsText().let { + log.debug { "Try parse Job action response: $it" } + json.decodeFromString(it) + } private suspend fun finalizeDidJob(url: String, jobId: String, verificationMethodId: String, signatures: List) = let { client.post(url) { diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/ActionDidState.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/ActionDidState.kt similarity index 57% rename from waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/ActionDidState.kt rename to waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/ActionDidState.kt index 0f0561d3c..2c2812892 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/ActionDidState.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/ActionDidState.kt @@ -1,6 +1,5 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.action +package id.walt.did.dids.registrar.local.cheqd.models.job.didstates -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.DidState import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlin.js.ExperimentalJsExport @@ -17,4 +16,19 @@ data class ActionDidState( val did: String, val secret: Secret, val signingRequest: List, -) : DidState() +) : DidState() { + @OptIn(ExperimentalJsExport::class) + @Serializable + data class Secret( + val signingResponse: List, + ) + + @OptIn(ExperimentalJsExport::class) + @Serializable + data class SigningRequest( + val alg: String, + val kid: String, + val serializedPayload: String, + val type: String, + ) +} diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/DidDocument.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidDocument.kt similarity index 80% rename from waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/DidDocument.kt rename to waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidDocument.kt index b5ee14132..e67bb49b0 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/DidDocument.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidDocument.kt @@ -1,6 +1,5 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished +package id.walt.did.dids.registrar.local.cheqd.models.job.didstates -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.VerificationMethod import kotlinx.serialization.Serializable import kotlin.js.ExperimentalJsExport import kotlin.js.JsExport diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidState.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidState.kt index ecd2ad571..cc130962c 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidState.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidState.kt @@ -1,8 +1,5 @@ package id.walt.did.dids.registrar.local.cheqd.models.job.didstates -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.action.ActionDidState -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.failed.FailedDidState -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished.FinishedDidState import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Polymorphic import kotlinx.serialization.Serializable @@ -15,10 +12,10 @@ import kotlin.js.JsExport @OptIn(ExperimentalJsExport::class, ExperimentalSerializationApi::class) @JsExport -@Polymorphic +//@Polymorphic @Serializable @JsonClassDiscriminator("state") -abstract class DidState { +sealed class DidState { abstract val state: String } diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/failed/FailedDidState.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FailedDidState.kt similarity index 82% rename from waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/failed/FailedDidState.kt rename to waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FailedDidState.kt index 5bc65b1ca..f2377d276 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/failed/FailedDidState.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FailedDidState.kt @@ -1,6 +1,5 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.failed +package id.walt.did.dids.registrar.local.cheqd.models.job.didstates -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.DidState import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlin.js.ExperimentalJsExport diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/FinishedDidState.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FinishedDidState.kt similarity index 73% rename from waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/FinishedDidState.kt rename to waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FinishedDidState.kt index 2d39909f6..6e2ac2234 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/FinishedDidState.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FinishedDidState.kt @@ -1,7 +1,5 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished +package id.walt.did.dids.registrar.local.cheqd.models.job.didstates -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.DidState -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.Secret import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlin.js.ExperimentalJsExport diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/Secret.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/Secret.kt deleted file mode 100644 index fdce134bc..000000000 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/Secret.kt +++ /dev/null @@ -1,12 +0,0 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.action - -import kotlinx.serialization.Serializable -import kotlin.js.ExperimentalJsExport -import kotlin.js.JsExport - -@OptIn(ExperimentalJsExport::class) -@JsExport -@Serializable -data class Secret( - val signingResponse: List, -) diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/SigningRequest.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/SigningRequest.kt deleted file mode 100644 index 30dc599a2..000000000 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/SigningRequest.kt +++ /dev/null @@ -1,15 +0,0 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.action - -import kotlinx.serialization.Serializable -import kotlin.js.ExperimentalJsExport -import kotlin.js.JsExport - -@OptIn(ExperimentalJsExport::class) -@JsExport -@Serializable -data class SigningRequest( - val alg: String, - val kid: String, - val serializedPayload: String, - val type: String, -) diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/resolver/local/DidCheqdResolver.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/resolver/local/DidCheqdResolver.kt index e6d7b53bd..f0a20c5e1 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/resolver/local/DidCheqdResolver.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/resolver/local/DidCheqdResolver.kt @@ -58,7 +58,7 @@ class DidCheqdResolver : LocalResolverMethod("cheqd") { resolution.jsonObject["didDocument"]?.jsonObject ?: throw IllegalArgumentException("Response for did:cheqd did not contain a DID document!") }.let { - json.decodeFromString( + json.decodeFromString( it.toString() ) } diff --git a/waltid-libraries/waltid-did/src/jvmTest/kotlin/LocalDidWebConsistencyTest.kt b/waltid-libraries/waltid-did/src/jvmTest/kotlin/LocalDidWebConsistencyTest.kt index 8bbe1a80f..02ac18b8e 100644 --- a/waltid-libraries/waltid-did/src/jvmTest/kotlin/LocalDidWebConsistencyTest.kt +++ b/waltid-libraries/waltid-did/src/jvmTest/kotlin/LocalDidWebConsistencyTest.kt @@ -43,7 +43,7 @@ class LocalDidWebConsistencyTest { private val didWebTestEntryList: List private val didWebPathToDocMap = mutableMapOf() - private val didWebTestServer: NettyApplicationEngine + private val didWebTestServer: EmbeddedServer private val keyStoreFile = File(this.javaClass.classLoader.getResource("")!!.path.plus("keystore.jks")) private val keyStore = buildKeyStore { @@ -53,16 +53,14 @@ class LocalDidWebConsistencyTest { subject = X500Principal("CN=localhost, OU=walt.id, O=walt.id, C=AT") } }.also { it.saveToFile(keyStoreFile, "test123") } - private val environment = applicationEngineEnvironment { - envConfig() - } init { didWebTestEntryList = populateTestData() + didWebTestServer = embeddedServer( - Netty, - environment, - ).start(false) + Netty, applicationEnvironment(), { envConfig() }, + module = { module() } + ).start(wait = false) } @AfterTest @@ -102,10 +100,7 @@ class LocalDidWebConsistencyTest { } } - private fun ApplicationEngineEnvironmentBuilder.envConfig() { - module { - module() - } + private fun ApplicationEngine.Configuration.envConfig() { connector { port = 8000 } diff --git a/waltid-libraries/waltid-did/src/jvmTest/kotlin/TestServer.kt b/waltid-libraries/waltid-did/src/jvmTest/kotlin/TestServer.kt index 4a2e84e19..c0b1d1453 100644 --- a/waltid-libraries/waltid-did/src/jvmTest/kotlin/TestServer.kt +++ b/waltid-libraries/waltid-did/src/jvmTest/kotlin/TestServer.kt @@ -35,12 +35,10 @@ object TestServer { subject = X500Principal("CN=localhost, OU=walt.id, O=walt.id, C=AT") } }.also { it.saveToFile(keyStoreFile, "test123") } - private val environment = applicationEngineEnvironment { - envConfig() - } - val server: ApplicationEngine by lazy { + + val server: EmbeddedServer by lazy { println("Initializing embedded webserver...") - embeddedServer(Netty, environment) + embeddedServer(Netty, applicationEnvironment(), { envConfig() }, module = { module() }) } private fun Application.module() { @@ -63,10 +61,7 @@ object TestServer { } } - private fun ApplicationEngineEnvironmentBuilder.envConfig() { - module { - module() - } + private fun ApplicationEngine.Configuration.envConfig() { connector { port = 8000 } diff --git a/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt b/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt index b42ed3d04..98cb33988 100644 --- a/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt +++ b/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt @@ -12,9 +12,11 @@ import org.junit.jupiter.params.provider.Arguments import org.junit.jupiter.params.provider.Arguments.arguments import org.junit.jupiter.params.provider.MethodSource import java.util.stream.Stream +import kotlin.test.Ignore class DidCheqdRegistrarTest : DidRegistrarTestBase(DidCheqdRegistrar()) { + @Ignore @ParameterizedTest @MethodSource override fun `given did options with no key when register then returns a valid did result`( @@ -24,6 +26,7 @@ class DidCheqdRegistrarTest : DidRegistrarTestBase(DidCheqdRegistrar()) { super.`given did options with no key when register then returns a valid did result`(options, assert) } + @Ignore @ParameterizedTest @MethodSource override fun `given did options and key when register with key then returns a valid did result`( diff --git a/waltid-libraries/waltid-did/src/jvmTest/resources/simplelogger.properties b/waltid-libraries/waltid-did/src/jvmTest/resources/simplelogger.properties new file mode 100644 index 000000000..27efa1cfe --- /dev/null +++ b/waltid-libraries/waltid-did/src/jvmTest/resources/simplelogger.properties @@ -0,0 +1,4 @@ +org.slf4j.simpleLogger.showDateTime=true + +org.slf4j.simpleLogger.defaultLogLevel=debug +org.slf4j.simpleLogger.log.id.walt=trace diff --git a/waltid-libraries/waltid-java-compat/build.gradle.kts b/waltid-libraries/waltid-java-compat/build.gradle.kts index 8d2e52eff..1267226e0 100644 --- a/waltid-libraries/waltid-java-compat/build.gradle.kts +++ b/waltid-libraries/waltid-java-compat/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("jvm") id("maven-publish") //`maven-publish` + id("com.github.ben-manes.versions") } group = "id.walt" diff --git a/waltid-libraries/waltid-library-commons/build.gradle.kts b/waltid-libraries/waltid-library-commons/build.gradle.kts index 561a4a906..93a1cfba6 100644 --- a/waltid-libraries/waltid-library-commons/build.gradle.kts +++ b/waltid-libraries/waltid-library-commons/build.gradle.kts @@ -105,7 +105,7 @@ kotlin { dependencies { implementation(kotlin("test-common")) implementation(kotlin("test-annotations-common")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { diff --git a/waltid-services/waltid-e2e-tests/build.gradle.kts b/waltid-services/waltid-e2e-tests/build.gradle.kts index 4227f1835..1e90cf72c 100644 --- a/waltid-services/waltid-e2e-tests/build.gradle.kts +++ b/waltid-services/waltid-e2e-tests/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi plugins { kotlin("jvm") kotlin("plugin.power-assert") + id("com.github.ben-manes.versions") } group = "id.walt" @@ -15,11 +16,11 @@ repositories { dependencies { // Testing testImplementation(kotlin("test")) - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.9.0") - testImplementation("io.ktor:ktor-server-test-host:2.3.12") - testImplementation("io.ktor:ktor-client-cio:2.3.12") - testImplementation("io.ktor:ktor-client-content-negotiation:2.3.12") - testImplementation("io.ktor:ktor-client-logging:2.3.12") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.10.1") + testImplementation("io.ktor:ktor-server-test-host:3.1.0") + testImplementation("io.ktor:ktor-client-cio:3.1.0") + testImplementation("io.ktor:ktor-client-content-negotiation:3.1.0") + testImplementation("io.ktor:ktor-client-logging:3.1.0") // Command line formatting @@ -34,10 +35,10 @@ dependencies { testImplementation("app.softwork:kotlinx-uuid-core:0.1.2") testImplementation("com.nimbusds:nimbus-jose-jwt:9.37.3") testImplementation("com.augustcellars.cose:cose-java:1.1.0") - testImplementation("org.bouncycastle:bcpkix-lts8on:2.73.6") + testImplementation("org.bouncycastle:bcpkix-lts8on:2.73.7") // Multiplatform / Hashes - testImplementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.5.3")) + testImplementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.6.1")) testImplementation("org.kotlincrypto.hash:sha2") } diff --git a/waltid-services/waltid-issuer-api/build.gradle.kts b/waltid-services/waltid-issuer-api/build.gradle.kts index dc9ae9420..81998403e 100644 --- a/waltid-services/waltid-issuer-api/build.gradle.kts +++ b/waltid-services/waltid-issuer-api/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.util.Properties object Versions { - const val KTOR_VERSION = "2.3.12" // also change 1 plugin + const val KTOR_VERSION = "3.1.0" // also change 1 plugin const val COROUTINES_VERSION = "1.9.0" const val HOPLITE_VERSION = "2.8.0" } @@ -12,7 +12,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - id("io.ktor.plugin") version "2.3.12" // Versions.KTOR_VERSION + id("io.ktor.plugin") version "3.1.0" // Versions.KTOR_VERSION id("org.owasp.dependencycheck") version "9.2.0" id("com.github.jk1.dependency-license-report") version "2.9" id("com.github.ben-manes.versions") @@ -66,7 +66,7 @@ dependencies { implementation("io.ktor:ktor-serialization-kotlinx-json-jvm:${Versions.KTOR_VERSION}") // Date - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Coroutines implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.COROUTINES_VERSION}") @@ -80,8 +80,8 @@ dependencies { // Logging implementation("io.github.oshai:kotlin-logging-jvm:7.0.0") implementation("org.slf4j:jul-to-slf4j:2.0.16") - implementation("io.klogging:klogging-jvm:0.7.2") - implementation("io.klogging:slf4j-klogging:0.7.2") + implementation("io.klogging:klogging-jvm:0.9.1") + implementation("io.klogging:slf4j-klogging:0.9.1") // Test testImplementation(kotlin("test")) @@ -106,7 +106,7 @@ dependencies { implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") // Multiplatform / Hashes - testImplementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.5.3")) + testImplementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.6.1")) testImplementation("org.kotlincrypto.hash:sha2") } diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/NewTestOidcMetadata.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/NewTestOidcMetadata.kt index a06b2d74e..1626b8da4 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/NewTestOidcMetadata.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/NewTestOidcMetadata.kt @@ -8,7 +8,7 @@ import io.ktor.serialization.kotlinx.json.* import io.ktor.server.application.* import io.ktor.server.cio.* import io.ktor.server.engine.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.* import io.ktor.server.plugins.contentnegotiation.* import io.ktor.server.response.* import io.ktor.server.routing.* diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/entra/EntraIssuanceApi.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/entra/EntraIssuanceApi.kt index 8bf369459..76a3ca931 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/entra/EntraIssuanceApi.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/entra/EntraIssuanceApi.kt @@ -85,11 +85,11 @@ fun Application.entraIssuance() { body() } }) { - val req = context.receive() + val req = call.receive() val url = EntraIssuanceApi.entraIssuance(req.authorization, req.data) - context.respond(url) + call.respond(url) } } } diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/IssuerApi.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/IssuerApi.kt index 7e0a3efc6..a262f81f1 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/IssuerApi.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/IssuerApi.kt @@ -24,8 +24,6 @@ import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonPrimitive import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive -import redis.clients.jedis.exceptions.JedisAccessControlException -import redis.clients.jedis.exceptions.JedisConnectionException import kotlin.reflect.KClass import kotlin.time.Duration import kotlin.time.Duration.Companion.minutes @@ -40,7 +38,9 @@ suspend fun createCredentialOfferUri( val overwrittenIssuanceRequests = issuanceRequests.map { it.copy( credentialFormat = credentialFormat, - vct = if (credentialFormat == CredentialFormat.sd_jwt_vc) OidcApi.metadata.getVctByCredentialConfigurationId(it.credentialConfigurationId) ?: throw IllegalArgumentException("VCT not found") else null) + vct = if (credentialFormat == CredentialFormat.sd_jwt_vc) OidcApi.metadata.getVctByCredentialConfigurationId(it.credentialConfigurationId) + ?: throw IllegalArgumentException("VCT not found") else null + ) } val issuanceSession = OidcApi.initializeCredentialOffer( @@ -166,7 +166,7 @@ fun Application.issuerApi() { } } }) { - val req = context.receive() + val req = call.receive() val keyConfig = req.key.config?.mapValues { (key, value) -> if (key == "signingKeyPem") { JsonPrimitive(value.jsonPrimitive.content.trimIndent().replace(" ", "")) @@ -200,7 +200,7 @@ fun Application.issuerApi() { } else { serializedKey } - context.respond( + call.respond( HttpStatusCode.OK, IssuerOnboardingResponse(issuanceKey, did) ) } @@ -213,7 +213,7 @@ fun Application.issuerApi() { required = false } - fun PipelineContext.getCallbackUriHeader() = context.request.header("statusCallbackUri") + fun RoutingContext.getCallbackUriHeader() = call.request.header("statusCallbackUri") route("raw") { route("jwt") { @@ -266,15 +266,10 @@ fun Application.issuerApi() { } } }) { - - runCatching { - val body = context.receive() - validateRawSignatureRequest(body) - val signedCredential = executeCredentialSigning(body) - context.respond(HttpStatusCode.OK, signedCredential) - }.onFailure { - throwError(it) - } + val body = call.receive() + validateRawSignatureRequest(body) + val signedCredential = executeCredentialSigning(body) + call.respond(HttpStatusCode.OK, signedCredential) } } } @@ -344,14 +339,14 @@ fun Application.issuerApi() { } } }) { - runCatching { - val jwtIssuanceRequest = context.receive() - val offerUri = createCredentialOfferUri(listOf(jwtIssuanceRequest), getFormatByCredentialConfigurationId(jwtIssuanceRequest.credentialConfigurationId) ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), getCallbackUriHeader()) - context.respond(HttpStatusCode.OK, offerUri) - }.onFailure { - throwError(it) - } - + val jwtIssuanceRequest = call.receive() + val offerUri = createCredentialOfferUri( + listOf(jwtIssuanceRequest), + getFormatByCredentialConfigurationId(jwtIssuanceRequest.credentialConfigurationId) + ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), + getCallbackUriHeader() + ) + call.respond(HttpStatusCode.OK, offerUri) } post("issueBatch", { summary = "Signs a list of credentials and starts an OIDC credential exchange flow." @@ -380,16 +375,15 @@ fun Application.issuerApi() { } } }) { - - - runCatching { - val issuanceRequests = context.receive>() - val offerUri = createCredentialOfferUri(issuanceRequests, getFormatByCredentialConfigurationId(issuanceRequests.first().credentialConfigurationId) ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), getCallbackUriHeader()) - logger.debug { "Offer URI: $offerUri" } - context.respond(HttpStatusCode.OK, offerUri) - }.onFailure { - throwError(it) - } + val issuanceRequests = call.receive>() + val offerUri = createCredentialOfferUri( + issuanceRequests, + getFormatByCredentialConfigurationId(issuanceRequests.first().credentialConfigurationId) + ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), + getCallbackUriHeader() + ) + logger.debug { "Offer URI: $offerUri" } + call.respond(HttpStatusCode.OK, offerUri) } } @@ -407,7 +401,10 @@ fun Application.issuerApi() { example("W3C SD-JWT example", IssuanceExamples.sdJwtW3CExample) example("W3C SD-JWT PDA1 example", IssuanceExamples.sdJwtW3CPDA1Example) example("SD-JWT-VC example", IssuanceExamples.sdJwtVCExample) - example("SD-JWT-VC example featuring selectively disclosable sub and iat claims", IssuanceExamples.sdJwtVCExampleWithSDSub) + example( + "SD-JWT-VC example featuring selectively disclosable sub and iat claims", + IssuanceExamples.sdJwtVCExampleWithSDSub + ) example("SD-JWT-VC example with issuer DID", IssuanceExamples.sdJwtVCWithIssuerDidExample) required = true } @@ -425,20 +422,17 @@ fun Application.issuerApi() { } } }) { - runCatching { - val sdJwtIssuanceRequest = context.receive() - val offerUri = createCredentialOfferUri( - listOf(sdJwtIssuanceRequest), - getFormatByCredentialConfigurationId(sdJwtIssuanceRequest.credentialConfigurationId) ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), - getCallbackUriHeader() - ) + val sdJwtIssuanceRequest = call.receive() + val offerUri = createCredentialOfferUri( + listOf(sdJwtIssuanceRequest), + getFormatByCredentialConfigurationId(sdJwtIssuanceRequest.credentialConfigurationId) + ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), + getCallbackUriHeader() + ) - context.respond( - HttpStatusCode.OK, offerUri - ) - }.onFailure { - throwError(it) - } + call.respond( + HttpStatusCode.OK, offerUri + ) } post("issueBatch", { @@ -468,25 +462,20 @@ fun Application.issuerApi() { } } }) { + val sdJwtIssuanceRequests = call.receive>() + val offerUri = + createCredentialOfferUri( + sdJwtIssuanceRequests, + getFormatByCredentialConfigurationId(sdJwtIssuanceRequests.first().credentialConfigurationId) + ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), + getCallbackUriHeader() + ) + logger.debug { "Offer URI: $offerUri" } - runCatching { - val sdJwtIssuanceRequests = context.receive>() - val offerUri = - createCredentialOfferUri( - sdJwtIssuanceRequests, - getFormatByCredentialConfigurationId(sdJwtIssuanceRequests.first().credentialConfigurationId) ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), - getCallbackUriHeader() - ) - - logger.debug { "Offer URI: $offerUri" } - - context.respond( - HttpStatusCode.OK, offerUri - ) - }.onFailure { - throwError(it) - } + call.respond( + HttpStatusCode.OK, offerUri + ) } } @@ -504,13 +493,15 @@ fun Application.issuerApi() { } } }) { - val mdocIssuanceRequest = context.receive() + val mdocIssuanceRequest = call.receive() val offerUri = createCredentialOfferUri( listOf(mdocIssuanceRequest), - getFormatByCredentialConfigurationId(mdocIssuanceRequest.credentialConfigurationId) ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), - getCallbackUriHeader()) + getFormatByCredentialConfigurationId(mdocIssuanceRequest.credentialConfigurationId) + ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), + getCallbackUriHeader() + ) - context.respond( + call.respond( HttpStatusCode.OK, offerUri ) } @@ -521,24 +512,6 @@ fun Application.issuerApi() { } } -private suspend fun PipelineContext.throwError( - it: Throwable -) { - when (it) { - is JedisConnectionException -> context.respond( - HttpStatusCode.InternalServerError, - "Distributed session management couldn't be initialized : Cannot connect to redis server." - ) - - is JedisAccessControlException -> context.respond( - HttpStatusCode.InternalServerError, - "Distributed session management couldn't be initialized : Cannot access redis server, wrong username/password." - ) - - else -> throw it - } -} - private fun validateRawSignatureRequest(body: JsonObject) { requireNotNull(body["issuerKey"]?.jsonObject) { "Missing issuerKey in the request body." } requireNotNull(body["subjectDid"]?.jsonPrimitive?.content) { "Missing subjectDid in the request body." } diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/OidcApi.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/OidcApi.kt index 20aea5910..235e5eea1 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/OidcApi.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/OidcApi.kt @@ -435,7 +435,7 @@ object OidcApi : CIProvider() { ) } - context.respond(credentialOffer.toJSON()) + call.respond(credentialOffer.toJSON()) } post("{standardVersion}/credential") { diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance2/NewApiStub.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance2/NewApiStub.kt index 906e3aabb..025f67a1c 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance2/NewApiStub.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance2/NewApiStub.kt @@ -38,7 +38,7 @@ object NewApiStub { } } }) { - val issuanceRequest = context.receive() + val issuanceRequest = call.receive() IssuanceOfferManager.makeOfferFor(issuanceRequest) } } diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/lspPotential/LspPotentialIssuanceInterop.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/lspPotential/LspPotentialIssuanceInterop.kt index 893bec1ed..e9a154fb5 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/lspPotential/LspPotentialIssuanceInterop.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/lspPotential/LspPotentialIssuanceInterop.kt @@ -56,7 +56,7 @@ fun Application.lspPotentialIssuanceTestApi() { val offerUri = LspPotentialIssuanceInterop.createInteropSampleCredentialOfferUrimDL( IssuanceExamples.mDLCredentialIssuanceData ) - context.respond( + call.respond( HttpStatusCode.OK, offerUri ) } @@ -64,7 +64,7 @@ fun Application.lspPotentialIssuanceTestApi() { val offerUri = LspPotentialIssuanceInterop.createInteropSampleCredentialOfferUriSdJwt( IssuanceExamples.sdJwtVCData ) - context.respond( + call.respond( HttpStatusCode.OK, offerUri ) } diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/web/plugins/Monitoring.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/web/plugins/Monitoring.kt index d78ac1aea..7b8e86aea 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/web/plugins/Monitoring.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/web/plugins/Monitoring.kt @@ -4,7 +4,8 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.plugins.* import io.ktor.server.plugins.callid.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.CallLogging +import io.ktor.server.plugins.calllogging.processingTimeMillis import io.ktor.server.request.* import org.slf4j.event.Level diff --git a/waltid-services/waltid-service-commons-test/build.gradle.kts b/waltid-services/waltid-service-commons-test/build.gradle.kts index cda32d352..e8e899a28 100644 --- a/waltid-services/waltid-service-commons-test/build.gradle.kts +++ b/waltid-services/waltid-service-commons-test/build.gradle.kts @@ -3,7 +3,7 @@ plugins { kotlin("plugin.serialization") id("maven-publish") - id("com.github.ben-manes.versions") version "0.52.0" + id("com.github.ben-manes.versions") } group = "id.walt" @@ -14,7 +14,7 @@ repositories { } object Versions { - const val KTOR_VERSION = "2.3.12" // also change 1 plugin + const val KTOR_VERSION = "3.1.0" // also change 1 plugin } dependencies { @@ -23,7 +23,7 @@ dependencies { // Testing api(kotlin("test")) api("io.ktor:ktor-server-test-host:${Versions.KTOR_VERSION}") - api("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + api("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") implementation("io.ktor:ktor-client-okhttp-jvm:${Versions.KTOR_VERSION}") implementation("io.ktor:ktor-client-content-negotiation:${Versions.KTOR_VERSION}") diff --git a/waltid-services/waltid-service-commons/build.gradle.kts b/waltid-services/waltid-service-commons/build.gradle.kts index 0aa13b78a..0992040f2 100644 --- a/waltid-services/waltid-service-commons/build.gradle.kts +++ b/waltid-services/waltid-service-commons/build.gradle.kts @@ -3,7 +3,7 @@ plugins { kotlin("plugin.serialization") id("maven-publish") - id("com.github.ben-manes.versions") version "0.52.0" + id("com.github.ben-manes.versions") } group = "id.walt" @@ -14,7 +14,7 @@ repositories { } object Versions { - const val KTOR_VERSION = "2.3.12" // also change 1 plugin + const val KTOR_VERSION = "3.1.0" // also change 1 plugin } dependencies { @@ -30,12 +30,12 @@ dependencies { implementation("io.ktor:ktor-client-okhttp-jvm:${Versions.KTOR_VERSION}") // Logging - api("io.klogging:klogging-jvm:0.7.2") // JVM + ~JS - implementation("io.klogging:slf4j-klogging:0.7.2") + api("io.klogging:klogging-jvm:0.9.1") // JVM + ~JS + implementation("io.klogging:slf4j-klogging:0.9.1") implementation("org.slf4j:jul-to-slf4j:2.0.16") // CLI - api("com.github.ajalt.clikt:clikt:5.0.1") // JVM + api("com.github.ajalt.clikt:clikt:5.0.3") // JVM // Config api("com.sksamuel.hoplite:hoplite-core:2.8.2") @@ -43,17 +43,17 @@ dependencies { api("com.sksamuel.hoplite:hoplite-hikaricp:2.8.2") // Kotlinx.serialization - api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Health checks - api("com.sksamuel.cohort:cohort-ktor:2.5.1") + api("com.sksamuel.cohort:cohort-ktor:2.6.1") // OpenAPI - api("io.github.smiley4:ktor-swagger-ui:3.5.1") - implementation("io.github.smiley4:schema-kenerator-core:1.4.1") + api("io.github.smiley4:ktor-swagger-ui:4.1.6") + /*implementation("io.github.smiley4:schema-kenerator-core:1.4.1") implementation("io.github.smiley4:schema-kenerator-serialization:1.4.1") implementation("io.github.smiley4:schema-kenerator-reflection:1.4.1") - implementation("io.github.smiley4:schema-kenerator-swagger:1.4.1") + implementation("io.github.smiley4:schema-kenerator-swagger:1.4.1")*/ // Persistence api("io.github.reactivecircus.cache4k:cache4k:0.13.0") @@ -62,8 +62,8 @@ dependencies { // Testing testApi(kotlin("test")) - testApi("io.ktor:ktor-server-test-host:2.3.12") - testApi("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + testApi("io.ktor:ktor-server-test-host:3.1.0") + testApi("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } tasks.test { diff --git a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/logging/setups/TraceLoggingSetup.kt b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/logging/setups/TraceLoggingSetup.kt index 91ae6efe8..0a88ab1b5 100644 --- a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/logging/setups/TraceLoggingSetup.kt +++ b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/logging/setups/TraceLoggingSetup.kt @@ -16,7 +16,7 @@ data object TraceLoggingSetup : LoggingSetup("trace", { } } logging { - fromLoggerBase("io.ktor.routing.Routing", stopOnMatch = true) + fromLoggerBase("io.ktor", stopOnMatch = true) fromMinLevel(Level.DEBUG) { toSink("stdout") } diff --git a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/FeatureFlagInformationModule.kt b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/FeatureFlagInformationModule.kt index fa39e86f7..418b52596 100644 --- a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/FeatureFlagInformationModule.kt +++ b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/FeatureFlagInformationModule.kt @@ -39,7 +39,7 @@ object FeatureFlagInformationModule { } } }) { - context.respond(FeatureManager.registeredFeatures.mapValues { it.value.description }) + call.respond(FeatureManager.registeredFeatures.mapValues { it.value.description }) } get("state", { summary = "Show state of features" @@ -57,7 +57,7 @@ object FeatureFlagInformationModule { val defaulted = registered.keys.subtract(enabled.keys).subtract(disabled.keys) .associateWith { registered[it]!!.description } - context.respond( + call.respond( FeatureFlagInformations( enabled = FeatureFlagInformation(enabled), disabled = FeatureFlagInformation(disabled), diff --git a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/OpenApiModule.kt b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/OpenApiModule.kt index 04e7f57c3..14d70ccc7 100644 --- a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/OpenApiModule.kt +++ b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/OpenApiModule.kt @@ -9,13 +9,13 @@ import io.github.smiley4.ktorswaggerui.dsl.config.PluginConfigDsl import io.github.smiley4.ktorswaggerui.dsl.routing.get import io.github.smiley4.ktorswaggerui.routing.openApiSpec import io.github.smiley4.ktorswaggerui.routing.swaggerUI -import io.github.smiley4.schemakenerator.core.connectSubTypes +/*import io.github.smiley4.schemakenerator.core.connectSubTypes import io.github.smiley4.schemakenerator.core.handleNameAnnotation import io.github.smiley4.schemakenerator.reflection.collectSubTypes import io.github.smiley4.schemakenerator.reflection.processReflection import io.github.smiley4.schemakenerator.serialization.processKotlinxSerialization import io.github.smiley4.schemakenerator.swagger.* -import io.github.smiley4.schemakenerator.swagger.data.TitleType +import io.github.smiley4.schemakenerator.swagger.data.TitleType*/ import io.klogging.noCoLogger import io.ktor.server.application.* import io.ktor.server.response.* @@ -39,7 +39,7 @@ object OpenApiModule { var custom: (PluginConfigDsl.() -> Unit)? = null } - private fun KType.processWithKotlinxSerializationGenerator() = processKotlinxSerialization() + /* private fun KType.processWithKotlinxSerializationGenerator() = processKotlinxSerialization() .connectSubTypes() .handleNameAnnotation() .generateSwaggerSchema() @@ -55,7 +55,7 @@ object OpenApiModule { .generateSwaggerSchema() .handleCoreAnnotations() .withTitle(TitleType.SIMPLE) - .compileReferencingRoot() + .compileReferencingRoot()*/ // Module fun Application.enable() { @@ -83,7 +83,7 @@ object OpenApiModule { schemas { val kotlinxPrefixes = listOf("id.walt") - generator = { type -> + /*generator = { type -> if (kotlinxPrefixes.any { type.toString().startsWith(it) }) { runCatching { @@ -96,7 +96,7 @@ object OpenApiModule { error("Could neither parse with kotlinx nor reflection: $type, due to $ex") } } else type.processWithReflectionGenerator() - } + }*/ } info { @@ -151,7 +151,7 @@ object OpenApiModule { get("/", { summary = "Redirect to swagger interface for API documentation" }) { - context.respondRedirect("swagger") + call.respondRedirect("swagger") } } } diff --git a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/ServiceHealthchecksDebugModule.kt b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/ServiceHealthchecksDebugModule.kt index 2145513b0..9d8051bde 100644 --- a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/ServiceHealthchecksDebugModule.kt +++ b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/ServiceHealthchecksDebugModule.kt @@ -109,7 +109,7 @@ object ServiceHealthChecksDebugModule { if (debugConfig.ram) get("ram") { val rt = Runtime.getRuntime() val memory = ManagementFactory.getMemoryMXBean() - context.respond(buildJsonObject { + call.respond(buildJsonObject { put("free", rt.freeMemory()) put("max", rt.maxMemory()) put("total", rt.totalMemory()) @@ -122,7 +122,7 @@ object ServiceHealthChecksDebugModule { if (debugConfig.cpu) get("cpu") { val thread = ManagementFactory.getThreadMXBean() - context.respond(buildJsonObject { + call.respond(buildJsonObject { put("loadAverage", ManagementFactory.getOperatingSystemMXBean().systemLoadAverage) put("processors", ManagementFactory.getOperatingSystemMXBean().availableProcessors) put("threadCount", JsonPrimitive(thread.threadCount)) @@ -132,7 +132,7 @@ object ServiceHealthChecksDebugModule { } if (debugConfig.memoryPool) get("memoryPool") { - context.respond(buildJsonObject { + call.respond(buildJsonObject { ManagementFactory.getMemoryPoolMXBeans().forEach { putJsonObject(it.name) { put("type", JsonPrimitive(it.type.name)) diff --git a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/plugins/StatusPages.kt b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/plugins/StatusPages.kt index 3ef15ff12..80c3f312d 100644 --- a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/plugins/StatusPages.kt +++ b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/plugins/StatusPages.kt @@ -10,6 +10,7 @@ import io.ktor.server.response.* import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonPrimitive import kotlinx.serialization.json.encodeToJsonElement +import redis.clients.jedis.exceptions.JedisException import kotlin.reflect.jvm.jvmName @@ -35,6 +36,7 @@ private fun statusCodeForException(cause: Throwable) = when (cause) { is IllegalArgumentException -> HttpStatusCode.BadRequest is BadRequestException -> HttpStatusCode.BadRequest is IllegalStateException -> HttpStatusCode.InternalServerError + is JedisException -> HttpStatusCode.InternalServerError is WebException -> cause.status else -> HttpStatusCode.InternalServerError } diff --git a/waltid-services/waltid-verifier-api/build.gradle.kts b/waltid-services/waltid-verifier-api/build.gradle.kts index ce31baf11..ff75b0cba 100644 --- a/waltid-services/waltid-verifier-api/build.gradle.kts +++ b/waltid-services/waltid-verifier-api/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.util.Properties object Versions { - const val KTOR_VERSION = "2.3.12" // also change 1 plugin + const val KTOR_VERSION = "3.1.0" // also change 1 plugin const val COROUTINES_VERSION = "1.9.0" const val EXPOSED_VERSION = "0.43.0" const val HOPLITE_VERSION = "2.8.0" @@ -13,7 +13,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - id("io.ktor.plugin") version "2.3.12" // Versions.KTOR_VERSION + id("io.ktor.plugin") version "3.1.0" // Versions.KTOR_VERSION id("org.owasp.dependencycheck") version "9.2.0" id("com.github.jk1.dependency-license-report") version "2.9" id("com.github.ben-manes.versions") @@ -66,7 +66,7 @@ dependencies { implementation("io.ktor:ktor-serialization-kotlinx-json-jvm:${Versions.KTOR_VERSION}") // Date - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Coroutines implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.COROUTINES_VERSION}") @@ -83,8 +83,8 @@ dependencies { // Logging implementation("io.github.oshai:kotlin-logging-jvm:7.0.0") implementation("org.slf4j:jul-to-slf4j:2.0.16") - implementation("io.klogging:klogging-jvm:0.7.2") - implementation("io.klogging:slf4j-klogging:0.7.2") + implementation("io.klogging:klogging-jvm:0.9.1") + implementation("io.klogging:slf4j-klogging:0.9.1") implementation("io.ktor:ktor-client-okhttp-jvm:${Versions.KTOR_VERSION}") diff --git a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApi.kt b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApi.kt index 5df49c4cc..0f071c4ed 100644 --- a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApi.kt +++ b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApi.kt @@ -17,6 +17,7 @@ import id.walt.verifier.config.OIDCVerifierServiceConfig import id.walt.verifier.oidc.RequestSigningCryptoProvider import id.walt.verifier.oidc.SwaggerPresentationSessionInfo import id.walt.verifier.oidc.VerificationUseCase +import id.walt.verifier.oidc.VerificationUseCase.FailedVerificationException import io.github.smiley4.ktorswaggerui.dsl.routing.get import io.github.smiley4.ktorswaggerui.dsl.routing.post import io.github.smiley4.ktorswaggerui.dsl.routing.route @@ -30,14 +31,14 @@ import io.ktor.server.application.* import io.ktor.server.plugins.* import io.ktor.server.request.* import io.ktor.server.response.* +import io.ktor.server.response.respond +import io.ktor.server.response.respondRedirect import io.ktor.server.routing.* import io.ktor.server.util.* import io.ktor.util.* -import io.ktor.util.pipeline.* import kotlinx.coroutines.runBlocking import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.* import kotlin.uuid.ExperimentalUuidApi import kotlin.uuid.Uuid @@ -215,18 +216,18 @@ fun Application.verifierApi() { }) { - val authorizeBaseUrl = context.request.header("authorizeBaseUrl") ?: defaultAuthorizeBaseUrl + val authorizeBaseUrl = call.request.header("authorizeBaseUrl") ?: defaultAuthorizeBaseUrl val responseMode = - context.request.header("responseMode")?.let { ResponseMode.fromString(it) } + call.request.header("responseMode")?.let { ResponseMode.fromString(it) } ?: ResponseMode.direct_post - val successRedirectUri = context.request.header("successRedirectUri") - val errorRedirectUri = context.request.header("errorRedirectUri") - val statusCallbackUri = context.request.header("statusCallbackUri") - val statusCallbackApiKey = context.request.header("statusCallbackApiKey") - val stateId = context.request.header("stateId") - val openId4VPProfile = context.request.header("openId4VPProfile") + val successRedirectUri = call.request.header("successRedirectUri") + val errorRedirectUri = call.request.header("errorRedirectUri") + val statusCallbackUri = call.request.header("statusCallbackUri") + val statusCallbackApiKey = call.request.header("statusCallbackApiKey") + val stateId = call.request.header("stateId") + val openId4VPProfile = call.request.header("openId4VPProfile") - val body = context.receive() + val body = call.receive() val session = verificationUseCase.createSession( vpPoliciesJson = body["vp_policies"], @@ -245,7 +246,7 @@ fun Application.verifierApi() { trustedRootCAs = body["trusted_root_cas"]?.jsonArray ) - context.respond( + call.respond( authorizeBaseUrl.plus("?").plus( when (session.openId4VPProfile) { OpenId4VPProfile.ISO_18013_7_MDOC -> session.authorizationRequest!!.toRequestObjectByReferenceHttpQueryString( @@ -294,11 +295,43 @@ fun Application.verifierApi() { logger.info { "POST verify/state" } val sessionId = call.parameters.getOrFail("state") logger.info { "State: $sessionId" } - verificationUseCase.verify(sessionId, context.request.call.receiveParameters().toMap()) + verificationUseCase.verify(sessionId, call.request.call.receiveParameters().toMap()) .onSuccess { - processVerificationSuccessResult(sessionId, it) + val session = verificationUseCase.getSession(sessionId!!) + if (session.walletInitiatedAuthState != null) { + val state = session.walletInitiatedAuthState + val code = Uuid.random().toString() + call.respondRedirect("openid://?code=$code&state=$state") + } else { + call.respond(HttpStatusCode.OK, it) + } }.onFailure { - processVerificationFailureResult(sessionId, it) + runBlocking { logger.debug(it) { "Verification failed ($it)" } } + val errorDescription = it.message ?: "Verification failed" + runBlocking { logger.error { "Error: $errorDescription" } } + if (sessionId != null) { + val session = verificationUseCase.getSession(sessionId) + if (session.walletInitiatedAuthState != null) { + val state = session.walletInitiatedAuthState + runBlocking { + this@post.call.respondRedirect( + "openid://?state=$state&error=invalid_request&error_description=${getErrorDescription(it)}" + ) + } + } else if (it is FailedVerificationException && it.redirectUrl != null) { + runBlocking { + this@post.call.respond(HttpStatusCode.BadRequest, it.redirectUrl) + } + + } else { + throw it + } + } else { + runBlocking { + logger.error(it) { "/verify error: $errorDescription" } + this@post.call.respond(HttpStatusCode.BadRequest, errorDescription) + } + } }.also { verificationUseCase.notifySubscribers(sessionId) } @@ -464,7 +497,7 @@ fun Application.verifierApi() { }, openId4VPProfile = OpenId4VPProfile.EBSIV3 ) - context.respondRedirect( + call.respondRedirect( "openid://?${ session.authorizationRequest!!.toEbsiRequestObjectByReferenceHttpQueryString( SERVER_URL.let { "$it/openid4vc/request/${session.id}" }) @@ -486,56 +519,3 @@ private fun getErrorDescription(it: Throwable): String? = when (it.message) { else -> null } - -private fun PipelineContext.processError( - sessionId: String, - error: Throwable -) { - val session = verificationUseCase.getSession(sessionId) - if (session.walletInitiatedAuthState != null) { - val state = session.walletInitiatedAuthState - runBlocking { - context.respondRedirect( - "openid://?state=$state&error=invalid_request&error_description=${getErrorDescription(error)}" - ) - } - } else if (error is VerificationUseCase.FailedVerificationException && error.redirectUrl != null) { - runBlocking { - context.respond(HttpStatusCode.BadRequest, error.redirectUrl) - } - - } else { - throw error - } -} - -private fun PipelineContext.processVerificationFailureResult( - sessionId: String?, - error: Throwable, -) { - runBlocking { logger.debug(error) { "Verification failed ($error)" } } - val errorDescription = error.message ?: "Verification failed" - runBlocking { logger.error { "Error: $errorDescription" } } - if (sessionId != null) { - processError(sessionId, error) - } else { - runBlocking { - logger.error(error) { "/verify error: $errorDescription" } - call.respond(HttpStatusCode.BadRequest, errorDescription) - } - } -} - -private suspend fun PipelineContext.processVerificationSuccessResult( - sessionId: String?, - redirectUrl: String, -) { - val session = verificationUseCase.getSession(sessionId!!) - if (session.walletInitiatedAuthState != null) { - val state = session.walletInitiatedAuthState - val code = Uuid.random().toString() - context.respondRedirect("openid://?code=$code&state=$state") - } else { - call.respond(HttpStatusCode.OK, redirectUrl) - } -} diff --git a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/entra/EntraVerifierApi.kt b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/entra/EntraVerifierApi.kt index a4c925fdc..71273a370 100644 --- a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/entra/EntraVerifierApi.kt +++ b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/entra/EntraVerifierApi.kt @@ -204,26 +204,26 @@ fun Application.entraVerifierApi() { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val verifyRequest = context.receive() + val verifyRequest = call.receive() val res = EntraVerifierApi.createPresentationRequest(verifyRequest.entraVerification, verifyRequest.data) - context.respond(res.getOrThrow()) + call.respond(res.getOrThrow()) } post("verification-callback/{nonce}", { tags = listOf("Entra") }) { - val nonce = context.parameters["nonce"]?.let { Uuid.parse(it) } + val nonce = call.parameters["nonce"]?.let { Uuid.parse(it) } println("--- ENTRA CALLBACK ---") - println("Nonce: " + context.parameters["nonce"]) - println("Headers: " + context.request.headers) - //println("Body: " + context.receiveText()) - println("URL: " + context.url()) + println("Nonce: " + call.parameters["nonce"]) + println("Headers: " + call.request.headers) + //println("Body: " + call.receiveText()) + println("URL: " + call.url()) require(EntraVerifierApi.callbackMapping.containsKey(nonce)) { "Invalid nonce: $nonce" } - val body = context.receiveText() + val body = call.receiveText() println("Response: $body") val response = Json.decodeFromString(body) @@ -241,7 +241,7 @@ fun Application.entraVerifierApi() { EntraVerifierApi.policyStatusMapping[nonce!!] = result } - context.respond(HttpStatusCode.OK) + call.respond(HttpStatusCode.OK) } get("status/{nonce}", { @@ -249,7 +249,7 @@ fun Application.entraVerifierApi() { request { pathParameter("nonce") } response { HttpStatusCode.OK to { body() } } }) { - val nonce = context.parameters["nonce"]?.let { Uuid.parse(it) } + val nonce = call.parameters["nonce"]?.let { Uuid.parse(it) } val result = EntraVerifierApi.policyStatusMapping[nonce] @@ -270,8 +270,8 @@ fun Application.entraVerifierApi() { } } - context.respond(output) - } else context.respond(HttpStatusCode.NotFound) + call.respond(output) + } else call.respond(HttpStatusCode.NotFound) } } } diff --git a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/lspPotential/LspPotentialVerificationInterop.kt b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/lspPotential/LspPotentialVerificationInterop.kt index 1c5fed7f4..51ee51ba2 100644 --- a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/lspPotential/LspPotentialVerificationInterop.kt +++ b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/lspPotential/LspPotentialVerificationInterop.kt @@ -108,7 +108,7 @@ fun Application.lspPotentialVerificationTestApi() { } } }) { - val deviceJwk = context.request.call.receiveParameters().toMap()["jwk"] + val deviceJwk = call.request.call.receiveParameters().toMap()["jwk"] val devicePubKey = JWK.parse(deviceJwk!!.first()).toECKey().toPublicKey() val mdoc = MDocBuilder(MDocTypes.ISO_MDL) @@ -145,7 +145,7 @@ fun Application.lspPotentialVerificationTestApi() { } } }) { - val holderJwk = context.request.call.receiveParameters().toMap().get("jwk")!!.first() + val holderJwk = call.request.call.receiveParameters().toMap().get("jwk")!!.first() val sdJwtVc = SDJwtVC.sign( SDPayload.Companion.createSDPayload(buildJsonObject { diff --git a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/web/plugins/Monitoring.kt b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/web/plugins/Monitoring.kt index 25703b929..9a1b16ff5 100644 --- a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/web/plugins/Monitoring.kt +++ b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/web/plugins/Monitoring.kt @@ -3,7 +3,7 @@ package id.walt.verifier.web.plugins import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.plugins.callid.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.CallLogging import io.ktor.server.request.* import org.slf4j.event.Level diff --git a/waltid-services/waltid-wallet-api/build.gradle.kts b/waltid-services/waltid-wallet-api/build.gradle.kts index ce0df445e..61b3d1491 100644 --- a/waltid-services/waltid-wallet-api/build.gradle.kts +++ b/waltid-services/waltid-wallet-api/build.gradle.kts @@ -4,7 +4,7 @@ import java.util.Properties plugins { kotlin("jvm") - id("io.ktor.plugin") version "2.3.12" + id("io.ktor.plugin") version "3.1.0" kotlin("plugin.serialization") id("com.github.ben-manes.versions") } @@ -64,7 +64,7 @@ dependencies { /* -- KTOR -- */ - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" // Ktor server implementation("io.ktor:ktor-server-core-jvm:$ktor_version") implementation("io.ktor:ktor-server-auth-jvm:$ktor_version") @@ -96,13 +96,13 @@ dependencies { /* -- Kotlin -- */ // Kotlinx.serialization - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Date - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Uuid implementation("app.softwork:kotlinx-uuid-core:0.1.2") @@ -110,8 +110,8 @@ dependencies { /* -- Security -- */ // Bouncy Castle - implementation("org.bouncycastle:bcprov-lts8on:2.73.6") - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") // Argon2 implementation("de.mkammerer:argon2-jvm:2.11") @@ -161,9 +161,9 @@ dependencies { implementation("org.jetbrains.exposed:exposed-java-time:0.54.0") implementation("org.jetbrains.exposed:exposed-json:0.54.0") // drivers - implementation("org.xerial:sqlite-jdbc:3.46.1.0") - implementation("org.postgresql:postgresql:42.7.4") - implementation("com.mysql:mysql-connector-j:9.0.0") + implementation("org.xerial:sqlite-jdbc:3.49.0.0") + implementation("org.postgresql:postgresql:42.7.5") + implementation("com.mysql:mysql-connector-j:9.2.0") implementation("com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre11") // Web push @@ -180,15 +180,15 @@ dependencies { // Logging implementation("io.github.oshai:kotlin-logging-jvm:7.0.0") implementation("org.slf4j:jul-to-slf4j:2.0.16") - implementation("io.klogging:klogging-jvm:0.7.2") - implementation("io.klogging:slf4j-klogging:0.7.2") + implementation("io.klogging:klogging-jvm:0.9.1") + implementation("io.klogging:slf4j-klogging:0.9.1") // Test testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4") testImplementation("org.junit.jupiter:junit-jupiter-params:5.11.4") testImplementation(kotlin("test")) - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") - testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") + testImplementation("io.ktor:ktor-server-test-host:$ktor_version") testImplementation("io.mockk:mockk:1.13.16") - testImplementation("io.klogging:klogging-jvm:0.7.2") + testImplementation("io.klogging:klogging-jvm:0.9.1") } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/FeatureCatalog.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/FeatureCatalog.kt index 7002393fb..8a7e4203c 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/FeatureCatalog.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/FeatureCatalog.kt @@ -12,7 +12,8 @@ object FeatureCatalog : ServiceFeatureCatalog { val devModeFeature = OptionalFeature("dev-mode", "Development mode", default = false) val legacyAuthenticationFeature = OptionalFeature("auth", "Legacy authentication system", AuthConfig::class, true) - val ktorAuthnzAuthenticationFeature = OptionalFeature("ktor-authnz", "waltid-ktor-authnz authentication system", KtorAuthnzConfig::class, false) + val ktorAuthnzAuthenticationFeature = + OptionalFeature("ktor-authnz", "waltid-ktor-authnz authentication system", KtorAuthnzConfig::class, false) // val loginsMethodFeature = BaseFeature("logins", "Logins method management", LoginMethodsConfig::class) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/Db.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/Db.kt index ff292462f..6759bda90 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/Db.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/Db.kt @@ -94,7 +94,7 @@ object Db { val accountResult = AccountsService.register(request = EmailAccountRequest("Max Mustermann", "user@email.com", "password")) val accountId = accountResult.getOrNull()?.id!! val walletResult = AccountsService.getAccountWalletMappings("", accountId) - val walletId = walletResult.wallets[0].id + walletResult.wallets[0].id /*CredentialsService().add( wallet = walletId, diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/KotlinxUUIDTable.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/KotlinxUUIDTable.kt index 0af2d8067..71b690f2d 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/KotlinxUUIDTable.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/KotlinxUUIDTable.kt @@ -3,8 +3,9 @@ package id.walt.webwallet.db import app.softwork.uuid.isValidUuidString -import org.jetbrains.exposed.dao.id.* -import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.sql.ColumnType +import org.jetbrains.exposed.sql.Table import org.jetbrains.exposed.sql.vendors.currentDialect import java.nio.ByteBuffer import kotlin.uuid.ExperimentalUuidApi @@ -36,7 +37,7 @@ import kotlin.uuid.toKotlinUuid * Creates a binary column, with the specified [name], for storing Uuids. * Unlike the [Table.uuid] function, this one registers [kotlinx.uuid.Uuid] type instead of [java.util.Uuid]. **/ -public fun Table.kotlinxUuid(name: String): Column { +fun Table.kotlinxUuid(name: String): Column { return registerColumn(name, UuidColumnType()) } @@ -55,7 +56,7 @@ fun Table.typedUUID(name: String, factory: UUIDTypeFactory): Colum * Remember that using a [SecureRandom] may require to seed the system random source * otherwise a system may get stuck. **/ -public fun Column.autoGenerate(): Column = apply { +fun Column.autoGenerate(): Column = apply { defaultValueFun = { Uuid.random() } } @@ -63,7 +64,7 @@ public fun Column.autoGenerate(): Column = apply { * A [Uuid] column type for registering in exposed tables. * @see kotlinxUuid to see how it is used */ -public class UuidColumnType : ColumnType() { +class UuidColumnType : ColumnType() { override fun sqlType(): String = currentDialect.dataTypeProvider.uuidType() override fun valueFromDB(value: Any): Uuid = when { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WalletCredentials.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WalletCredentials.kt index 7fea28dda..54ccac905 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WalletCredentials.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WalletCredentials.kt @@ -61,11 +61,12 @@ data class WalletCredential @OptIn(ExperimentalUuidApi::class) constructor( companion object { fun parseDocument(document: String, id: String, format: CredentialFormat) = runCatching { - when(format) { + when (format) { CredentialFormat.ldp_vc -> Json.parseToJsonElement(document).jsonObject CredentialFormat.jwt_vc, CredentialFormat.sd_jwt_vc, CredentialFormat.jwt_vc_json, CredentialFormat.jwt_vc_json_ld -> document.decodeJws().payload .run { jsonObject["vc"]?.jsonObject ?: jsonObject } + CredentialFormat.mso_mdoc -> MDoc.fromCBORHex(document).toMapElement().toJsonElement().jsonObject else -> throw IllegalArgumentException("Unknown credential format") }?.toMutableMap().also { @@ -97,9 +98,10 @@ data class WalletCredential @OptIn(ExperimentalUuidApi::class) constructor( manifest?.let { JsonUtils.tryGetData(it, "display.card.issuedBy")?.jsonPrimitive?.content } fun parseFullDocument(document: String, disclosures: String?, id: String, format: CredentialFormat) = kotlin.runCatching { - when(format) { + when (format) { CredentialFormat.jwt_vc, CredentialFormat.sd_jwt_vc, CredentialFormat.jwt_vc_json, CredentialFormat.jwt_vc_json_ld -> SDJwt.parse(document + (disclosures?.let { "~$it" } ?: "")).fullPayload + else -> parseDocument(document, id, format) } }.onFailure { it.printStackTrace() } @@ -116,6 +118,7 @@ data class WalletCredential @OptIn(ExperimentalUuidApi::class) constructor( manifest = result[WalletCredentials.manifest], deletedOn = result[WalletCredentials.deletedOn]?.toKotlinInstant(), pending = result[WalletCredentials.pending], - format = CredentialFormat.fromValue(result[WalletCredentials.format]) ?: throw IllegalArgumentException("Credential format couldn't be decoded") + format = CredentialFormat.fromValue(result[WalletCredentials.format]) + ?: throw IllegalArgumentException("Credential format couldn't be decoded") ) } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WallletNotifications.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WallletNotifications.kt index f80b6350e..4365ee439 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WallletNotifications.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WallletNotifications.kt @@ -4,7 +4,6 @@ import id.walt.webwallet.db.kotlinxUuid import kotlinx.datetime.Instant import kotlinx.datetime.toKotlinInstant import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.decodeFromJsonElement diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/SSIKit2WalletService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/SSIKit2WalletService.kt index f38f4e94b..b0630df0e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/SSIKit2WalletService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/SSIKit2WalletService.kt @@ -69,7 +69,6 @@ import kotlinx.coroutines.runBlocking import kotlinx.datetime.Clock import kotlinx.datetime.toJavaInstant import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.* import org.jetbrains.exposed.sql.insert import org.jetbrains.exposed.sql.selectAll diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/WalletServiceManager.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/WalletServiceManager.kt index 1d21fde3b..9492bdbb5 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/WalletServiceManager.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/WalletServiceManager.kt @@ -227,14 +227,17 @@ object WalletServiceManager { it[Wallets.id].value.toKotlinUuid() } - suspend fun matchCredentialsForPresentationDefinition(walletId: Uuid, presentationDefinition: PresentationDefinition): List { + suspend fun matchCredentialsForPresentationDefinition( + walletId: Uuid, + presentationDefinition: PresentationDefinition + ): List { val pd = Json.decodeFromJsonElement(presentationDefinition.toJSON()) val matches = credentialService.list(walletId, CredentialFilterObject.default).filter { cred -> val fullDoc = WalletCredential.parseFullDocument(cred.document, cred.disclosures, cred.id, cred.format) fullDoc != null && - pd.inputDescriptors.any { inputDesc -> - PresentationDefinitionParser.matchCredentialsForInputDescriptor(flowOf(fullDoc), inputDesc).toList().isNotEmpty() - } + pd.inputDescriptors.any { inputDesc -> + PresentationDefinitionParser.matchCredentialsForInputDescriptor(flowOf(fullDoc), inputDesc).toList().isNotEmpty() + } } return matches } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/authnz/AuthenticationService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/authnz/AuthenticationService.kt index 1b6c2134b..0f4b5e025 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/authnz/AuthenticationService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/authnz/AuthenticationService.kt @@ -13,7 +13,7 @@ import kotlinx.coroutines.withContext import org.jetbrains.exposed.sql.insert import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.transactions.transaction -import java.util.* +import java.util.UUID import kotlin.uuid.ExperimentalUuidApi @OptIn(ExperimentalUuidApi::class) @@ -26,8 +26,8 @@ class AuthenticationService(private val dispatcher: CoroutineDispatcher = Dispat ): Unit = withContext(dispatcher) { transaction { AuthnzAccountIdentifiers.insert { - it[AuthnzAccountIdentifiers.userId] = UUID.fromString(accountId) - it[AuthnzAccountIdentifiers.identifier] = newAccountIdentifier.accountIdentifierName + it[userId] = UUID.fromString(accountId) + it[identifier] = newAccountIdentifier.accountIdentifierName //it[AuthnzAccountIdentifiers.method] = } Unit // Explicitly return Unit @@ -46,9 +46,9 @@ class AuthenticationService(private val dispatcher: CoroutineDispatcher = Dispat val savableStoredData = data.transformSavable() transaction { val userId = AuthnzAccountIdentifiers - .select(AuthnzAccountIdentifiers.userId) + .select(userId) .where { AuthnzAccountIdentifiers.identifier eq accountIdentifier.accountIdentifierName } - .singleOrNull()?.get(AuthnzAccountIdentifiers.userId) + .singleOrNull()?.get(userId) ?: throw IllegalStateException("Account not found") AuthnzStoredData.insert { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/x5c/X5CAccountStrategy.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/x5c/X5CAccountStrategy.kt index 6966dbd26..d1e0030f8 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/x5c/X5CAccountStrategy.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/x5c/X5CAccountStrategy.kt @@ -20,7 +20,6 @@ import org.jetbrains.exposed.sql.insert import org.jetbrains.exposed.sql.transactions.transaction import kotlin.uuid.ExperimentalUuidApi import kotlin.uuid.Uuid -import kotlin.uuid.toJavaUuid object X5CAccountStrategy : PasswordlessAccountStrategy() { @@ -43,8 +42,8 @@ object X5CAccountStrategy : PasswordlessAccountStrategy() { override suspend fun authenticate(tenant: String, request: X5CAccountRequest): AuthenticatedUser { val thumbprint = validate(request.token) - val registeredUserId = AccountsService.getAccountByX5CId(tenant, thumbprint)?.id ?: - AccountsService.register(tenant, request).getOrThrow().id + val registeredUserId = + AccountsService.getAccountByX5CId(tenant, thumbprint)?.id ?: AccountsService.register(tenant, request).getOrThrow().id return X5CAuthenticatedUser(registeredUserId) } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/credentials/CredentialsService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/credentials/CredentialsService.kt index 3d6b21848..09fd906d1 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/credentials/CredentialsService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/credentials/CredentialsService.kt @@ -138,16 +138,18 @@ class CredentialsService { transaction { WalletCredentials.deleteWhere { (WalletCredentials.wallet eq wallet.toJavaUuid()) and (id eq credentialId) } } private fun categorizedQuery(wallet: Uuid, deleted: Boolean?, pending: Boolean?, categories: List) = - WalletCredentials.innerJoin(otherTable = WalletCredentialCategoryMap, + WalletCredentials.innerJoin( + otherTable = WalletCredentialCategoryMap, onColumn = { id }, otherColumn = { credential }, additionalConstraint = { WalletCredentials.wallet eq wallet.toJavaUuid() and (WalletCredentialCategoryMap.wallet eq wallet) and deletedCondition( deleted ) and pendingCondition(pending) - }).innerJoin(otherTable = WalletCategory, + }).innerJoin( + otherTable = WalletCategory, onColumn = { WalletCredentialCategoryMap.category }, - otherColumn = { WalletCategory.id }, + otherColumn = { id }, additionalConstraint = { WalletCategory.wallet eq wallet.toJavaUuid() and (WalletCredentialCategoryMap.wallet eq wallet) and (WalletCategory.name inList (categories)) }).selectAll() diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/dids/DidService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/dids/DidService.kt index 4f27d5b41..81bc013b4 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/dids/DidService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/dids/DidService.kt @@ -50,7 +50,11 @@ object DidsService { }.insertedCount fun delete(wallet: Uuid, did: String): Boolean = - transaction { WalletDids.deleteWhere { (WalletDids.wallet eq wallet.toJavaUuid()) and (WalletDids.did eq did.replace("%3A", ":").replace("%3D", "=")) } } > 0 + transaction { + WalletDids.deleteWhere { + (WalletDids.wallet eq wallet.toJavaUuid()) and (WalletDids.did eq did.replace("%3A", ":").replace("%3D", "=")) + } + } > 0 fun makeDidDefault(wallet: Uuid, newDefaultDid: String) { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/endpoint/EntraServiceEndpointProvider.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/endpoint/EntraServiceEndpointProvider.kt index 0953a32cc..b0f75ac12 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/endpoint/EntraServiceEndpointProvider.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/endpoint/EntraServiceEndpointProvider.kt @@ -19,7 +19,7 @@ class EntraServiceEndpointProvider( contentType(ContentType.Application.Json) setBody( IdentityHubRequest( - requestId = Uuid.random().toString(), + requestId = Uuid.random().toString(), target = did, messages = listOf( IdentityHubRequest.Message( diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/events/EventService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/events/EventService.kt index c125743aa..8c8bd9dbd 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/events/EventService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/events/EventService.kt @@ -4,9 +4,7 @@ package id.walt.webwallet.service.events import id.walt.webwallet.db.models.Events import kotlinx.datetime.toJavaInstant -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json - import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq import org.jetbrains.exposed.sql.javatime.date @@ -116,7 +114,8 @@ class EventService { sortBy: String, dataFilter: Map>, ) = Events.selectAll().where { Events.account eq accountId or (Events.wallet eq walletId) } - .orderBy(getColumn(sortBy) ?: Events.timestamp, + .orderBy( + getColumn(sortBy) ?: Events.timestamp, sortOrder.takeIf { it.uppercase() == "ASC" }?.let { SortOrder.ASC } ?: SortOrder.DESC) .addWhereClause(dataFilter) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/CredentialOfferProcessor.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/CredentialOfferProcessor.kt index 64d87b741..60b1a329e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/CredentialOfferProcessor.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/CredentialOfferProcessor.kt @@ -16,18 +16,18 @@ object CredentialOfferProcessor { private val http = WalletHttpClients.getHttpClient() private val logger = logger() suspend fun process( - credentialRequests: List, - providerMetadata: OpenIDProviderMetadata, - accessToken: String, + credentialRequests: List, + providerMetadata: OpenIDProviderMetadata, + accessToken: String, ) = when (credentialRequests.size) { 1 -> processedSingleCredentialOffer(credentialRequests, providerMetadata, accessToken) else -> processBatchCredentialOffer(credentialRequests, providerMetadata, accessToken) } private suspend fun processBatchCredentialOffer( - credReqs: List, - providerMetadata: OpenIDProviderMetadata, - accessToken: String, + credReqs: List, + providerMetadata: OpenIDProviderMetadata, + accessToken: String, ): List { providerMetadata as OpenIDProviderMetadata.Draft13 @@ -51,9 +51,9 @@ object CredentialOfferProcessor { } private suspend fun processedSingleCredentialOffer( - credReqs: List, - providerMetadata: OpenIDProviderMetadata, - accessToken: String, + credReqs: List, + providerMetadata: OpenIDProviderMetadata, + accessToken: String, ): List { val credReq = credReqs.first() diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt index 7c6fd6266..eb2662526 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt @@ -2,10 +2,15 @@ package id.walt.webwallet.service.exchange import id.walt.did.dids.DidService import id.walt.oid4vc.OpenID4VCI -import id.walt.oid4vc.data.* +import id.walt.oid4vc.data.CredentialFormat +import id.walt.oid4vc.data.CredentialOffer +import id.walt.oid4vc.data.GrantType import id.walt.oid4vc.providers.TokenTarget import id.walt.oid4vc.requests.* -import id.walt.oid4vc.responses.* +import id.walt.oid4vc.responses.CredentialResponse +import id.walt.oid4vc.responses.EntraIssuanceCompletionCode +import id.walt.oid4vc.responses.EntraIssuanceCompletionErrorDetails +import id.walt.oid4vc.responses.EntraIssuanceCompletionResponse import id.walt.webwallet.manifest.extractor.EntraManifestExtractor import id.walt.webwallet.service.oidc4vc.TestCredentialWallet import io.klogging.logger @@ -16,7 +21,7 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive -object IssuanceService: IssuanceServiceBase() { +object IssuanceService : IssuanceServiceBase() { override val logger = logger() diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProcessedCredentialOffer.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProcessedCredentialOffer.kt index 3483019ee..555da7a8c 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProcessedCredentialOffer.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProcessedCredentialOffer.kt @@ -5,7 +5,7 @@ import id.walt.oid4vc.requests.EntraIssuanceRequest import id.walt.oid4vc.responses.CredentialResponse data class ProcessedCredentialOffer( - val credentialResponse: CredentialResponse, - val credentialRequest: CredentialRequest?, - val entraIssuanceRequest: EntraIssuanceRequest? = null + val credentialResponse: CredentialResponse, + val credentialRequest: CredentialRequest?, + val entraIssuanceRequest: EntraIssuanceRequest? = null ) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProofOfPossessionFactory.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProofOfPossessionFactory.kt index 539bcd5c7..13458fd55 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProofOfPossessionFactory.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProofOfPossessionFactory.kt @@ -10,46 +10,46 @@ import id.walt.oid4vc.data.ProofType import id.walt.webwallet.service.oidc4vc.TestCredentialWallet object ProofOfPossessionFactory { - suspend fun new( - useKeyProof: Boolean, - credentialWallet: TestCredentialWallet, - offeredCredential: OfferedCredential, - credentialOffer: CredentialOffer, - nonce: String? - ): ProofOfPossession = when (useKeyProof) { - true -> keyProofOfPossession(credentialWallet, offeredCredential, credentialOffer, nonce) - false -> didProofOfPossession(credentialWallet, offeredCredential, credentialOffer, nonce) - } + suspend fun new( + useKeyProof: Boolean, + credentialWallet: TestCredentialWallet, + offeredCredential: OfferedCredential, + credentialOffer: CredentialOffer, + nonce: String? + ): ProofOfPossession = when (useKeyProof) { + true -> keyProofOfPossession(credentialWallet, offeredCredential, credentialOffer, nonce) + false -> didProofOfPossession(credentialWallet, offeredCredential, credentialOffer, nonce) + } - private fun didProofOfPossession( - credentialWallet: TestCredentialWallet, - offeredCredential: OfferedCredential, - credentialOffer: CredentialOffer, - nonce: String? - ) = credentialWallet.generateDidProof( - did = credentialWallet.did, - issuerUrl = credentialOffer.credentialIssuer, - nonce = nonce, - proofType = offeredCredential.proofTypesSupported?.keys?.first() ?: ProofType.jwt - ) - - private suspend fun keyProofOfPossession( - credentialWallet: TestCredentialWallet, - offeredCredential: OfferedCredential, - credentialOffer: CredentialOffer, - nonce: String? - ): ProofOfPossession { - val key = DidService.resolveToKey(credentialWallet.did).getOrThrow() - val proofType = offeredCredential.proofTypesSupported?.keys?.first() ?: ProofType.jwt - return credentialWallet.generateKeyProof( - key = key, - cosePubKey = if (proofType == ProofType.cwt) OneKey( - ECKey.parse(key.getPublicKey().exportJWK()).toECPublicKey(), - null - ).AsCBOR().EncodeToBytes() else null, - issuerUrl = credentialOffer.credentialIssuer, - nonce = nonce, - proofType = proofType + private fun didProofOfPossession( + credentialWallet: TestCredentialWallet, + offeredCredential: OfferedCredential, + credentialOffer: CredentialOffer, + nonce: String? + ) = credentialWallet.generateDidProof( + did = credentialWallet.did, + issuerUrl = credentialOffer.credentialIssuer, + nonce = nonce, + proofType = offeredCredential.proofTypesSupported?.keys?.first() ?: ProofType.jwt ) - } + + private suspend fun keyProofOfPossession( + credentialWallet: TestCredentialWallet, + offeredCredential: OfferedCredential, + credentialOffer: CredentialOffer, + nonce: String? + ): ProofOfPossession { + val key = DidService.resolveToKey(credentialWallet.did).getOrThrow() + val proofType = offeredCredential.proofTypesSupported?.keys?.first() ?: ProofType.jwt + return credentialWallet.generateKeyProof( + key = key, + cosePubKey = if (proofType == ProofType.cwt) OneKey( + ECKey.parse(key.getPublicKey().exportJWK()).toECPublicKey(), + null + ).AsCBOR().EncodeToBytes() else null, + issuerUrl = credentialOffer.credentialIssuer, + nonce = nonce, + proofType = proofType + ) + } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/keys/KeysService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/keys/KeysService.kt index dc837b129..a0236d7e6 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/keys/KeysService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/keys/KeysService.kt @@ -27,7 +27,8 @@ object KeysService { WalletKeys.selectAll().where { WalletKeys.keyId eq keyId }.firstOrNull()?.let { WalletKey(it) } } - fun list(wallet: Uuid): List = WalletKeys.selectAll().where { WalletKeys.wallet eq wallet.toJavaUuid() }.map { WalletKey(it) } + fun list(wallet: Uuid): List = + WalletKeys.selectAll().where { WalletKeys.wallet eq wallet.toJavaUuid() }.map { WalletKey(it) } fun add(wallet: Uuid, keyId: String, document: String) = transaction { WalletKeys.insert { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/notifications/NotificationService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/notifications/NotificationService.kt index 2017ba41a..b722ea3a7 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/notifications/NotificationService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/notifications/NotificationService.kt @@ -43,7 +43,7 @@ object NotificationService { } fun delete(vararg ids: Uuid): Int = transaction { - WalletNotifications.deleteWhere { WalletNotifications.id inList ids.map { it.toJavaUuid() } } + WalletNotifications.deleteWhere { id inList ids.map { it.toJavaUuid() } } } fun update(vararg notification: Notification): Int = transaction { @@ -63,7 +63,8 @@ object NotificationService { }.andWhere { runCatching { LocalDate.parse(addedOn!!) }.getOrNull() ?.let { WalletNotifications.addedOn.date() eq dateParam(it.toJavaLocalDate()) } ?: Op.TRUE - }.orderBy(column = WalletNotifications.addedOn, + }.orderBy( + column = WalletNotifications.addedOn, order = ascending?.takeIf { it }?.let { SortOrder.ASC } ?: SortOrder.DESC) private fun insert(vararg notifications: Notification): List = WalletNotifications.batchInsert( diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/oidc4vc/TestCredentialWallet.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/oidc4vc/TestCredentialWallet.kt index d06ad4d6e..ab5b4af0e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/oidc4vc/TestCredentialWallet.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/oidc4vc/TestCredentialWallet.kt @@ -2,6 +2,7 @@ package id.walt.webwallet.service.oidc4vc + import COSE.AlgorithmID import com.nimbusds.jose.jwk.ECKey import id.walt.credentials.utils.VCFormat @@ -52,10 +53,7 @@ import io.ktor.util.* import kotlinx.coroutines.runBlocking import kotlinx.datetime.Clock import kotlinx.datetime.Instant -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.* - - import kotlin.time.Duration import kotlin.time.Duration.Companion.minutes import kotlin.uuid.ExperimentalUuidApi @@ -199,7 +197,7 @@ class TestCredentialWallet( val documentWithDisclosures = if (selectedDisclosures?.containsKey(it.id) == true) { it.document + "~${selectedDisclosures[it.id]!!.joinToString("~")}" } else { - it.document + it.document } SDJwtVC.parse(documentWithDisclosures).present( @@ -289,12 +287,14 @@ class TestCredentialWallet( credential.document, rootPathMDoc, ) + CredentialFormat.sd_jwt_vc -> buildDescriptorMappingSDJwtVC( session.presentationDefinition, index, credential.document, "$", ) + else -> buildDescriptorMappingJwtVP( session.presentationDefinition, index, @@ -448,7 +448,7 @@ class TestCredentialWallet( rootPath: String = "$", ) = let { val vcJws = vcJwsStr.base64UrlToBase64().decodeJws() - val type = vcJws.payload["vc"]?.jsonObject?.get("type")?.jsonArray?.last()?.jsonPrimitive?.contentOrNull + vcJws.payload["vc"]?.jsonObject?.get("type")?.jsonArray?.last()?.jsonPrimitive?.contentOrNull ?: "VerifiableCredential" DescriptorMapping( diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/push/PushManager.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/push/PushManager.kt index 1cc5a9830..ee6766e2e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/push/PushManager.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/push/PushManager.kt @@ -5,7 +5,6 @@ import com.interaso.webpush.WebPushService import id.walt.commons.config.ConfigManager import id.walt.webwallet.config.PushConfig import io.github.oshai.kotlinlogging.KotlinLogging -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json object PushManager { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/settings/SettingsService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/settings/SettingsService.kt index 910d7f82a..70cf483f6 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/settings/SettingsService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/settings/SettingsService.kt @@ -4,10 +4,8 @@ package id.walt.webwallet.service.settings import id.walt.webwallet.db.models.WalletSettings import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject - import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.upsert @@ -36,7 +34,8 @@ object SettingsService { } private fun tryParseSettings(settings: String?) = - runCatching { json.decodeFromString(settings ?: "") }.fold(onSuccess = { WalletSetting(it) }, + runCatching { json.decodeFromString(settings ?: "") }.fold( + onSuccess = { WalletSetting(it) }, onFailure = { WalletSetting.default }) } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ClaimCommons.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ClaimCommons.kt index c3062f398..e957ee788 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ClaimCommons.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ClaimCommons.kt @@ -36,19 +36,19 @@ object ClaimCommons { credentialType: String, eventUseCase: EventLogUseCase, ) = eventUseCase.log( - action = EventType.Credential.Receive, - originator = "", //parsedOfferReq.credentialOffer!!.credentialIssuer, - tenant = tenant, - accountId = account, - walletId = wallet, - data = eventUseCase.credentialEventData( - credential = credential, - subject = eventUseCase.subjectData(credential), - organization = eventUseCase.issuerData(credential), - type = credentialType - ), - credentialId = credential.id, - ) + action = EventType.Credential.Receive, + originator = "", //parsedOfferReq.credentialOffer!!.credentialIssuer, + tenant = tenant, + accountId = account, + walletId = wallet, + data = eventUseCase.credentialEventData( + credential = credential, + subject = eventUseCase.subjectData(credential), + organization = eventUseCase.issuerData(credential), + type = credentialType + ), + credentialId = credential.id, + ) fun storeWalletCredentials( wallet: Uuid, @@ -60,4 +60,4 @@ object ClaimCommons { credentials = credentials.toTypedArray(), ) } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ExternalSignatureClaimStrategy.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ExternalSignatureClaimStrategy.kt index 6860d7c1b..fa4f3bc14 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ExternalSignatureClaimStrategy.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ExternalSignatureClaimStrategy.kt @@ -3,8 +3,8 @@ package id.walt.webwallet.usecase.claim import id.walt.crypto.keys.Key import id.walt.webwallet.service.SSIKit2WalletService import id.walt.webwallet.service.credentials.CredentialsService -import id.walt.webwallet.service.exchange.IssuanceServiceExternalSignatures.OfferedCredentialProofOfPossession import id.walt.webwallet.service.exchange.IssuanceServiceExternalSignatures +import id.walt.webwallet.service.exchange.IssuanceServiceExternalSignatures.OfferedCredentialProofOfPossession import id.walt.webwallet.usecase.event.EventLogUseCase import kotlin.uuid.ExperimentalUuidApi import kotlin.uuid.Uuid diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/SilentClaimStrategy.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/SilentClaimStrategy.kt index d980f981f..8b731be45 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/SilentClaimStrategy.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/SilentClaimStrategy.kt @@ -104,7 +104,7 @@ class SilentClaimStrategy( addedOn = Clock.System.now(), manifest = data.manifest, deletedOn = null, - pending = issuerUseCase.get(wallet = it, did = issuerDid).getOrNull()?.authorized ?: true, + pending = issuerUseCase.get(wallet = it, did = issuerDid).getOrNull()?.authorized != false, format = data.format ), data.type ) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/entity/EntityNameResolutionUseCase.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/entity/EntityNameResolutionUseCase.kt index 6fb333e78..dc196d6b0 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/entity/EntityNameResolutionUseCase.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/entity/EntityNameResolutionUseCase.kt @@ -22,5 +22,5 @@ class EntityNameResolutionUseCase( private fun validateAge(age: Instant?) = age?.let { now().minus(it).inWholeDays <= cacheAge - } ?: false + } == true } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/issuer/IssuerUseCaseImpl.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/issuer/IssuerUseCaseImpl.kt index 22cf8fdc5..5b861e37b 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/issuer/IssuerUseCaseImpl.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/issuer/IssuerUseCaseImpl.kt @@ -55,9 +55,9 @@ class IssuerUseCaseImpl( suspend fun fetchCredentials(url: String): List { val issuerConfiguration = fetchConfiguration(url).jsonObject val credentialConfigurations = ( - issuerConfiguration["credential_configurations_supported"]?.jsonObject?.entries - ?: issuerConfiguration["credentials_supported"]?.jsonArray?.associateBy { it.jsonObject["id"]!!.jsonPrimitive.content }?.entries - ) + issuerConfiguration["credential_configurations_supported"]?.jsonObject?.entries + ?: issuerConfiguration["credentials_supported"]?.jsonArray?.associateBy { it.jsonObject["id"]!!.jsonPrimitive.content }?.entries + ) return credentialConfigurations?.mapNotNull { (key, value) -> value.jsonObject.let { jsonObject -> val format = jsonObject["format"]?.jsonPrimitive?.content diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/notification/NotificationFilterUseCase.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/notification/NotificationFilterUseCase.kt index 346fbe76a..cceba901d 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/notification/NotificationFilterUseCase.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/notification/NotificationFilterUseCase.kt @@ -26,7 +26,7 @@ class NotificationFilterUseCase( notificationFormatter.format(it) } - private fun parseSortOrder(sort: String) = sort.lowercase().takeIf { it == "asc" }?.let { true } ?: false + private fun parseSortOrder(sort: String) = sort.lowercase().takeIf { it == "asc" }?.let { true } == true private fun filterPending(notifications: List, showPending: Boolean?) = showPending?.let { pending -> credentialService.get(notifications.mapNotNull { (it.data as? Notification.CredentialIssuanceData)?.credentialId }) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/AccountController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/AccountController.kt index 0b372fd96..85c4f93f7 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/AccountController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/AccountController.kt @@ -23,8 +23,8 @@ fun Application.accounts() { summary = "Get wallets associated with account" response { HttpStatusCode.OK to { body() } } }) { - val user = getUserUUID() - context.respond(AccountsService.getAccountWalletMappings("", user)) // FIXME -> TENANT HERE + val user = call.getUserUUID() + call.respond(AccountsService.getAccountWalletMappings("", user)) // FIXME -> TENANT HERE } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CategoryController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CategoryController.kt index b3f0218ed..0d14ec1f2 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CategoryController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CategoryController.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalUuidApi::class) + package id.walt.webwallet.web.controllers import id.walt.webwallet.web.controllers.auth.getWalletService @@ -7,6 +9,7 @@ import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.util.* import kotlinx.serialization.json.JsonObject +import kotlin.uuid.ExperimentalUuidApi fun Application.categories() = walletRoute { route("categories", { @@ -21,7 +24,7 @@ fun Application.categories() = walletRoute { } } }) { - context.respond(getWalletService().listCategories()) + call.respond(call.getWalletService().listCategories()) } route("{name}", { request { @@ -38,9 +41,9 @@ fun Application.categories() = walletRoute { } }) { val name = call.parameters.getOrFail("name") - runCatching { getWalletService().addCategory(name) }.onSuccess { - context.respond(if (it) HttpStatusCode.Created else HttpStatusCode.BadRequest) - }.onFailure { context.respond(HttpStatusCode.BadRequest, it.localizedMessage) } + runCatching { call.getWalletService().addCategory(name) }.onSuccess { + call.respond(if (it) HttpStatusCode.Created else HttpStatusCode.BadRequest) + }.onFailure { call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } delete({ summary = "Delete category" @@ -50,9 +53,9 @@ fun Application.categories() = walletRoute { } }) { val name = call.parameters.getOrFail("name") - runCatching { getWalletService().deleteCategory(name) }.onSuccess { - context.respond(if (it) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) - }.onFailure { context.respond(HttpStatusCode.BadRequest, it.localizedMessage) } + runCatching { call.getWalletService().deleteCategory(name) }.onSuccess { + call.respond(if (it) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + }.onFailure { call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } put("rename/{newName}", { summary = "Rename category" @@ -68,9 +71,9 @@ fun Application.categories() = walletRoute { }) { val oldName = call.parameters.getOrFail("name") val newName = call.parameters.getOrFail("newName") - runCatching { getWalletService().renameCategory(oldName, newName) }.onSuccess { - context.respond(if (it) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) - }.onFailure { context.respond(HttpStatusCode.BadRequest, it.localizedMessage) } + runCatching { call.getWalletService().renameCategory(oldName, newName) }.onSuccess { + call.respond(if (it) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + }.onFailure { call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CredentialController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CredentialController.kt index b0fbd1c2d..0647b9a3f 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CredentialController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CredentialController.kt @@ -59,8 +59,8 @@ fun Application.credentials() = walletRoute { val showPending = call.request.queryParameters["showPending"]?.toBooleanStrictOrNull() val sortBy = call.request.queryParameters["sortBy"] ?: "addedOn" val descending = call.request.queryParameters["descending"].toBoolean() - context.respond( - getWalletService().listCredentials( + call.respond( + call.getWalletService().listCredentials( CredentialFilterObject( categories = categories, showDeleted = showDeleted, @@ -98,7 +98,7 @@ fun Application.credentials() = walletRoute { } }) { val credentialId = call.parameters.getOrFail("credentialId") - context.respond(getWalletService().getCredential(credentialId)) + call.respond(call.getWalletService().getCredential(credentialId)) } delete({ summary = "Delete a credential" @@ -115,8 +115,8 @@ fun Application.credentials() = walletRoute { }) { val credentialId = call.parameters.getOrFail("credentialId") val permanent = call.request.queryParameters["permanent"].toBoolean() - context.respond( - if (getWalletService().deleteCredential( + call.respond( + if (call.getWalletService().deleteCredential( credentialId, permanent ) ) HttpStatusCode.Accepted else HttpStatusCode.BadRequest @@ -135,8 +135,8 @@ fun Application.credentials() = walletRoute { } }) { val credentialId = call.parameters.getOrFail("credentialId") - runCatching { getWalletService().restoreCredential(credentialId) }.onSuccess { - context.respond(HttpStatusCode.OK, it) + runCatching { call.getWalletService().restoreCredential(credentialId) }.onSuccess { + call.respond(HttpStatusCode.OK, it) }.onFailure { throw it } @@ -149,8 +149,8 @@ fun Application.credentials() = walletRoute { } }) { val credentialId = call.parameters.getOrFail("credentialId") - runCatching { getWalletService().acceptCredential(CredentialRequestParameter(credentialId)) }.onSuccess { - if (it) context.respond(HttpStatusCode.Accepted) else context.respond(HttpStatusCode.BadRequest) + runCatching { call.getWalletService().acceptCredential(CredentialRequestParameter(credentialId)) }.onSuccess { + if (it) call.respond(HttpStatusCode.Accepted) else call.respond(HttpStatusCode.BadRequest) }.onFailure { throw it } @@ -172,15 +172,15 @@ fun Application.credentials() = walletRoute { val credentialId = call.parameters.getOrFail("credentialId") val requestParameter = call.receiveNullable() runCatching { - getWalletService().rejectCredential( + call.getWalletService().rejectCredential( CredentialRequestParameter( credentialId = credentialId, parameter = requestParameter ) ) }.onSuccess { - if (it) context.respond(HttpStatusCode.Accepted) else context.respond(HttpStatusCode.BadRequest) + if (it) call.respond(HttpStatusCode.Accepted) else call.respond(HttpStatusCode.BadRequest) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } get("status", { @@ -198,11 +198,11 @@ fun Application.credentials() = walletRoute { }) { runCatching { val credentialId = call.parameters.getOrFail("credentialId") - WalletServiceManager.credentialStatusUseCase.get(getWalletId(), credentialId) + WalletServiceManager.credentialStatusUseCase.get(call.getWalletId(), credentialId) }.onSuccess { - context.respond(it) + call.respond(it) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } route("category", { @@ -223,9 +223,9 @@ fun Application.credentials() = walletRoute { }) { val credentialId = call.parameters.getOrFail("credentialId") val categories = call.receive>() - runCatching { getWalletService().attachCategory(credentialId, categories) }.onSuccess { - if (it) context.respond(HttpStatusCode.Created) else context.respond(HttpStatusCode.BadRequest) - }.onFailure { context.respond(HttpStatusCode.BadRequest, it.localizedMessage) } + runCatching { call.getWalletService().attachCategory(credentialId, categories) }.onSuccess { + if (it) call.respond(HttpStatusCode.Created) else call.respond(HttpStatusCode.BadRequest) + }.onFailure { call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } delete({ summary = "Detach category from credential" @@ -237,9 +237,9 @@ fun Application.credentials() = walletRoute { }) { val credentialId = call.parameters.getOrFail("credentialId") val categories = call.receive>() - runCatching { getWalletService().detachCategory(credentialId, categories) }.onSuccess { - if (it) context.respond(HttpStatusCode.Accepted) else context.respond(HttpStatusCode.BadRequest) - }.onFailure { context.respond(HttpStatusCode.BadRequest, it.localizedMessage) } + runCatching { call.getWalletService().detachCategory(credentialId, categories) }.onSuccess { + if (it) call.respond(HttpStatusCode.Accepted) else call.respond(HttpStatusCode.BadRequest) + }.onFailure { call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidController.kt index 5dfc47314..948dd2bce 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidController.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalUuidApi::class) + package id.walt.webwallet.web.controllers import id.walt.webwallet.db.models.WalletDid @@ -12,6 +14,7 @@ import io.ktor.server.application.* import io.ktor.server.response.* import kotlinx.coroutines.runBlocking import kotlinx.serialization.json.JsonObject +import kotlin.uuid.ExperimentalUuidApi fun Application.dids() = walletRoute { route("dids", { @@ -26,7 +29,7 @@ fun Application.dids() = walletRoute { } } }) { - context.respond(getWalletService().run { runBlocking { listDids() } }) + call.respond(call.getWalletService().run { runBlocking { listDids() } }) } route("{did}", { @@ -49,9 +52,9 @@ fun Application.dids() = walletRoute { } } }) { - context.respond( - getWalletService().loadDid( - context.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") + call.respond( + call.getWalletService().loadDid( + call.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") ) ) } @@ -63,11 +66,11 @@ fun Application.dids() = walletRoute { HttpStatusCode.BadRequest to { description = "DID could not be deleted" } } }) { - val success = getWalletService().deleteDid( - context.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") + val success = call.getWalletService().deleteDid( + call.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") ) - context.respond( + call.respond( if (success) HttpStatusCode.Accepted else HttpStatusCode.BadRequest ) @@ -89,10 +92,10 @@ fun Application.dids() = walletRoute { } response { HttpStatusCode.Accepted to { description = "Default DID updated" } } }) { - getWalletService().setDefault( - context.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") + call.getWalletService().setDefault( + call.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") ) - context.respond(HttpStatusCode.Accepted) + call.respond(HttpStatusCode.Accepted) } route("create", { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidCreation.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidCreation.kt index 2532218a0..3b335a84c 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidCreation.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidCreation.kt @@ -6,7 +6,9 @@ import io.ktor.http.* import io.ktor.server.response.* import io.ktor.server.routing.* import kotlinx.serialization.json.JsonPrimitive +import kotlin.uuid.ExperimentalUuidApi +@OptIn(ExperimentalUuidApi::class) object DidCreation { private const val DidKeyMethodName = "key" @@ -26,17 +28,17 @@ object DidCreation { } } }) { - getWalletService().createDid( - DidKeyMethodName, extractDidCreateParameters(DidKeyMethodName, context.request.queryParameters) - ).let { context.respond(it) } + call.getWalletService().createDid( + DidKeyMethodName, extractDidCreateParameters(DidKeyMethodName, call.request.queryParameters) + ).let { call.respond(it) } } post(DidJwkMethodName, { summary = "Create a did:jwk" }) { - getWalletService().createDid( - DidJwkMethodName, extractDidCreateParameters(DidJwkMethodName, context.request.queryParameters) - ).let { context.respond(it) } + call.getWalletService().createDid( + DidJwkMethodName, extractDidCreateParameters(DidJwkMethodName, call.request.queryParameters) + ).let { call.respond(it) } } post(DidWebMethodName, { @@ -50,8 +52,8 @@ object DidCreation { } } }) { - val parameters = extractDidCreateParameters(DidWebMethodName, context.request.queryParameters) - getWalletService().createDid(DidWebMethodName, parameters).let { context.respond(it) } + val parameters = extractDidCreateParameters(DidWebMethodName, call.request.queryParameters) + call.getWalletService().createDid(DidWebMethodName, parameters).let { call.respond(it) } } post(DidEbsiMethodName, { @@ -61,9 +63,9 @@ object DidCreation { queryParameter("bearerToken") { description = "Required for v1 (LegalEntity)" } } }) { - getWalletService().createDid( - DidEbsiMethodName, extractDidCreateParameters(DidEbsiMethodName, context.request.queryParameters) - ).let { context.respond(it) } + call.getWalletService().createDid( + DidEbsiMethodName, extractDidCreateParameters(DidEbsiMethodName, call.request.queryParameters) + ).let { call.respond(it) } } post(DidCheqdMethodName, { @@ -72,17 +74,17 @@ object DidCreation { queryParameter("network") { description = "testnet or mainnet" } } }) { - getWalletService().createDid( - DidCheqdMethodName, extractDidCreateParameters(DidCheqdMethodName, context.request.queryParameters) - ).let { context.respond(it) } + call.getWalletService().createDid( + DidCheqdMethodName, extractDidCreateParameters(DidCheqdMethodName, call.request.queryParameters) + ).let { call.respond(it) } } post(DidIotaMethodName, { summary = "Create a did:iota" }) { - getWalletService().createDid( - DidIotaMethodName, extractDidCreateParameters(DidIotaMethodName, context.request.queryParameters) - ).let { context.respond(it) } + call.getWalletService().createDid( + DidIotaMethodName, extractDidCreateParameters(DidIotaMethodName, call.request.queryParameters) + ).let { call.respond(it) } } } @@ -95,7 +97,7 @@ object DidCreation { when (method) { DidKeyMethodName -> mapOf( "useJwkJcsPub" to JsonPrimitive( - parameters["useJwkJcsPub"]?.toBoolean() ?: false + parameters["useJwkJcsPub"]?.toBoolean() == true ) ) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidWebRegistryController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidWebRegistryController.kt index 0ad9888a6..fc2f697fc 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidWebRegistryController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidWebRegistryController.kt @@ -23,7 +23,7 @@ fun Application.didRegistry() = webWalletRoute { } } }) { - context.respond(runBlocking { + call.respond(runBlocking { DidWebRegistryService.listRegisteredDids() }) } @@ -47,9 +47,9 @@ fun Application.didRegistry() = webWalletRoute { } }) { - val id = context.parameters["id"] ?: throw IllegalArgumentException("No ID supplied") + val id = call.parameters["id"] ?: throw IllegalArgumentException("No ID supplied") - context.respond( + call.respond( DidWebRegistryService.loadRegisteredDid(id) ) } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/EventLogController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/EventLogController.kt index 269da5524..d25813071 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/EventLogController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/EventLogController.kt @@ -63,10 +63,10 @@ fun Application.eventLogs() = walletRoute { val startingAfter = call.request.queryParameters["startingAfter"] val sortBy = call.request.queryParameters["sortBy"] val sortOrder = call.request.queryParameters["sortOrder"] - context.respond( + call.respond( eventFilterUseCase.filter( - accountId = getUserUUID(), - walletId = getWalletId(), + accountId = call.getUserUUID(), + walletId = call.getWalletId(), filter = EventLogFilter( limit = limit, startingAfter = startingAfter, @@ -91,8 +91,8 @@ fun Application.eventLogs() = walletRoute { HttpStatusCode.BadRequest to { description = "Event log could not be deleted" } } }) { - val id = context.parameters.getOrFail("id").toInt() - context.respond(HttpStatusCode.Accepted, eventUseCase.delete(id)) + val id = call.parameters.getOrFail("id").toInt() + call.respond(HttpStatusCode.Accepted, eventUseCase.delete(id)) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/HistoryController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/HistoryController.kt index 0c6928763..12dbdd952 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/HistoryController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/HistoryController.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalUuidApi::class) + package id.walt.webwallet.web.controllers import id.walt.webwallet.db.models.WalletOperationHistory @@ -8,6 +10,7 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.response.* import org.jetbrains.exposed.sql.transactions.transaction +import kotlin.uuid.ExperimentalUuidApi fun Application.history() = walletRoute { route("history", { @@ -21,8 +24,8 @@ fun Application.history() = walletRoute { } } }) { - val wallet = getWalletService() - context.respond(transaction { + val wallet = call.getWalletService() + call.respond(transaction { wallet.getHistory() }) } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/IssuersController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/IssuersController.kt index 656beee69..c22b92ee1 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/IssuersController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/IssuersController.kt @@ -31,7 +31,7 @@ fun Application.issuers() = walletRoute { } } }) { - context.respond(WalletServiceManager.issuerUseCase.list(getWalletService().walletId)) + call.respond(WalletServiceManager.issuerUseCase.list(call.getWalletService().walletId)) } post("add", { summary = "Add issuer to wallet" @@ -49,16 +49,16 @@ fun Application.issuers() = walletRoute { val issuer = call.receive() WalletServiceManager.issuerUseCase.add( IssuerDataTransferObject( - wallet = getWalletService().walletId, + wallet = call.getWalletService().walletId, did = issuer.name, description = issuer.description, uiEndpoint = issuer.uiEndpoint, configurationEndpoint = issuer.configurationEndpoint, ) ).onSuccess { - context.respond(HttpStatusCode.Created) + call.respond(HttpStatusCode.Created) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } route("{issuer}", { @@ -83,10 +83,10 @@ fun Application.issuers() = walletRoute { } } }) { - WalletServiceManager.issuerUseCase.get(getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { - context.respond(it) + WalletServiceManager.issuerUseCase.get(call.getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { + call.respond(it) }.onFailure { - context.respondText(it.localizedMessage, ContentType.Text.Plain, HttpStatusCode.NotFound) + call.respondText(it.localizedMessage, ContentType.Text.Plain, HttpStatusCode.NotFound) } } put("authorize", { @@ -96,10 +96,10 @@ fun Application.issuers() = walletRoute { HttpStatusCode.BadRequest to { description = "Authorization failed" } } }) { - WalletServiceManager.issuerUseCase.authorize(getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { - context.respond(HttpStatusCode.Accepted) + WalletServiceManager.issuerUseCase.authorize(call.getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { + call.respond(HttpStatusCode.Accepted) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } @@ -125,10 +125,10 @@ fun Application.issuers() = walletRoute { } } }) { - WalletServiceManager.issuerUseCase.credentials(getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { - context.respond(it) + WalletServiceManager.issuerUseCase.credentials(call.getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { + call.respond(it) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/KeyController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/KeyController.kt index b3f17c9a5..740ca12a5 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/KeyController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/KeyController.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalUuidApi::class) + package id.walt.webwallet.web.controllers import id.walt.crypto.keys.KeyGenerationRequest @@ -15,6 +17,7 @@ import io.ktor.server.util.* import kotlinx.coroutines.runBlocking import kotlinx.serialization.json.* import org.jetbrains.exposed.sql.transactions.transaction +import kotlin.uuid.ExperimentalUuidApi fun Application.keys() = walletRoute { route("keys", { @@ -29,7 +32,7 @@ fun Application.keys() = walletRoute { } } }) { - context.respond(getWalletService().run { transaction { runBlocking { listKeys() } } }) + call.respond(call.getWalletService().run { transaction { runBlocking { listKeys() } } }) } post("generate", { @@ -144,14 +147,14 @@ fun Application.keys() = walletRoute { } } }) { - val keyGenerationRequest = context.receive() + val keyGenerationRequest = call.receive() runCatching { - getWalletService().generateKey(keyGenerationRequest) + call.getWalletService().generateKey(keyGenerationRequest) }.onSuccess { - context.respond(HttpStatusCode.Created, it) + call.respond(HttpStatusCode.Created, it) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } @@ -165,11 +168,11 @@ fun Application.keys() = walletRoute { val body = call.receiveText() runCatching { - getWalletService().importKey(body) + call.getWalletService().importKey(body) } .onSuccess { key -> - context.respond( + call.respond( HttpStatusCode.Created, key ) @@ -205,9 +208,9 @@ fun Application.keys() = walletRoute { } } }) { - val jwk = context.request.queryParameters.getOrFail("JWK") - val signature = context.receive() - context.respond(getWalletService().verify(jwk, signature)) + val jwk = call.request.queryParameters.getOrFail("JWK") + val signature = call.receive() + call.respond(call.getWalletService().verify(jwk, signature)) } @@ -229,9 +232,9 @@ fun Application.keys() = walletRoute { } } }) { - context.respond( - getWalletService().loadKey( - context.parameters["keyId"] ?: throw IllegalArgumentException("No key supplied") + call.respond( + call.getWalletService().loadKey( + call.parameters["keyId"] ?: throw IllegalArgumentException("No key supplied") ) ) } @@ -245,8 +248,8 @@ fun Application.keys() = walletRoute { } } }) { - val keyId = context.parameters["keyId"] ?: error("No key supplied") - context.respond(getWalletService().getKeyMeta(keyId)) + val keyId = call.parameters["keyId"] ?: error("No key supplied") + call.respond(call.getWalletService().getKeyMeta(keyId)) } get("export", { @@ -266,12 +269,12 @@ fun Application.keys() = walletRoute { } } }) { - val keyId = context.parameters["keyId"] ?: throw IllegalArgumentException("No key id provided.") + val keyId = call.parameters["keyId"] ?: throw IllegalArgumentException("No key id provided.") - val format = context.request.queryParameters["format"] ?: "JWK" - val loadPrivateKey = context.request.queryParameters["loadPrivateKey"].toBoolean() + val format = call.request.queryParameters["format"] ?: "JWK" + val loadPrivateKey = call.request.queryParameters["loadPrivateKey"].toBoolean() - context.respond(getWalletService().exportKey(keyId, format, loadPrivateKey)) + call.respond(call.getWalletService().exportKey(keyId, format, loadPrivateKey)) } delete({ @@ -282,10 +285,10 @@ fun Application.keys() = walletRoute { HttpStatusCode.BadRequest to { description = "Key could not be deleted" } } }) { - val keyId = context.parameters.getOrFail("keyId") + val keyId = call.parameters.getOrFail("keyId") - val success = getWalletService().deleteKey(keyId) - context.respond(if (success) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + val success = call.getWalletService().deleteKey(keyId) + call.respond(if (success) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) } delete("remove", { @@ -295,10 +298,10 @@ fun Application.keys() = walletRoute { HttpStatusCode.BadRequest to { description = "Failed to remove the key" } } }) { - val keyId = context.parameters.getOrFail("keyId") + val keyId = call.parameters.getOrFail("keyId") - val success = getWalletService().removeKey(keyId) - context.respond(if (success) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + val success = call.getWalletService().removeKey(keyId) + call.respond(if (success) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) } post("sign", { @@ -313,9 +316,9 @@ fun Application.keys() = walletRoute { } } }) { - val keyId = context.parameters.getOrFail("keyId") - val message = context.receive() - context.respond(getWalletService().sign(keyId, message)) + val keyId = call.parameters.getOrFail("keyId") + val message = call.receive() + call.respond(call.getWalletService().sign(keyId, message)) } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ManifestController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ManifestController.kt index 92805e7e3..055f75152 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ManifestController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ManifestController.kt @@ -47,8 +47,8 @@ fun Application.manifest() = walletRoute { val credentialService = CredentialsService() val manifest = callManifest(call.parameters) { getManifest(it, credentialService) } when (manifest) { - null -> context.respond(HttpStatusCode.NoContent) - else -> context.respond(manifest) + null -> call.respond(HttpStatusCode.NoContent) + else -> call.respond(manifest) } } get("display", { @@ -75,8 +75,8 @@ fun Application.manifest() = walletRoute { }?.toString() when (manifest) { - null -> context.respond(HttpStatusCode.NoContent) - else -> context.respond(ManifestProvider.new(manifest).display()) + null -> call.respond(HttpStatusCode.NoContent) + else -> call.respond(ManifestProvider.new(manifest).display()) } } get("issuer", { @@ -103,8 +103,8 @@ fun Application.manifest() = walletRoute { }?.toString() when (manifest) { - null -> context.respond(HttpStatusCode.NoContent) - else -> context.respond(ManifestProvider.new(manifest).issuer()) + null -> call.respond(HttpStatusCode.NoContent) + else -> call.respond(ManifestProvider.new(manifest).issuer()) } } } @@ -140,8 +140,8 @@ fun Application.manifest() = walletRoute { val manifest = callManifest(call.parameters) { extractManifest(it) } when (manifest) { - null -> context.respond(HttpStatusCode.NoContent) - else -> context.respond(manifest) + null -> call.respond(HttpStatusCode.NoContent) + else -> call.respond(manifest) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/NotificationController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/NotificationController.kt index 015087e74..941426154 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/NotificationController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/NotificationController.kt @@ -82,9 +82,9 @@ object NotificationController { } } }) { - context.respond( + call.respond( WalletServiceManager.notificationFilterUseCase.filter( - getWalletId(), NotificationFilterParameter( + call.getWalletId(), NotificationFilterParameter( type = call.request.queryParameters["type"], isRead = call.request.queryParameters["isRead"]?.toBooleanStrictOrNull(), addedOn = call.request.queryParameters["addedOn"], @@ -101,7 +101,7 @@ object NotificationController { HttpStatusCode.BadRequest to { description = "Notifications could not be deleted" } } }) { - context.respond(if (WalletServiceManager.notificationUseCase.deleteAll(getWalletId()) > 0) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + call.respond(if (WalletServiceManager.notificationUseCase.deleteAll(call.getWalletId()) > 0) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) } put("status/{status}", { summary = "Set notification read status" @@ -123,7 +123,7 @@ object NotificationController { }) { val ids = call.receive>() val status = call.parameters.getOrFail("status").toBoolean() - context.respond( + call.respond( if (WalletServiceManager.notificationUseCase.setStatus( *ids.map { Uuid.parse(it) }.toTypedArray(), isRead = status ) > 0 @@ -149,7 +149,7 @@ object NotificationController { } }) { val id = call.parameters.getOrFail("id") - context.respond(WalletServiceManager.notificationUseCase.findById(Uuid.parse(id)).fold(onSuccess = { + call.respond(WalletServiceManager.notificationUseCase.findById(Uuid.parse(id)).fold(onSuccess = { it }, onFailure = { it.localizedMessage @@ -163,7 +163,7 @@ object NotificationController { } }) { val id = call.parameters.getOrFail("id") - context.respond(if (WalletServiceManager.notificationUseCase.deleteById(Uuid.parse(id)) > 0) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + call.respond(if (WalletServiceManager.notificationUseCase.deleteById(Uuid.parse(id)) > 0) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReasonController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReasonController.kt index 8c116aceb..84ec197ed 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReasonController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReasonController.kt @@ -23,7 +23,7 @@ fun Application.reasons() = authenticatedWebWalletRoute { } }) { val service = RejectionReasonService() - context.respond(service.list()) + call.respond(service.list()) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReportsController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReportsController.kt index 5a45a3cf2..3bf9174b2 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReportsController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReportsController.kt @@ -37,10 +37,10 @@ fun Application.reports() = walletRoute { } }) { val limit = call.request.queryParameters["limit"]?.toIntOrNull() - context.respond( - getWalletService().getFrequentCredentials( + call.respond( + call.getWalletService().getFrequentCredentials( CredentialReportRequestParameter( - walletId = getWalletId(), limit = limit + walletId = call.getWalletId(), limit = limit ) ) ) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/SilentExchangeController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/SilentExchangeController.kt index ea9482ccf..9676e3594 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/SilentExchangeController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/SilentExchangeController.kt @@ -29,9 +29,9 @@ fun Application.silentExchange() = webWalletRoute { runCatching { WalletServiceManager.silentClaimStrategy.claim(did, offer) }.onSuccess { - context.respond(HttpStatusCode.Accepted, it.size) + call.respond(HttpStatusCode.Accepted, it.size) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/TrustController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/TrustController.kt index b47a2912b..8ffb02ec6 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/TrustController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/TrustController.kt @@ -25,7 +25,7 @@ fun Application.trustRegistry() = authenticatedWebWalletRoute { val result = request.isVerifier.takeIf { it } ?.let { WalletServiceManager.verifierTrustValidationService.validate(request.did, request.credentialType, request.egfUri) } ?: WalletServiceManager.issuerTrustValidationService.validate(request.did, request.credentialType, request.egfUri) - context.respond(TrustResponse(result)) + call.respond(TrustResponse(result)) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/UtilityController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/UtilityController.kt index d9c57e3d6..022f69b58 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/UtilityController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/UtilityController.kt @@ -11,24 +11,25 @@ import io.ktor.server.request.* import io.ktor.server.response.* fun Application.utility() { - webWalletRoute { - route("util", { tags = listOf("Utilities") }) { - post("parseMDoc", { - summary = "Parse MDOC document to JSON element" - request { - body { - example("Sample mdoc") { - value = "a267646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c6973737565725369676e6564a26a6e616d65537061636573a1716f72672e69736f2e31383031332e352e3183d8185852a4686469676573744944006672616e646f6d50fce6b21d930b5b99fad34980ab06c8ee71656c656d656e744964656e7469666965726b66616d696c795f6e616d656c656c656d656e7456616c756563446f65d8185852a4686469676573744944016672616e646f6d5058daba0e58ae65726d9ba1aaa62256ee71656c656d656e744964656e7469666965726a676976656e5f6e616d656c656c656d656e7456616c7565644a6f686ed8185858a4686469676573744944026672616e646f6d5063fd5066277bce71963369771b78c1f671656c656d656e744964656e7469666965726a62697274685f646174656c656c656d656e7456616c75656a313938302d30312d30316a697373756572417574688443a10126a1182159014b308201473081eea003020102020839edc87a9a78f92a300a06082a8648ce3d04030230173115301306035504030c0c4d444f4320524f4f54204341301e170d3234303530323133313333305a170d3235303530323133313333305a301b3119301706035504030c104d444f432054657374204973737565723059301306072a8648ce3d020106082a8648ce3d030107034200041b4448341885fa84140f77790c69de810b977a7236f490da306a0cbe2a0a441379ddde146b36a44b6ba7bbc067b04b71bad4b692a4616013d893d440ae253781a320301e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780300a06082a8648ce3d04030203480030450221008e70041000ddec2a230b2586ecc59f8acd156f5d933d9363bc5e2263bb0ab69802201885a8b537327a69b022620f07c5c45d6293b86eed927a3f04e82cc51cadf8635901c3d8185901bea66776657273696f6e63312e306f646967657374416c676f726974686d675348412d3235366c76616c756544696765737473a1716f72672e69736f2e31383031332e352e31a3005820ac6801aa40d9871db115c9ba804bbccbddf7f29a6773d626cb6604d468e8714e015820066fc7c19bce2aeaf2d655351da21dbb12561db212e21e8c3e969fa469fd1c7c025820dbf831a97d5b504ca70c212224109e243f01f82cb4cde7c704a7166fd671ed326d6465766963654b6579496e666fa1696465766963654b6579a4010220012158200f08fd91a6b62e757e090514cd54d506ea4fb4354e10cdaa24c7748f59fb5e10225820ffa4113b5aef1a4dbd3fb4b9da126bc1ffc09b9cc679b4673dd321f021f2fc2167646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c76616c6964697479496e666fa3667369676e6564c0781e323032342d30372d32355431333a30353a33312e3438333237373433355a6976616c696446726f6dc0781e323032342d30372d32355431333a30353a33312e3438333237373738305a6a76616c6964556e74696cc0781e323032352d30372d32355431333a30353a33312e3438333237373836335a5840d57ee4f1a38cf49860b2f9b7c8f2469faa68720a8b731eae1d727e681bf0299fe86c0c120407cc8f0a7b951a6db6eac4c1905f07436fc556be1a65c13e432490" + webWalletRoute { + route("util", { tags = listOf("Utilities") }) { + post("parseMDoc", { + summary = "Parse MDOC document to JSON element" + request { + body { + example("Sample mdoc") { + value = + "a267646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c6973737565725369676e6564a26a6e616d65537061636573a1716f72672e69736f2e31383031332e352e3183d8185852a4686469676573744944006672616e646f6d50fce6b21d930b5b99fad34980ab06c8ee71656c656d656e744964656e7469666965726b66616d696c795f6e616d656c656c656d656e7456616c756563446f65d8185852a4686469676573744944016672616e646f6d5058daba0e58ae65726d9ba1aaa62256ee71656c656d656e744964656e7469666965726a676976656e5f6e616d656c656c656d656e7456616c7565644a6f686ed8185858a4686469676573744944026672616e646f6d5063fd5066277bce71963369771b78c1f671656c656d656e744964656e7469666965726a62697274685f646174656c656c656d656e7456616c75656a313938302d30312d30316a697373756572417574688443a10126a1182159014b308201473081eea003020102020839edc87a9a78f92a300a06082a8648ce3d04030230173115301306035504030c0c4d444f4320524f4f54204341301e170d3234303530323133313333305a170d3235303530323133313333305a301b3119301706035504030c104d444f432054657374204973737565723059301306072a8648ce3d020106082a8648ce3d030107034200041b4448341885fa84140f77790c69de810b977a7236f490da306a0cbe2a0a441379ddde146b36a44b6ba7bbc067b04b71bad4b692a4616013d893d440ae253781a320301e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780300a06082a8648ce3d04030203480030450221008e70041000ddec2a230b2586ecc59f8acd156f5d933d9363bc5e2263bb0ab69802201885a8b537327a69b022620f07c5c45d6293b86eed927a3f04e82cc51cadf8635901c3d8185901bea66776657273696f6e63312e306f646967657374416c676f726974686d675348412d3235366c76616c756544696765737473a1716f72672e69736f2e31383031332e352e31a3005820ac6801aa40d9871db115c9ba804bbccbddf7f29a6773d626cb6604d468e8714e015820066fc7c19bce2aeaf2d655351da21dbb12561db212e21e8c3e969fa469fd1c7c025820dbf831a97d5b504ca70c212224109e243f01f82cb4cde7c704a7166fd671ed326d6465766963654b6579496e666fa1696465766963654b6579a4010220012158200f08fd91a6b62e757e090514cd54d506ea4fb4354e10cdaa24c7748f59fb5e10225820ffa4113b5aef1a4dbd3fb4b9da126bc1ffc09b9cc679b4673dd321f021f2fc2167646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c76616c6964697479496e666fa3667369676e6564c0781e323032342d30372d32355431333a30353a33312e3438333237373433355a6976616c696446726f6dc0781e323032342d30372d32355431333a30353a33312e3438333237373738305a6a76616c6964556e74696cc0781e323032352d30372d32355431333a30353a33312e3438333237373836335a5840d57ee4f1a38cf49860b2f9b7c8f2469faa68720a8b731eae1d727e681bf0299fe86c0c120407cc8f0a7b951a6db6eac4c1905f07436fc556be1a65c13e432490" + } + } + } + response { + HttpStatusCode.OK to { description = "MDoc successfully parsed to JSON" } + } + }) { + val mdoc = call.receive() + call.respond(DataElement.fromCBORHex(mdoc).toJsonElement()) } - } } - response { - HttpStatusCode.OK to { description = "MDoc successfully parsed to JSON" } - } - }) { - val mdoc = call.receive() - call.respond(DataElement.fromCBORHex(mdoc).toJsonElement()) - } } - } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/WalletSettingsController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/WalletSettingsController.kt index a94b1f342..3f8cc933c 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/WalletSettingsController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/WalletSettingsController.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalUuidApi::class) + package id.walt.webwallet.web.controllers import id.walt.webwallet.service.settings.WalletSetting @@ -10,6 +12,7 @@ import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.response.* import kotlinx.serialization.json.JsonObject +import kotlin.uuid.ExperimentalUuidApi fun Application.settings() = walletRoute { route("settings", { @@ -25,10 +28,10 @@ fun Application.settings() = walletRoute { HttpStatusCode.BadRequest to { description = "Error fetching wallet settings" } } }) { - runCatching { getWalletService().getSettings() }.onSuccess { - context.respond(HttpStatusCode.OK, it) + runCatching { call.getWalletService().getSettings() }.onSuccess { + call.respond(HttpStatusCode.OK, it) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } //put @@ -44,11 +47,11 @@ fun Application.settings() = walletRoute { }) { runCatching { val request = call.receive() - getWalletService().setSettings(request) + call.getWalletService().setSettings(request) }.onSuccess { - context.respond(HttpStatusCode.Accepted) + call.respond(HttpStatusCode.Accepted) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/Web3Controller.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/Web3Controller.kt index 1d5d36868..8445bcc1e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/Web3Controller.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/Web3Controller.kt @@ -31,8 +31,8 @@ fun Application.web3accounts() = walletRoute { } } }) { - val wallet = getWalletService() - context.respond>(wallet.getLinkedWallets()) + val wallet = call.getWalletService() + call.respond>(wallet.getLinkedWallets()) } post("link", { @@ -49,9 +49,9 @@ fun Application.web3accounts() = walletRoute { } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val data = Json.decodeFromString(call.receive()) - context.respond(wallet.linkWallet(data)) + call.respond(wallet.linkWallet(data)) } post("unlink", { @@ -63,9 +63,9 @@ fun Application.web3accounts() = walletRoute { HttpStatusCode.OK to { description = "Wallet unlinked" } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val walletId = Uuid.parse(call.receiveText()) - context.respond(wallet.unlinkWallet(walletId)) + call.respond(wallet.unlinkWallet(walletId)) } post("connect", { @@ -82,9 +82,9 @@ fun Application.web3accounts() = walletRoute { } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val walletId = Uuid.parse(call.receiveText()) - context.respond(wallet.connectWallet(walletId)) + call.respond(wallet.connectWallet(walletId)) } post("disconnect", { @@ -96,9 +96,9 @@ fun Application.web3accounts() = walletRoute { HttpStatusCode.OK to { description = "Wallet disconnected" } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val walletId = Uuid.parse(call.receiveText()) - context.respond(wallet.disconnectWallet(walletId)) + call.respond(wallet.disconnectWallet(walletId)) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/AuthController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/AuthController.kt index 0fdefaccf..67bfe7651 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/AuthController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/AuthController.kt @@ -32,14 +32,13 @@ import io.ktor.server.auth.* import io.ktor.server.plugins.* import io.ktor.server.request.* import io.ktor.server.response.* +import io.ktor.server.routing.* import io.ktor.server.sessions.* -import io.ktor.util.pipeline.* import kotlinx.coroutines.runBlocking import kotlinx.datetime.Clock import kotlinx.datetime.toJavaInstant import kotlinx.serialization.Serializable import kotlinx.serialization.SerializationException -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.* import org.jetbrains.exposed.sql.and import org.jetbrains.exposed.sql.selectAll @@ -58,9 +57,11 @@ data class ByteLoginRequest(val username: String, val password: ByteArray) { override fun toString() = "[LOGIN REQUEST FOR: $username]" } -data class LoginTokenSession(val token: String) : Principal +@Serializable +data class LoginTokenSession(val token: String) -data class OidcTokenSession(val token: String) : Principal +@Serializable +data class OidcTokenSession(val token: String) object AuthKeys { private val config = ConfigManager.getConfig() @@ -132,7 +133,7 @@ suspend fun ApplicationCall.getLoginRequest() = runCatching { }.getOrElse { throw LoginRequestError(it) } -suspend fun PipelineContext.doLogin() { +suspend fun RoutingContext.doLogin() { val reqBody = call.getLoginRequest() val authenticatedUser = AccountsService.authenticate("", reqBody).getOrThrow() val now = Clock.System.now().toJavaInstant() @@ -159,14 +160,14 @@ suspend fun PipelineContext.doLogin() { ) } -fun PipelineContext.getUserId() = - call.principal("auth-session") - ?: call.principal("auth-bearer") - ?: call.principal("auth-bearer-alternative") - ?: call.principal() // bearer is registered with no name for some reason +fun ApplicationCall.getUserId() = + principal("auth-session") + ?: principal("auth-bearer") + ?: principal("auth-bearer-alternative") + ?: principal() // bearer is registered with no name for some reason ?: throw UnauthorizedException("Could not find user authorization within request.") -suspend fun PipelineContext.getUserUUID() = +suspend fun ApplicationCall.getUserUUID() = runCatching { when { FeatureManager.isFeatureEnabled(FeatureCatalog.legacyAuthenticationFeature) -> Uuid.parse(getUserId().name) @@ -175,25 +176,23 @@ suspend fun PipelineContext.getUserUUID() = } }.getOrElse { throw IllegalArgumentException("Invalid user id: $it") } -fun PipelineContext.getWalletId() = +fun ApplicationCall.getWalletId() = runCatching { - Uuid.parse(call.parameters["wallet"] ?: throw IllegalArgumentException("No wallet ID provided")) + Uuid.parse(parameters["wallet"] ?: throw IllegalArgumentException("No wallet ID provided")) }.getOrElse { throw IllegalArgumentException("Invalid wallet ID provided: ${it.message}") } .also { ensurePermissionsForWallet(AccountWalletPermissions.READ_ONLY, walletId = it) } -suspend fun PipelineContext.getWalletService(walletId: Uuid) = - WalletServiceManager.getWalletService("", getUserUUID(), walletId) // FIXME -> TENANT HERE - -suspend fun PipelineContext.getWalletService() = - WalletServiceManager.getWalletService("", getUserUUID(), getWalletId()) // FIXME -> TENANT HERE +@OptIn(ExperimentalUuidApi::class) +suspend fun ApplicationCall.getWalletService(walletId: Uuid? = null) = + WalletServiceManager.getWalletService("", getUserUUID(), walletId ?: getWalletId()) // FIXME -> TENANT HERE -fun PipelineContext.getUsersSessionToken(): String? = - call.sessions.get(LoginTokenSession::class)?.token - ?: call.request.authorization()?.removePrefix("Bearer ") +fun ApplicationCall.getUsersSessionToken(): String? = + sessions.get(LoginTokenSession::class)?.token + ?: request.authorization()?.removePrefix("Bearer ") -fun PipelineContext.ensurePermissionsForWallet( +fun ApplicationCall.ensurePermissionsForWallet( required: AccountWalletPermissions, userId: Uuid = runBlocking { getUserUUID() }, diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/Controller.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/Controller.kt index 971e35165..1330fb578 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/Controller.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/Controller.kt @@ -1,12 +1,10 @@ package id.walt.webwallet.web.controllers.auth import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute -import io.ktor.server.application.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* interface Controller { fun routes(name: String): Route.() -> Route fun apiBuilder(): OpenApiRoute.() -> Unit - suspend fun PipelineContext.execute() -} \ No newline at end of file + suspend fun RoutingContext.execute() +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/DefaultAuthRoutes.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/DefaultAuthRoutes.kt index 5f5fab7e9..c87d6e9ae 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/DefaultAuthRoutes.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/DefaultAuthRoutes.kt @@ -34,7 +34,7 @@ fun Application.defaultAuthRoutes() = webWalletRoute { } } }) { - getUsersSessionToken()?.run { + call.getUsersSessionToken()?.run { val jwsObject = JWSObject.parse(this) val uuid = Json.parseToJsonElement(jwsObject.payload.toString()).jsonObject["sub"]?.jsonPrimitive?.content.toString() @@ -42,7 +42,7 @@ fun Application.defaultAuthRoutes() = webWalletRoute { } ?: call.respond(HttpStatusCode.BadRequest) } get("session", { summary = "Return session ID if logged in" }) { - val token = getUsersSessionToken() ?: throw UnauthorizedException("Invalid session") + val token = call.getUsersSessionToken() ?: throw UnauthorizedException("Invalid session") call.respond(mapOf("token" to mapOf("accessToken" to token))) } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzController.kt index fc680b224..b0f58244f 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzController.kt @@ -20,7 +20,6 @@ import io.github.smiley4.ktorswaggerui.dsl.routing.route import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.datetime.Clock import kotlinx.datetime.toJavaInstant import org.jetbrains.exposed.sql.insert @@ -68,10 +67,10 @@ fun Application.ktorAuthnzRoutes() { summary = "Account authentication" description = "Configured authentication flow:

${flowConfig.toString().replace("\n", "
")}" }) { - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"], + tenant = request.host(), + sessionId = parameters["sessionId"], implicitSessionGeneration = true, initialFlow = authConfig.authFlow ) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzFrontendController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzFrontendController.kt index 51266e631..25609336e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzFrontendController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzFrontendController.kt @@ -31,7 +31,7 @@ fun Application.ktorAuthnzFrontendRoutes() { } } }) { - call.respond(getAuthenticatedAccount()) + call.respond(call.getAuthenticatedAccount()) } get("session", { summary = "Return session ID if logged in" }) { val token = getAuthenticatedSession().token ?: throw UnauthorizedException("Invalid session") @@ -52,12 +52,12 @@ fun Application.ktorAuthnzFrontendRoutes() { account to sessionToken } else { - val authenticatedAccount = getAuthenticatedAccount() + val authenticatedAccount = call.getAuthenticatedAccount() val authenticatedSessionToken = getAuthenticatedSession().token authenticatedAccount to authenticatedSessionToken } - context.respond( + call.respond( buildJsonObject { put("id", account) put("token", token) @@ -69,7 +69,7 @@ fun Application.ktorAuthnzFrontendRoutes() { call.response.cookies.append("ktor-authnz-auth", "", CookieEncoding.URI_ENCODING, 0L, GMTDate()) call.response.cookies.append("auth.token", "", CookieEncoding.URI_ENCODING, 0L, GMTDate()) - context.respond(HttpStatusCode.OK) + call.respond(HttpStatusCode.OK) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LoginControllerBase.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LoginControllerBase.kt index 0501422c9..5e9d636fe 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LoginControllerBase.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LoginControllerBase.kt @@ -8,10 +8,8 @@ import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute import io.github.smiley4.ktorswaggerui.dsl.routing.post import io.github.smiley4.ktorswaggerui.dsl.routing.route import io.ktor.http.* -import io.ktor.server.application.* import io.ktor.server.plugins.ratelimit.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* abstract class LoginControllerBase( private val path: String = defaultAuthPath, @@ -52,7 +50,7 @@ abstract class LoginControllerBase( } } - override suspend fun PipelineContext.execute() { + override suspend fun RoutingContext.execute() { doLogin() } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LogoutControllerBase.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LogoutControllerBase.kt index ded1735ec..60052dedf 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LogoutControllerBase.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LogoutControllerBase.kt @@ -5,11 +5,9 @@ import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute import io.github.smiley4.ktorswaggerui.dsl.routing.post import io.github.smiley4.ktorswaggerui.dsl.routing.route import io.ktor.http.* -import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.routing.* import io.ktor.server.sessions.* -import io.ktor.util.pipeline.* abstract class LogoutControllerBase( private val path: String = defaultAuthPath, @@ -28,12 +26,12 @@ abstract class LogoutControllerBase( response { HttpStatusCode.OK to { description = "Logged out." } } } - override suspend fun PipelineContext.execute() { + override suspend fun RoutingContext.execute() { clearUserSession() call.respond(HttpStatusCode.OK) } - protected fun PipelineContext.clearUserSession() { + protected fun RoutingContext.clearUserSession() { call.sessions.get()?.let { logger.debug { "Clearing login token session" } call.sessions.clear() @@ -44,4 +42,4 @@ abstract class LogoutControllerBase( call.sessions.clear() } } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/RegisterControllerBase.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/RegisterControllerBase.kt index d1e64236d..51b609780 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/RegisterControllerBase.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/RegisterControllerBase.kt @@ -7,11 +7,9 @@ import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute import io.github.smiley4.ktorswaggerui.dsl.routing.post import io.github.smiley4.ktorswaggerui.dsl.routing.route import io.ktor.http.* -import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.response.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* abstract class RegisterControllerBase( private val path: String = defaultAuthPath, @@ -53,7 +51,7 @@ abstract class RegisterControllerBase( } } - override suspend fun PipelineContext.execute() { + override suspend fun RoutingContext.execute() { // val jsonObject = call.receive() // val type = jsonObject["type"]?.jsonPrimitive?.contentOrNull // if (type.isNullOrEmpty()) { @@ -71,4 +69,4 @@ abstract class RegisterControllerBase( throw it } } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/keycloak/KeycloakLogoutController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/keycloak/KeycloakLogoutController.kt index 1f605a3a1..59905c4da 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/keycloak/KeycloakLogoutController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/keycloak/KeycloakLogoutController.kt @@ -5,10 +5,9 @@ import id.walt.webwallet.web.controllers.auth.LogoutControllerBase import id.walt.webwallet.web.model.KeycloakLogoutRequest import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute import io.ktor.http.* -import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.response.* -import io.ktor.util.pipeline.* +import io.ktor.server.routing.* import kotlinx.serialization.json.Json class KeycloakLogoutController : LogoutControllerBase(keycloakAuthPath, keycloakAuthTags) { @@ -29,10 +28,10 @@ class KeycloakLogoutController : LogoutControllerBase(keycloakAuthPath, keycloak response { HttpStatusCode.OK to { description = "Keycloak HTTP status code." } } } - override suspend fun PipelineContext.execute() { + override suspend fun RoutingContext.execute() { clearUserSession() logger.debug { "Clearing Keycloak user session" } val req = Json.decodeFromString(call.receive()) call.respond("Keycloak responded with: ${KeycloakAccountStrategy.logout(req)}") } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/oidc/OidcLogoutController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/oidc/OidcLogoutController.kt index 2b1e5a814..153553e96 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/oidc/OidcLogoutController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/oidc/OidcLogoutController.kt @@ -3,13 +3,12 @@ package id.walt.webwallet.web.controllers.auth.oidc import id.walt.webwallet.service.WalletServiceManager.oidcConfig import id.walt.webwallet.web.controllers.auth.LogoutControllerBase import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute -import io.ktor.server.application.* import io.ktor.server.response.* -import io.ktor.util.pipeline.* +import io.ktor.server.routing.* class OidcLogoutController : LogoutControllerBase() { override fun apiBuilder(): OpenApiRoute.() -> Unit = { description = "Logout via OIDC provider" } - override suspend fun PipelineContext.execute() { + override suspend fun RoutingContext.execute() { call.respondRedirect("${oidcConfig.logoutUrl}?post_logout_redirect_uri=${oidcConfig.publicBaseUrl}&client_id=${oidcConfig.clientId}") } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeController.kt index 8c5a52ebd..8cddf317b 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeController.kt @@ -16,8 +16,8 @@ import id.walt.webwallet.web.controllers.auth.getUserUUID import id.walt.webwallet.web.controllers.auth.getWalletId import id.walt.webwallet.web.controllers.auth.getWalletService import id.walt.webwallet.web.controllers.exchange.openapi.ExchangeOpenApiCommons -import io.github.smiley4.ktorswaggerui.dsl.routing.get import id.walt.webwallet.web.controllers.walletRoute +import io.github.smiley4.ktorswaggerui.dsl.routing.get import io.github.smiley4.ktorswaggerui.dsl.routing.post import io.github.smiley4.ktorswaggerui.dsl.routing.route import io.ktor.http.* @@ -47,7 +47,7 @@ fun Application.exchange() = walletRoute { response(ExchangeOpenApiCommons.useOfferRequestEndpointResponseParams()) }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val did = call.request.queryParameters["did"] ?: wallet.listDids().firstOrNull()?.did ?: throw IllegalArgumentException("No DID to use supplied and no DID was found in wallet.") @@ -58,7 +58,7 @@ fun Application.exchange() = walletRoute { runCatching { WalletServiceManager.explicitClaimStrategy.claim( tenant = wallet.tenant, - account = getUserUUID(), + account = call.getUserUUID(), wallet = wallet.walletId, did = did, offer = offer, @@ -74,10 +74,10 @@ fun Application.exchange() = walletRoute { ) } }.onSuccess { - context.respond(HttpStatusCode.OK, it) + call.respond(HttpStatusCode.OK, it) }.onFailure { error -> error.printStackTrace() - context.respond(HttpStatusCode.BadRequest, error.message ?: "Unknown error") + call.respond(HttpStatusCode.BadRequest, error.message ?: "Unknown error") } } post("matchCredentialsForPresentationDefinition", { @@ -94,9 +94,10 @@ fun Application.exchange() = walletRoute { } } }) { - val presentationDefinition = PresentationDefinition.fromJSON(context.receive()) - val matchedCredentials = WalletServiceManager.matchCredentialsForPresentationDefinition(getWalletId(), presentationDefinition) - context.respond(matchedCredentials) + val presentationDefinition = PresentationDefinition.fromJSON(call.receive()) + val matchedCredentials = + WalletServiceManager.matchCredentialsForPresentationDefinition(call.getWalletId(), presentationDefinition) + call.respond(matchedCredentials) } post("unmatchedCredentialsForPresentationDefinition", { summary = @@ -113,11 +114,11 @@ fun Application.exchange() = walletRoute { } } }) { - val presentationDefinition = PresentationDefinition.fromJSON(context.receive()) + val presentationDefinition = PresentationDefinition.fromJSON(call.receive()) val unmatchedCredentialTypes = WalletServiceManager.unmatchedPresentationDefinitionCredentialsUseCase.find( - getWalletId(), presentationDefinition + call.getWalletId(), presentationDefinition ) - context.respond(unmatchedCredentialTypes) + call.respond(unmatchedCredentialTypes) } post("usePresentationRequest", { @@ -128,7 +129,7 @@ fun Application.exchange() = walletRoute { } response(ExchangeOpenApiCommons.usePresentationRequestResponse()) }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val req = call.receive() println("req: $req") @@ -169,7 +170,7 @@ fun Application.exchange() = walletRoute { ) ) - context.respond(HttpStatusCode.OK, mapOf("redirectUri" to result.getOrThrow())) + call.respond(HttpStatusCode.OK, mapOf("redirectUri" to result.getOrThrow())) } else { val err = result.exceptionOrNull() println("Presentation failed: $err") @@ -189,7 +190,7 @@ fun Application.exchange() = walletRoute { ) when (err) { is SSIKit2WalletService.PresentationError -> { - context.respond( + call.respond( HttpStatusCode.BadRequest, mapOf( "redirectUri" to err.redirectUri, "errorMessage" to err.message @@ -197,7 +198,7 @@ fun Application.exchange() = walletRoute { ) } - else -> context.respond(HttpStatusCode.BadRequest, mapOf("errorMessage" to err?.message)) + else -> call.respond(HttpStatusCode.BadRequest, mapOf("errorMessage" to err?.message)) } } } @@ -213,10 +214,10 @@ fun Application.exchange() = walletRoute { } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val request = call.receiveText() val parsedRequest = wallet.resolvePresentationRequest(request) - context.respond(parsedRequest) + call.respond(parsedRequest) } post("resolveCredentialOffer", { summary = "Return resolved / parsed credential offer" @@ -232,14 +233,14 @@ fun Application.exchange() = walletRoute { } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val request = call.receiveText() val reqParams = Url(request).parameters.toMap() val parsedOffer = wallet.resolveCredentialOffer(CredentialOfferRequest.fromHttpParameters(reqParams)) val serializedOffer = Json.encodeToString(CredentialOfferSerializer, parsedOffer) - context.respondText(serializedOffer, ContentType.Application.Json) + call.respondText(serializedOffer, ContentType.Application.Json) } get("resolveVctUrl", { summary = "Receive an verifiable credential type (VCT) URL and return resolved vct object as described in IETF SD-JWT VC" @@ -258,14 +259,14 @@ fun Application.exchange() = walletRoute { } }) { val vct = call.request.queryParameters["vct"] ?: throw IllegalArgumentException("VCT not set") - val wallet = getWalletService() + val wallet = call.getWalletService() runCatching { wallet.resolveVct(vct) }.onSuccess { - context.respond(HttpStatusCode.OK, it.toJSON()) + call.respond(HttpStatusCode.OK, it.toJSON()) }.onFailure { error -> error.printStackTrace() - context.respond(HttpStatusCode.BadRequest, error.message ?: "Unknown error") + call.respond(HttpStatusCode.BadRequest, error.message ?: "Unknown error") } } get("resolveIssuerOpenIDMetadata", { @@ -282,7 +283,7 @@ fun Application.exchange() = walletRoute { }) { val issuer = call.request.queryParameters["issuer"] ?: throw BadRequestException("Issuer base url not set") val serializedMetadata = Json.encodeToString(OpenIDProviderMetadataSerializer, OpenID4VCI.resolveCIProviderMetadata(issuer)) - context.respondText(serializedMetadata, ContentType.Application.Json) + call.respondText(serializedMetadata, ContentType.Application.Json) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeExternalSignaturesController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeExternalSignaturesController.kt index edd0ea4b8..fd39d2b41 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeExternalSignaturesController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeExternalSignaturesController.kt @@ -5,12 +5,13 @@ package id.walt.webwallet.web.controllers.exchange import com.nimbusds.jose.jwk.JWK import com.nimbusds.jose.jwk.KeyUse import com.nimbusds.jose.util.Base64URL -import id.walt.credentials.utils.VCFormat import id.walt.crypto.keys.KeyGenerationRequest import id.walt.crypto.keys.KeyManager import id.walt.crypto.keys.KeyType import id.walt.crypto.utils.JsonUtils.toJsonElement -import id.walt.oid4vc.data.* +import id.walt.oid4vc.data.CredentialFormat +import id.walt.oid4vc.data.ResponseMode +import id.walt.oid4vc.data.VpTokenParameter import id.walt.oid4vc.data.dif.PresentationSubmission import id.walt.oid4vc.errors.AuthorizationError import id.walt.oid4vc.requests.AuthorizationRequest @@ -48,7 +49,10 @@ import io.ktor.server.request.* import io.ktor.server.response.* import io.ktor.util.* import kotlinx.coroutines.runBlocking -import kotlinx.serialization.json.* +import kotlinx.serialization.json.JsonArray +import kotlinx.serialization.json.JsonPrimitive +import kotlinx.serialization.json.jsonArray +import kotlinx.serialization.json.jsonObject import kotlin.uuid.ExperimentalUuidApi import kotlin.uuid.Uuid @@ -101,7 +105,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { } } }) { - val walletService = getWalletService() + val walletService = call.getWalletService() runCatching { val req = call.receive() logger.debug { "Request: $req" } @@ -169,7 +173,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { req.disclosures, ) - val (rootPathVP, rootPathMDoc) = if (ietfVpTokenParams != null && w3cJwtVpTokenParams == null) { + val (rootPathVP, _) = if (ietfVpTokenParams != null && w3cJwtVpTokenParams == null) { Pair("$", "$[0]") } else if (ietfVpTokenParams != null) { Pair("$[0]", "$[1]") @@ -215,14 +219,14 @@ fun Application.exchangeExternalSignatures() = walletRoute { }.onSuccess { responsePayload -> logger.debug { "Response payload: $responsePayload" } - context.respond( + call.respond( HttpStatusCode.OK, responsePayload, ) }.onFailure { error -> logger.debug { "error: $error" } - context.respond( + call.respond( HttpStatusCode.BadRequest, error.message ?: "Unknown error", ) @@ -253,7 +257,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { response(ExchangeOpenApiCommons.usePresentationRequestResponse()) }) { - val walletService = getWalletService() + val walletService = call.getWalletService() runCatching { val req = call.receive() @@ -312,7 +316,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { if (authReq.responseMode == ResponseMode.direct_post_jwt) { val encKey = authReq.clientMetadata?.jwks?.get("keys")?.jsonArray?.first { jwk -> - JWK.parse(jwk.toString()).keyUse?.equals(KeyUse.ENCRYPTION) ?: false + JWK.parse(jwk.toString()).keyUse?.equals(KeyUse.ENCRYPTION) == true }?.jsonObject ?: throw Exception("No ephemeral reader key found") val ephemeralWalletKey = runBlocking { KeyManager.createKey(KeyGenerationRequest(keyType = KeyType.secp256r1)) } @@ -379,14 +383,14 @@ fun Application.exchangeExternalSignatures() = walletRoute { } else { throw PresentationError( message = - if (responseBody.isNotBlank()) "Presentation failed:\n $responseBody" - else "Presentation failed", + if (responseBody.isNotBlank()) "Presentation failed:\n $responseBody" + else "Presentation failed", redirectUri = "" ) } } }.onSuccess { - context.respond( + call.respond( HttpStatusCode.OK, it, ) @@ -394,7 +398,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { logger.debug { "error: $error" } when (error) { is PresentationError -> { - context.respond( + call.respond( HttpStatusCode.BadRequest, mapOf( "redirectUri" to error.redirectUri, @@ -404,7 +408,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { } else -> { - context.respond( + call.respond( HttpStatusCode.BadRequest, mapOf( "errorMessage" to error.message @@ -451,7 +455,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { } } }) { - val walletService = getWalletService() + val walletService = call.getWalletService() runCatching { val req = call.receive() @@ -497,12 +501,12 @@ fun Application.exchangeExternalSignatures() = walletRoute { ) } }.onSuccess { responsePayload -> - context.respond( + call.respond( HttpStatusCode.OK, responsePayload, ) }.onFailure { error -> - context.respond( + call.respond( HttpStatusCode.BadRequest, error.message ?: "Unknown error", ) @@ -532,7 +536,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { response(ExchangeOpenApiCommons.useOfferRequestEndpointResponseParams()) }) { - val walletService = getWalletService() + val walletService = call.getWalletService() runCatching { val req = call.receive() @@ -546,7 +550,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { tenantId = walletService.tenant, accountId = walletService.accountId, walletId = walletService.walletId, - pending = req.requireUserInput ?: true, + pending = req.requireUserInput != false, did = did, offerURL = req.offerURL, credentialIssuerURL = req.credentialIssuer, @@ -554,12 +558,12 @@ fun Application.exchangeExternalSignatures() = walletRoute { offeredCredentialProofsOfPossession = req.offeredCredentialProofsOfPossession, ) }.onSuccess { walletCredentialList -> - context.respond( + call.respond( HttpStatusCode.OK, walletCredentialList, ) }.onFailure { error -> - context.respond( + call.respond( HttpStatusCode.BadRequest, error.message ?: "Unknown error", ) diff --git a/waltid-services/waltid-wallet-api/src/main/resources/example_klogging.conf b/waltid-services/waltid-wallet-api/src/main/resources/example_klogging.conf index 7de60d22a..40438a6d0 100644 --- a/waltid-services/waltid-wallet-api/src/main/resources/example_klogging.conf +++ b/waltid-services/waltid-wallet-api/src/main/resources/example_klogging.conf @@ -1,17 +1,17 @@ sinks = { - stdout = { - renderWith = "RENDER_ANSI" - sendTo = "STDOUT" - } + stdout = { + renderWith = "RENDER_ANSI" + sendTo = "STDOUT" + } } logging = [ - { - levelRanges = [ - { - fromMinLevel = "INFO" - toSinks = ["stdout"] - } - ] - } + { + levelRanges = [ + { + fromMinLevel = "INFO" + toSinks = ["stdout"] + } + ] + } ] diff --git a/waltid-services/waltid-wallet-api/src/test/kotlin/E2EWalletTestBase.kt b/waltid-services/waltid-wallet-api/src/test/kotlin/E2EWalletTestBase.kt index c32329d03..7576ef2dd 100644 --- a/waltid-services/waltid-wallet-api/src/test/kotlin/E2EWalletTestBase.kt +++ b/waltid-services/waltid-wallet-api/src/test/kotlin/E2EWalletTestBase.kt @@ -14,9 +14,7 @@ import io.ktor.client.call.* import io.ktor.client.request.* import io.ktor.client.statement.* import io.ktor.http.* -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.* - import kotlin.test.assertEquals import kotlin.test.assertNotEquals import kotlin.test.assertNotNull diff --git a/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/service/credentials/status/fetch/DefaultStatusListCredentialFetchStrategyTest.kt b/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/service/credentials/status/fetch/DefaultStatusListCredentialFetchStrategyTest.kt index 9de753f63..799fbca75 100644 --- a/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/service/credentials/status/fetch/DefaultStatusListCredentialFetchStrategyTest.kt +++ b/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/service/credentials/status/fetch/DefaultStatusListCredentialFetchStrategyTest.kt @@ -76,12 +76,9 @@ class DefaultStatusListCredentialFetchStrategyTest { const val credentialResourcePath = "credential-status/status-list-credential" const val statusCredentialPath = "credentials/%s" - private val environment = applicationEngineEnvironment { - envConfig() - } - val server: ApplicationEngine by lazy { + val server: EmbeddedServer<*, *> by lazy { println("Initializing embedded webserver...") - embeddedServer(CIO, environment) + embeddedServer(CIO, applicationEnvironment(), { envConfig() }, module = { module() }) } private fun Application.module() { @@ -90,20 +87,17 @@ class DefaultStatusListCredentialFetchStrategyTest { } routing { get("credentials/{id}") { - val id = context.parameters.getOrFail("id") + val id = call.parameters.getOrFail("id") val credential = TestUtils.loadResource("$credentialResourcePath/$id.json") call.respond(credential) } } } - private fun ApplicationEngineEnvironmentBuilder.envConfig() { - module { - module() - } + private fun ApplicationEngine.Configuration.envConfig() { connector { port = serverPort } } } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/utils/PKIXUtilsTest.kt b/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/utils/PKIXUtilsTest.kt index 3414cea76..4b16616b9 100644 --- a/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/utils/PKIXUtilsTest.kt +++ b/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/utils/PKIXUtilsTest.kt @@ -1,8 +1,8 @@ package id.walt.webwallet.utils import kotlinx.coroutines.test.runTest -import org.junit.Test import java.security.KeyPairGenerator +import kotlin.test.Test import kotlin.test.assertTrue class PKIXUtilsTest { @@ -18,6 +18,6 @@ class PKIXUtilsTest { val keyPair = keyPairGenerator.generateKeyPair() val pemEncodedPrivateKey = PKIXUtils.pemEncodeJavaPrivateKey(keyPair.private) val decodedPrivateKey = PKIXUtils.pemDecodeJavaPrivateKey(pemEncodedPrivateKey) - assertTrue { keyPair.private.encoded.contentEquals(decodedPrivateKey.encoded)} + assertTrue { keyPair.private.encoded.contentEquals(decodedPrivateKey.encoded) } } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message-vc-wrapped.json b/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message-vc-wrapped.json index 805c64d7e..bf1d31698 100644 --- a/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message-vc-wrapped.json +++ b/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message-vc-wrapped.json @@ -1,19 +1,15 @@ { - "vc": - { - "type": - [ + "vc": { + "type": [ "VerifiableCredential", "RevocationList2020" ], - "credentialSubject": - { + "credentialSubject": { "id": "urn:uuid:cca8bd0a-83c2-4ae1-9f43-e99943cdfa5c", "type": "RevocationList2020", "statusPurpose": "status", "statusSize": 2, - "statusMessage": - [ + "statusMessage": [ { "status": "0x0", "message": "valid" @@ -34,4 +30,4 @@ "encodedList": "H4sIAAAAAAAA/zMwNABDAKb12i0IAAAA" } } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message.json b/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message.json index 01fc9f023..05b10a4d2 100644 --- a/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message.json +++ b/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message.json @@ -1,17 +1,14 @@ { - "type": - [ + "type": [ "VerifiableCredential", "RevocationList2020" ], - "credentialSubject": - { + "credentialSubject": { "id": "urn:uuid:cca8bd0a-83c2-4ae1-9f43-e99943cdfa5c", "type": "RevocationList2020", "statusPurpose": "status", "statusSize": 2, - "statusMessage": - [ + "statusMessage": [ { "status": "0x0", "message": "valid" @@ -31,4 +28,4 @@ ], "encodedList": "H4sIAAAAAAAA/zMwNABDAKb12i0IAAAA" } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-web3login-microservice/build.gradle.kts b/waltid-services/waltid-web3login-microservice/build.gradle.kts index 855a813f3..d235b0689 100644 --- a/waltid-services/waltid-web3login-microservice/build.gradle.kts +++ b/waltid-services/waltid-web3login-microservice/build.gradle.kts @@ -1,7 +1,8 @@ plugins { kotlin("jvm") version "2.0.0" - id("io.ktor.plugin") version "2.3.12" + id("io.ktor.plugin") version "3.1.0" id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0" + id("com.github.ben-manes.versions") } group = "id.walt" @@ -27,7 +28,6 @@ dependencies { implementation("io.ktor:ktor-server-content-negotiation-jvm") implementation("io.ktor:ktor-serialization-kotlinx-json-jvm") implementation("io.ktor:ktor-server-cio-jvm") - testImplementation("io.ktor:ktor-server-tests-jvm") testImplementation(kotlin("test-junit")) // nftkit diff --git a/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/NftController.kt b/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/NftController.kt index ed5fb2b64..903c05038 100644 --- a/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/NftController.kt +++ b/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/NftController.kt @@ -37,7 +37,7 @@ fun Application.nfts() = walletRoute { }) { val nft = getNftService() val ecosystem = call.parameters["ecosystem"] ?: throw IllegalArgumentException("No ecosystem provided") - context.respond(nft.getChains(ecosystem = ecosystem)) + call.respond(nft.getChains(ecosystem = ecosystem)) } get("filter", { summary = "Fetch the list of tokens with details" @@ -61,9 +61,9 @@ fun Application.nfts() = walletRoute { } }) { val nft = getNftService() - val accountIds = context.request.queryParameters.getAll("accountId") - val networks = context.request.queryParameters.getAll("network") - context.respond( + val accountIds = call.request.queryParameters.getAll("accountId") + val networks = call.request.queryParameters.getAll("network") + call.respond( nft.filterTokens("", FilterParameter(accountIds ?: emptyList(), networks ?: emptyList())) // FIXME -> TENANT HERE ) @@ -91,7 +91,7 @@ fun Application.nfts() = walletRoute { val nft = getNftService() val chain = call.parameters["chain"] ?: throw IllegalArgumentException("No chain provided") val account = call.parameters["account"] ?: throw IllegalArgumentException("No account provided") - context.respond( + call.respond( nft.getTokens( "", // FIXME -> TENANT HERE ListFetchParameter( @@ -137,7 +137,7 @@ fun Application.nfts() = walletRoute { val account = call.parameters["account"] ?: throw IllegalArgumentException("No account provided") val contract = call.parameters["contract"] ?: throw IllegalArgumentException("No contract provided") val tokenId = call.parameters["tokenId"] ?: throw IllegalArgumentException("No tokenId provided") - val collection = context.request.queryParameters["collectionId"] + val collection = call.request.queryParameters["collectionId"] val nft = getNftService() runCatching { nft.getTokenDetails( @@ -151,7 +151,7 @@ fun Application.nfts() = walletRoute { ) ) }.onSuccess { - context.respond(it) + call.respond(it) }.onFailure { context.response.status(HttpStatusCode.NotFound) } } get("marketplace/{chain}/{contract}/{tokenId}", { @@ -185,7 +185,7 @@ fun Application.nfts() = walletRoute { tokenId = call.parameters["tokenId"] ?: throw IllegalArgumentException("No tokenId provided") ) )?.run { - context.respond(this) + call.respond(this) } ?: run { context.response.status(HttpStatusCode.NotFound) } @@ -217,7 +217,7 @@ fun Application.nfts() = walletRoute { ?: throw IllegalArgumentException("No contract provided"), ) )?.run { - context.respond(this) + call.respond(this) } ?: run { context.response.status(HttpStatusCode.NotFound) } diff --git a/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/plugins/Monitoring.kt b/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/plugins/Monitoring.kt index 88530779a..4bc819b85 100644 --- a/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/plugins/Monitoring.kt +++ b/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/plugins/Monitoring.kt @@ -1,7 +1,7 @@ package id.walt.plugins import io.ktor.server.application.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.CallLogging import io.ktor.server.request.* import org.slf4j.event.* From ed5000d21f30d6771d7ac1b7300d5650dc3d82ad Mon Sep 17 00:00:00 2001 From: waltkb <68587968+waltkb@users.noreply.github.com> Date: Mon, 17 Feb 2025 23:04:56 +0100 Subject: [PATCH 2/6] Update dependencies, fix build issues --- .run/Verifier.run.xml | 26 ++-- build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 +- .../waltid-android/build.gradle.kts | 7 +- .../waltid-cli/build.gradle.kts | 32 ++-- .../kotlin/id/walt/cli/WaltIdCmd.kt | 21 ++- .../kotlin/id/walt/cli/commands/Did.kt | 5 +- .../kotlin/id/walt/cli/commands/DidCmd.kt | 10 +- .../id/walt/cli/commands/DidCreateCmd.kt | 15 +- .../id/walt/cli/commands/DidResolveCmd.kt | 21 ++- .../kotlin/id/walt/cli/commands/KeyCmd.kt | 10 +- .../id/walt/cli/commands/KeyConvertCmd.kt | 17 +- .../id/walt/cli/commands/KeyGenerateCmd.kt | 15 +- .../kotlin/id/walt/cli/commands/VCCmd.kt | 8 +- .../kotlin/id/walt/cli/commands/VCSignCmd.kt | 21 +-- .../id/walt/cli/commands/VCVerifyCmd.kt | 23 +-- .../kotlin/id/walt/cli/commands/VPCmd.kt | 10 +- .../id/walt/cli/commands/VPCreateCmd.kt | 17 +- .../id/walt/cli/commands/VPVerifyCmd.kt | 26 ++-- .../id/walt/cli/commands/WaltIdCmdTest.kt | 3 +- .../id/walt/cli/commands/WaltIdDidCmdTest.kt | 3 +- .../cli/commands/WaltIdDidCreateCmdTest.kt | 1 + .../cli/commands/WaltIdDidResolveCmdTest.kt | 3 +- .../id/walt/cli/commands/WaltIdKeyCmdTest.kt | 1 + .../cli/commands/WaltIdKeyConvertCmdTest.kt | 19 +-- .../cli/commands/WaltIdKeyGenerateCmdTest.kt | 3 +- .../id/walt/cli/commands/WaltIdVCCmdTest.kt | 7 +- .../walt/cli/commands/WaltIdVCSignCmdTest.kt | 3 +- .../cli/commands/WaltIdVCVerifyCmdTest.kt | 8 +- .../cli/commands/WaltIdVPCreateCmdTest.kt | 3 +- .../shared/build.gradle.kts | 4 +- .../auth/waltid-idpkit/build.gradle.kts | 15 +- .../src/main/kotlin/id/walt/idp/poc/App.kt | 29 +--- .../auth/waltid-ktor-authnz/build.gradle.kts | 22 +-- .../docs/new-auth-method.md | 8 +- .../auth/KtorAuthnzAuthenticationHelpers.kt | 20 +-- .../methods/AuthenticationMethod.kt | 16 +- .../id/walt/ktorauthnz/methods/EmailPass.kt | 11 +- .../kotlin/id/walt/ktorauthnz/methods/JWT.kt | 9 +- .../id/walt/ktorauthnz/methods/Kerberos.kt | 6 +- .../kotlin/id/walt/ktorauthnz/methods/LDAP.kt | 9 +- .../kotlin/id/walt/ktorauthnz/methods/OIDC.kt | 13 +- .../id/walt/ktorauthnz/methods/RADIUS.kt | 10 +- .../kotlin/id/walt/ktorauthnz/methods/TOTP.kt | 7 +- .../id/walt/ktorauthnz/methods/UserPass.kt | 9 +- .../methods/VerifiableCredential.kt | 11 +- .../kotlin/id/walt/ktorauthnz/methods/Web3.kt | 9 +- .../methods/virtual/GlobalIdentify.kt | 2 +- .../methods/virtual/IdentifyEmail.kt | 4 +- .../id/walt/AuthFlowExampleApplication.kt | 6 +- .../src/test/kotlin/id/walt/ExampleWeb.kt | 40 ++--- .../kotlin/id/walt/KtorAuthnzDevMockedTest.kt | 6 +- .../src/test/kotlin/id/walt/RouteCollector.kt | 70 ++++----- .../kotlin/id/walt/web/plugins/Monitoring.kt | 2 +- .../kotlin/id/walt/web/plugins/OpenApi.kt | 2 +- .../auth/waltid-permissions/build.gradle.kts | 6 +- .../build.gradle.kts | 10 +- .../waltid-mdoc-credentials/build.gradle.kts | 13 +- .../build.gradle.kts | 20 +-- .../build.gradle.kts | 20 +-- .../policies/DynamicPolicyVerificationTest.kt | 9 +- .../waltid-crypto-android/build.gradle.kts | 10 +- .../crypto/waltid-crypto-aws/build.gradle.kts | 10 +- .../crypto/waltid-crypto-ios/build.gradle.kts | 1 + .../crypto/waltid-crypto-oci/build.gradle.kts | 22 +-- .../crypto/waltid-crypto/build.gradle.kts | 34 ++-- .../kotlin/id/walt/crypto/keys/tse/TSEKey.kt | 1 - .../crypto/waltid-target-ios/build.gradle.kts | 5 +- .../waltid-openid4vc/build.gradle.kts | 30 ++-- .../sdjwt/waltid-sdjwt-ios/build.gradle.kts | 1 + .../sdjwt/waltid-sdjwt/build.gradle.kts | 12 +- .../util/waltid-reporting/build.gradle.kts | 18 +-- .../waltid-core-wallet/build.gradle.kts | 21 +-- waltid-libraries/waltid-did/build.gradle.kts | 27 ++-- .../did/dids/document/DidCheqdDocument.kt | 2 +- .../local/cheqd/DidCheqdRegistrar.kt | 20 ++- .../didstates/{action => }/ActionDidState.kt | 20 ++- .../didstates/{finished => }/DidDocument.kt | 3 +- .../cheqd/models/job/didstates/DidState.kt | 7 +- .../didstates/{failed => }/FailedDidState.kt | 3 +- .../{finished => }/FinishedDidState.kt | 4 +- .../models/job/didstates/action/Secret.kt | 12 -- .../job/didstates/action/SigningRequest.kt | 15 -- .../dids/resolver/local/DidCheqdResolver.kt | 2 +- .../kotlin/LocalDidWebConsistencyTest.kt | 17 +- .../src/jvmTest/kotlin/TestServer.kt | 13 +- .../registrars/DidCheqdRegistrarTest.kt | 3 + .../jvmTest/resources/simplelogger.properties | 4 + .../waltid-java-compat/build.gradle.kts | 1 + .../waltid-library-commons/build.gradle.kts | 2 +- .../waltid-e2e-tests/build.gradle.kts | 21 +-- .../waltid-issuer-api/build.gradle.kts | 20 +-- .../id/walt/issuer/NewTestOidcMetadata.kt | 2 +- .../id/walt/issuer/entra/EntraIssuanceApi.kt | 4 +- .../id/walt/issuer/issuance/IssuerApi.kt | 145 +++++++----------- .../kotlin/id/walt/issuer/issuance/OidcApi.kt | 2 +- .../id/walt/issuer/issuance2/NewApiStub.kt | 2 +- .../LspPotentialIssuanceInterop.kt | 4 +- .../id/walt/issuer/web/plugins/Monitoring.kt | 3 +- .../build.gradle.kts | 6 +- .../waltid-service-commons/build.gradle.kts | 34 ++-- .../logging/setups/TraceLoggingSetup.kt | 2 +- .../modules/FeatureFlagInformationModule.kt | 4 +- .../walt/commons/web/modules/OpenApiModule.kt | 14 +- .../modules/ServiceHealthchecksDebugModule.kt | 6 +- .../walt/commons/web/plugins/StatusPages.kt | 2 + .../waltid-verifier-api/build.gradle.kts | 21 ++- .../kotlin/id/walt/verifier/VerifierApi.kt | 118 ++++++-------- .../walt/verifier/entra/EntraVerifierApi.kt | 24 +-- .../LspPotentialVerificationInterop.kt | 4 +- .../walt/verifier/web/plugins/Monitoring.kt | 2 +- .../waltid-wallet-api/build.gradle.kts | 54 +++---- .../id/walt/webwallet/FeatureCatalog.kt | 3 +- .../main/kotlin/id/walt/webwallet/db/Db.kt | 2 +- .../id/walt/webwallet/db/KotlinxUUIDTable.kt | 11 +- .../webwallet/db/models/WalletCredentials.kt | 9 +- .../db/models/WallletNotifications.kt | 1 - .../webwallet/service/SSIKit2WalletService.kt | 1 - .../webwallet/service/WalletServiceManager.kt | 11 +- .../account/authnz/AuthenticationService.kt | 10 +- .../service/account/x5c/X5CAccountStrategy.kt | 5 +- .../service/credentials/CredentialsService.kt | 8 +- .../walt/webwallet/service/dids/DidService.kt | 6 +- .../endpoint/EntraServiceEndpointProvider.kt | 2 +- .../webwallet/service/events/EventService.kt | 7 +- .../exchange/CredentialOfferProcessor.kt | 18 +-- .../service/exchange/IssuanceService.kt | 11 +- .../exchange/ProcessedCredentialOffer.kt | 6 +- .../exchange/ProofOfPossessionFactory.kt | 80 +++++----- .../service/issuers/IssuersService.kt | 35 +---- .../webwallet/service/keys/KeysService.kt | 3 +- .../notifications/NotificationService.kt | 5 +- .../service/oidc4vc/TestCredentialWallet.kt | 10 +- .../webwallet/service/push/PushManager.kt | 1 - .../service/settings/SettingsService.kt | 5 +- .../webwallet/usecase/claim/ClaimCommons.kt | 28 ++-- .../claim/ExternalSignatureClaimStrategy.kt | 2 +- .../usecase/claim/SilentClaimStrategy.kt | 2 +- .../entity/EntityNameResolutionUseCase.kt | 2 +- .../usecase/issuer/IssuerUseCaseImpl.kt | 6 +- .../notification/NotificationFilterUseCase.kt | 2 +- .../web/controllers/AccountController.kt | 4 +- .../web/controllers/CategoryController.kt | 23 +-- .../web/controllers/CredentialController.kt | 42 ++--- .../web/controllers/DidController.kt | 23 +-- .../webwallet/web/controllers/DidCreation.kt | 38 ++--- .../controllers/DidWebRegistryController.kt | 6 +- .../web/controllers/EventLogController.kt | 10 +- .../web/controllers/HistoryController.kt | 7 +- .../web/controllers/IssuersController.kt | 26 ++-- .../web/controllers/KeyController.kt | 59 +++---- .../web/controllers/ManifestController.kt | 16 +- .../web/controllers/NotificationController.kt | 12 +- .../web/controllers/ReasonController.kt | 2 +- .../web/controllers/ReportsController.kt | 6 +- .../controllers/SilentExchangeController.kt | 4 +- .../web/controllers/TrustController.kt | 2 +- .../web/controllers/UtilityController.kt | 35 +++-- .../controllers/WalletSettingsController.kt | 15 +- .../web/controllers/Web3Controller.kt | 20 +-- .../web/controllers/auth/AuthController.kt | 43 +++--- .../web/controllers/auth/Controller.kt | 6 +- .../web/controllers/auth/DefaultAuthRoutes.kt | 4 +- .../controllers/auth/KtorAuthnzController.kt | 7 +- .../auth/KtorAuthnzFrontendController.kt | 8 +- .../controllers/auth/LoginControllerBase.kt | 4 +- .../controllers/auth/LogoutControllerBase.kt | 8 +- .../auth/RegisterControllerBase.kt | 6 +- .../auth/keycloak/KeycloakLogoutController.kt | 7 +- .../auth/oidc/OidcLogoutController.kt | 7 +- .../exchange/ExchangeController.kt | 47 +++--- .../ExchangeExternalSignaturesController.kt | 46 +++--- .../src/main/resources/example_klogging.conf | 24 +-- .../src/test/kotlin/E2EWalletTestBase.kt | 2 - ...ltStatusListCredentialFetchStrategyTest.kt | 16 +- .../id/walt/webwallet/utils/PKIXUtilsTest.kt | 6 +- ...n-list-with-status-message-vc-wrapped.json | 14 +- .../revocation-list-with-status-message.json | 11 +- .../build.gradle.kts | 4 +- .../src/main/kotlin/id/walt/NftController.kt | 18 +-- .../main/kotlin/id/walt/plugins/Monitoring.kt | 2 +- 182 files changed, 1241 insertions(+), 1268 deletions(-) rename waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/{action => }/ActionDidState.kt (57%) rename waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/{finished => }/DidDocument.kt (80%) rename waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/{failed => }/FailedDidState.kt (82%) rename waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/{finished => }/FinishedDidState.kt (73%) delete mode 100644 waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/Secret.kt delete mode 100644 waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/SigningRequest.kt create mode 100644 waltid-libraries/waltid-did/src/jvmTest/resources/simplelogger.properties diff --git a/.run/Verifier.run.xml b/.run/Verifier.run.xml index 9f2da2945..3fefd8587 100644 --- a/.run/Verifier.run.xml +++ b/.run/Verifier.run.xml @@ -1,14 +1,14 @@ - - - + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index c9977ea4d..19929cec4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ plugins { kotlin("plugin.serialization") version kotlinVersion apply false - id("love.forte.plugin.suspend-transform") version "2.1.0-0.10.1" apply false + id("love.forte.plugin.suspend-transform") version "2.1.0-0.11.0" apply false id("com.android.library") version "8.7.3" apply false id("com.android.application") version "8.7.3" apply false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b8..cea7a793a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6..f3b75f3b0 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/waltid-applications/waltid-android/build.gradle.kts b/waltid-applications/waltid-android/build.gradle.kts index 6a21e75d4..39ee5b6f8 100644 --- a/waltid-applications/waltid-android/build.gradle.kts +++ b/waltid-applications/waltid-android/build.gradle.kts @@ -3,6 +3,7 @@ plugins { kotlin("android") kotlin("plugin.serialization") kotlin("plugin.compose") + id("com.github.ben-manes.versions") } android { @@ -57,7 +58,7 @@ dependencies { api(project(":waltid-libraries:sdjwt:waltid-sdjwt")) // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // -- Android -- implementation("androidx.biometric:biometric:1.2.0-alpha05") @@ -65,7 +66,7 @@ dependencies { implementation("androidx.navigation:navigation-compose:2.7.7") implementation("androidx.core:core-ktx:1.13.1") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.3") - implementation("androidx.activity:activity-compose:1.9.0") + implementation("androidx.activity:activity-compose:1.10.1") // Compose implementation(platform("androidx.compose:compose-bom:2024.02.01")) @@ -77,7 +78,7 @@ dependencies { // Testing testImplementation(kotlin("test")) - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") testImplementation("junit:junit:4.13.2") testImplementation("androidx.test.ext:junit:1.2.1") testImplementation("androidx.test.espresso:espresso-core:3.6.1") diff --git a/waltid-applications/waltid-cli/build.gradle.kts b/waltid-applications/waltid-cli/build.gradle.kts index 693f9aed6..e9e6ff62f 100644 --- a/waltid-applications/waltid-cli/build.gradle.kts +++ b/waltid-applications/waltid-cli/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget object Versions { - const val KTOR_VERSION = "2.3.12" + const val KTOR_VERSION = "3.1.0" } plugins { @@ -9,7 +9,7 @@ plugins { kotlin("plugin.serialization") id("maven-publish") id("com.github.ben-manes.versions") - id("io.ktor.plugin") version "2.3.12" // Versions.KTOR_VERSION + id("io.ktor.plugin") version "3.1.0" // Versions.KTOR_VERSION // Apply the application plugin to add support for building a CLI application in Java. application } @@ -65,25 +65,27 @@ kotlin { api(project(":waltid-libraries:sdjwt:waltid-sdjwt")) api(project(":waltid-libraries:protocols:waltid-openid4vc")) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") - implementation("com.google.code.gson:gson:2.11.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") + implementation("com.google.code.gson:gson:2.12.1") // CLI - implementation("com.github.ajalt.mordant:mordant:2.7.1") - implementation("com.github.ajalt.clikt:clikt:4.4.0") + implementation("com.github.ajalt.clikt:clikt:5.0.3") + implementation("com.github.ajalt.clikt:clikt-markdown:5.0.3") + implementation("com.github.ajalt.mordant:mordant:3.0.2") + implementation("com.github.ajalt.mordant:mordant-markdown:3.0.2") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") } } val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { @@ -92,18 +94,18 @@ kotlin { implementation("org.slf4j:slf4j-simple:2.0.16") // JOSE - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") // BouncyCastle for PEM import - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") } } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("com.wolpl.clikt-testkit:clikt-testkit:2.0.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("com.wolpl.clikt-testkit:clikt-testkit:3.0.0") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") // Ktor server implementation("io.ktor:ktor-server-core-jvm:${Versions.KTOR_VERSION}") diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/WaltIdCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/WaltIdCmd.kt index 6e8782c5f..333dbb4a5 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/WaltIdCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/WaltIdCmd.kt @@ -1,15 +1,20 @@ package id.walt.cli import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.Context import com.github.ajalt.clikt.core.context +import com.github.ajalt.clikt.core.installMordantMarkdown import com.github.ajalt.clikt.core.subcommands import com.github.ajalt.clikt.parameters.groups.provideDelegate import id.walt.cli.commands.* import id.walt.cli.util.WaltIdCmdHelpOptionMessage class WaltIdCmd : CliktCommand( - name = "waltid", - help = """walt.id CLI + name = "waltid" +) { + + override fun help(context: Context) = """ + walt.id CLI The walt.id CLI is a command line tool that allows you to onboard and use a SSI (Self-Sovereign-Identity) ecosystem. You can manage @@ -103,9 +108,15 @@ class WaltIdCmd : CliktCommand( -vppa=max=2 \ -vpp minimum-credentials \ -vppa=min=1 - """, - printHelpOnEmptyArgs = true -) { + """.replace("\n", " \n") + + init { + installMordantMarkdown() + } + + + override val printHelpOnEmptyArgs = true + init { subcommands(KeyCmd(), DidCmd(), VCCmd(), VPCmd()) diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/Did.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/Did.kt index 24c5cbf53..33960a1db 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/Did.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/Did.kt @@ -2,13 +2,16 @@ package id.walt.cli.commands import com.github.ajalt.clikt.completion.CompletionCandidates import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.Context import com.github.ajalt.clikt.parameters.options.default import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.types.enum import id.walt.did.dids.DidService import kotlinx.coroutines.runBlocking -class Did : CliktCommand(help = "Run commands on DIDs") { +class Did : CliktCommand() { + + override fun help(context: Context) = "Run commands on DIDs" //private val config by findOrSetObject { mutableMapOf() } diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCmd.kt index cb818b64f..3f538747c 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCmd.kt @@ -1,16 +1,18 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.Context import com.github.ajalt.clikt.core.context import com.github.ajalt.clikt.core.subcommands import id.walt.cli.util.WaltIdCmdHelpOptionMessage class DidCmd : CliktCommand( - name = "did", - help = "DID management features.", - printHelpOnEmptyArgs = true + name = "did" ) { + override fun help(context: Context) = "DID management features." + override val printHelpOnEmptyArgs = true + init { subcommands(DidCreateCmd(), DidResolveCmd()) @@ -21,5 +23,3 @@ class DidCmd : CliktCommand( override fun run(): Unit {} } - -fun main(args: Array) = DidCmd().main(args) diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCreateCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCreateCmd.kt index 1f7a8f88e..8a0b308ad 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCreateCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCreateCmd.kt @@ -1,7 +1,9 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.Context import com.github.ajalt.clikt.core.context +import com.github.ajalt.clikt.core.installMordantMarkdown import com.github.ajalt.clikt.core.terminal import com.github.ajalt.clikt.parameters.options.default import com.github.ajalt.clikt.parameters.options.flag @@ -15,7 +17,6 @@ import id.walt.cli.util.* import id.walt.did.dids.registrar.dids.DidKeyCreateOptions import id.walt.did.dids.registrar.dids.DidWebCreateOptions import kotlinx.coroutines.runBlocking -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import java.net.URLEncoder import kotlin.io.path.Path @@ -24,8 +25,9 @@ import kotlin.io.path.exists import kotlin.io.path.writeText class DidCreateCmd : CliktCommand( - name = "create", - help = """Create a Decentralized Identifier (DID). + name = "create" +) { + override fun help(context: Context) = """Create a Decentralized Identifier (DID). Example usage: -------------- @@ -34,8 +36,11 @@ class DidCreateCmd : CliktCommand( waltid did create -m jwk waltid did create -m web -wd example.com waltid did create -m web -wd example.com -wp /alice/bob - """ -) { + """.replace("\n", " \n") + + init { + installMordantMarkdown() + } init { context { diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidResolveCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidResolveCmd.kt index 8aac26f2a..de5f6e497 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidResolveCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidResolveCmd.kt @@ -1,7 +1,9 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.Context import com.github.ajalt.clikt.core.context +import com.github.ajalt.clikt.core.installMordantMarkdown import com.github.ajalt.clikt.parameters.options.help import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required @@ -14,15 +16,20 @@ import id.walt.cli.util.WaltIdCmdHelpOptionMessage import kotlinx.coroutines.runBlocking class DidResolveCmd : CliktCommand( - name = "resolve", - help = """Resolve the document associated with the input Decentralized Identifier (DID). + name = "resolve" +) { + override fun help(context: Context) = """Resolve the document associated with the input Decentralized Identifier (DID). Example usage: -------------- waltid did resolve -d did:key:z6Mkp7AVwvWxnsNDuSSbf19sgKzrx223WY95AqZyAGifFVyV - """, - printHelpOnEmptyArgs = true -) { + """.replace("\n", " \n") + + init { + installMordantMarkdown() + } + + override val printHelpOnEmptyArgs = true init { context { @@ -30,7 +37,7 @@ class DidResolveCmd : CliktCommand( } } - val print : PrettyPrinter = PrettyPrinter(this) + val print: PrettyPrinter = PrettyPrinter(this) private val did by option("-d", "-did") .help("The DID to be resolved.") .required() @@ -46,4 +53,4 @@ class DidResolveCmd : CliktCommand( print.box(prettyJsonString) } } -} \ No newline at end of file +} diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyCmd.kt index 30551d88e..31901abe3 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyCmd.kt @@ -1,17 +1,19 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.Context import com.github.ajalt.clikt.core.context import com.github.ajalt.clikt.core.subcommands import com.github.ajalt.clikt.parameters.groups.provideDelegate import id.walt.cli.util.WaltIdCmdHelpOptionMessage class KeyCmd : CliktCommand( - name = "key", - help = "Key management features.", - printHelpOnEmptyArgs = true + name = "key" ) { + override fun help(context: Context) = "Key management features." + override val printHelpOnEmptyArgs = true + init { subcommands(KeyGenerateCmd(), KeyConvertCmd()) @@ -24,5 +26,3 @@ class KeyCmd : CliktCommand( override fun run() = Unit } - -fun main(args: Array) = KeyCmd().main(args) diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyConvertCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyConvertCmd.kt index 9c6791bc7..2b69c25c5 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyConvertCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyConvertCmd.kt @@ -8,6 +8,7 @@ import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required import com.github.ajalt.clikt.parameters.types.file import com.github.ajalt.mordant.terminal.YesNoPrompt +import com.github.ajalt.mordant.terminal.prompt import id.walt.cli.util.PrettyPrinter import id.walt.cli.util.WaltIdCmdHelpOptionMessage import id.walt.cli.util.getNormalizedPath @@ -39,17 +40,23 @@ enum class KeyFileFormat { } class KeyConvertCmd : CliktCommand( - name = "convert", - printHelpOnEmptyArgs = true, - help = """Convert key files between PEM and JWK formats. + name = "convert" +) { + + override fun help(context: Context) = """Convert key files between PEM and JWK formats. Example usage: --------------- waltid key convert -i myRsaKey.pem waltid key convert -i myEncryptedRsaKey.pem -p 123123 -o myRsaKey.jwk - """, + """.replace("\n", " \n") + + init { + installMordantMarkdown() + } + + override val printHelpOnEmptyArgs = true -) { init { context { diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyGenerateCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyGenerateCmd.kt index 71c581e64..02762823c 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyGenerateCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyGenerateCmd.kt @@ -1,7 +1,9 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.Context import com.github.ajalt.clikt.core.context +import com.github.ajalt.clikt.core.installMordantMarkdown import com.github.ajalt.clikt.core.terminal import com.github.ajalt.clikt.parameters.groups.provideDelegate import com.github.ajalt.clikt.parameters.options.default @@ -22,8 +24,10 @@ import kotlin.io.path.exists import kotlin.io.path.writeText class KeyGenerateCmd : CliktCommand( - name = "generate", - help = """Generates a new cryptographic key. + name = "generate" +) { + + override fun help(context: Context) = """Generates a new cryptographic key. Example usage: --------------- @@ -31,8 +35,11 @@ class KeyGenerateCmd : CliktCommand( waltid key generate -t secp256k1 waltid key generate -t RSA waltid key generate -t RSA -o myRsaKey.json - """ -) { + """.replace("\n", " \n") + + init { + installMordantMarkdown() + } init { context { diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCCmd.kt index b29d710e1..187ecd9ca 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCCmd.kt @@ -1,16 +1,18 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.Context import com.github.ajalt.clikt.core.context import com.github.ajalt.clikt.core.subcommands import id.walt.cli.util.WaltIdCmdHelpOptionMessage class VCCmd : CliktCommand( name = "vc", - help = """Sign and apply a wide range verification policies on W3C Verifiable Credentials (VCs).""", - printHelpOnEmptyArgs = true, ) { + override fun help(context: Context) = """Sign and apply a wide range verification policies on W3C Verifiable Credentials (VCs).""" + override val printHelpOnEmptyArgs = true + init { subcommands(VCSignCmd(), VCVerifyCmd()) @@ -21,5 +23,3 @@ class VCCmd : CliktCommand( override fun run(): Unit {} } - -fun main(args: Array) = VCCmd().main(args) diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCSignCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCSignCmd.kt index 252acec0b..36ec28ad6 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCSignCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCSignCmd.kt @@ -1,9 +1,6 @@ package id.walt.cli.commands -import com.github.ajalt.clikt.core.BadParameterValue -import com.github.ajalt.clikt.core.CliktCommand -import com.github.ajalt.clikt.core.context -import com.github.ajalt.clikt.core.terminal +import com.github.ajalt.clikt.core.* import com.github.ajalt.clikt.parameters.arguments.argument import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.help @@ -19,8 +16,10 @@ import kotlin.io.path.Path import kotlin.io.path.absolutePathString class VCSignCmd : CliktCommand( - name = "sign", - help = """Sign a W3C Verifiable Credential (VC). + name = "sign" +) { + + override fun help(context: Context) = """Sign a W3C Verifiable Credential (VC). Example usage: -------------- @@ -29,9 +28,13 @@ class VCSignCmd : CliktCommand( -s did:key:z6Mkjm2gaGsodGchfG4k8P6KwCHZsVEPZho5VuEbY94qiBB9 \ -i did:key:z6Mkp7AVwvWxnsNDuSSbf19sgKzrx223WY95AqZyAGifFVyV \ ./myVC.json - """, - printHelpOnEmptyArgs = true, -) { + """.replace("\n", " \n") + + init { + installMordantMarkdown() + } + + override val printHelpOnEmptyArgs = true init { context { diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCVerifyCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCVerifyCmd.kt index 1b6463367..2a26202d2 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCVerifyCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCVerifyCmd.kt @@ -1,9 +1,6 @@ package id.walt.cli.commands -import com.github.ajalt.clikt.core.CliktCommand -import com.github.ajalt.clikt.core.FileNotFound -import com.github.ajalt.clikt.core.MissingOption -import com.github.ajalt.clikt.core.context +import com.github.ajalt.clikt.core.* import com.github.ajalt.clikt.parameters.arguments.argument import com.github.ajalt.clikt.parameters.options.associate import com.github.ajalt.clikt.parameters.options.help @@ -14,19 +11,19 @@ import com.github.ajalt.clikt.parameters.types.file import id.walt.cli.util.PrettyPrinter import id.walt.cli.util.VCUtil import id.walt.cli.util.WaltIdCmdHelpOptionMessage +import id.walt.crypto.utils.JsonUtils.toJsonElement import id.walt.policies.ExpirationDatePolicyException -import id.walt.policies.JsonSchemaVerificationException import id.walt.policies.NotBeforePolicyException import id.walt.policies.models.PolicyResult -import id.walt.crypto.utils.JsonUtils.toJsonElement import kotlinx.coroutines.runBlocking import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonElement import java.io.File class VCVerifyCmd : CliktCommand( - name = "verify", - help = """Apply a wide range of verification policies on a W3C Verifiable Credential (VC). + name = "verify" +) { + override fun help(context: Context) = """Apply a wide range of verification policies on a W3C Verifiable Credential (VC). Example usage: ---------------- @@ -34,9 +31,13 @@ class VCVerifyCmd : CliktCommand( waltid vc verify -p signature ./myVC.signed.json waltid vc verify -p schema --arg=schema=mySchema.json ./myVC.signed.json waltid vc verify -p signature -p schema --arg=schema=mySchema.json ./myVC.signed.json - """, - printHelpOnEmptyArgs = true, -) { + """.replace("\n", " \n") + + init { + installMordantMarkdown() + } + + override val printHelpOnEmptyArgs = true init { context { diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPCmd.kt index 875a5ccfc..1c4f9f338 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPCmd.kt @@ -1,16 +1,18 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.Context import com.github.ajalt.clikt.core.context import com.github.ajalt.clikt.core.subcommands import id.walt.cli.util.WaltIdCmdHelpOptionMessage class VPCmd : CliktCommand( - name = "vp", - help = "Create and apply a wide range of verification policies on W3C Verifiable Presentations (VPs).", - printHelpOnEmptyArgs = true + name = "vp" ) { + override fun help(context: Context) = "Create and apply a wide range of verification policies on W3C Verifiable Presentations (VPs)." + override val printHelpOnEmptyArgs = true + init { subcommands(VPCreateCmd(), VPVerifyCmd()) @@ -21,5 +23,3 @@ class VPCmd : CliktCommand( override fun run(): Unit {} } - -fun main(args: Array) = VPCmd().main(args) \ No newline at end of file diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPCreateCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPCreateCmd.kt index 4bd665773..1f478970d 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPCreateCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPCreateCmd.kt @@ -1,7 +1,9 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.Context import com.github.ajalt.clikt.core.context +import com.github.ajalt.clikt.core.installMordantMarkdown import com.github.ajalt.clikt.core.terminal import com.github.ajalt.clikt.parameters.options.* import com.github.ajalt.clikt.parameters.types.file @@ -32,8 +34,9 @@ import kotlin.io.path.readText import kotlin.io.path.writeText class VPCreateCmd : CliktCommand( - name = "create", - help = """Create a W3C Verifiable Presentation (VP). + name = "create" +) { + override fun help(context: Context) = """Create a W3C Verifiable Presentation (VP). Example usage: ---------------- @@ -61,9 +64,13 @@ class VPCreateCmd : CliktCommand( -pd ./presDef.json \ -vp ./outputVp.jwt \ -ps ./outputPresSub.json - """, - printHelpOnEmptyArgs = true, -) { + """.replace("\n", " \n") + + init { + installMordantMarkdown() + } + + override val printHelpOnEmptyArgs = true init { context { diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPVerifyCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPVerifyCmd.kt index b3fb56069..9152ebec8 100644 --- a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPVerifyCmd.kt +++ b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPVerifyCmd.kt @@ -1,17 +1,16 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.core.Context import com.github.ajalt.clikt.core.MissingOption import com.github.ajalt.clikt.core.context +import com.github.ajalt.clikt.core.installMordantMarkdown import com.github.ajalt.clikt.parameters.options.* import com.github.ajalt.clikt.parameters.types.choice import com.github.ajalt.clikt.parameters.types.path import id.walt.cli.util.JsonUtils.toJsonPrimitive import id.walt.cli.util.PrettyPrinter import id.walt.cli.util.WaltIdCmdHelpOptionMessage -import id.walt.policies.models.PolicyRequest -import id.walt.policies.models.PolicyResult -import id.walt.policies.models.PresentationVerificationResponse import id.walt.crypto.utils.JsonUtils.toJsonElement import id.walt.did.dids.DidService import id.walt.oid4vc.data.dif.PresentationDefinition @@ -20,6 +19,9 @@ import id.walt.policies.ExpirationDatePolicyException import id.walt.policies.NotBeforePolicyException import id.walt.policies.PolicyManager import id.walt.policies.Verifier +import id.walt.policies.models.PolicyRequest +import id.walt.policies.models.PolicyResult +import id.walt.policies.models.PresentationVerificationResponse import kotlinx.coroutines.runBlocking import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject @@ -27,8 +29,9 @@ import kotlin.io.path.readText import kotlin.time.Duration class VPVerifyCmd : CliktCommand( - name = "verify", - help = """Apply a wide range of verification policies on a W3C Verifiable Presentation (VP). + name = "verify" +) { + override fun help(context: Context) = """Apply a wide range of verification policies on a W3C Verifiable Presentation (VP). Example usage: ---------------- @@ -54,9 +57,13 @@ class VPVerifyCmd : CliktCommand( -vppa=min=1 \ -vcp allowed-issuer \ -vcpa=issuer=did:key:z6Mkp7AVwvWxnsNDuSSbf19sgKzrx223WY95AqZyAGifFVyV - """, - printHelpOnEmptyArgs = true, -) { + """.replace("\n", " \n") + + init { + installMordantMarkdown() + } + + override val printHelpOnEmptyArgs = true init { context { @@ -266,7 +273,8 @@ class VPVerifyCmd : CliktCommand( private fun verify(params: VpVerifyParameters): PresentationVerificationResponse { try { return runBlocking { - val presentationFormat = params.presentationSubmission.descriptorMap.firstOrNull()?.format ?: throw IllegalArgumentException("No presentation submission or presentation format found.") + val presentationFormat = params.presentationSubmission.descriptorMap.firstOrNull()?.format + ?: throw IllegalArgumentException("No presentation submission or presentation format found.") Verifier.verifyPresentation( presentationFormat, vpToken = params.vp, diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdCmdTest.kt index b4daa585f..71a06cdc8 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdCmdTest.kt @@ -1,6 +1,7 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.PrintHelpMessage +import com.github.ajalt.clikt.core.parse import com.github.ajalt.clikt.testing.test import id.walt.cli.WaltIdCmd import kotlinx.coroutines.test.runTest @@ -44,4 +45,4 @@ class WaltIdCmdTest { val result = WaltIdCmd().test(listOf("--help")) assertContains(result.stdout, "Commands:(\n+.*)+vc".toRegex(RegexOption.MULTILINE)) } -} \ No newline at end of file +} diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidCmdTest.kt index 4f64e9abb..7640ed94f 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidCmdTest.kt @@ -1,6 +1,7 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.PrintHelpMessage +import com.github.ajalt.clikt.core.parse import com.github.ajalt.clikt.testing.test import kotlinx.coroutines.test.runTest import kotlin.test.Test @@ -44,4 +45,4 @@ class WaltIdDidCmdTest { val result = command.test() assertContains(result.stdout, "resolve") } -} \ No newline at end of file +} diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidCreateCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidCreateCmdTest.kt index c128fe646..27430e114 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidCreateCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidCreateCmdTest.kt @@ -2,6 +2,7 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.InvalidFileFormat import com.github.ajalt.clikt.core.PrintHelpMessage +import com.github.ajalt.clikt.core.parse import com.github.ajalt.clikt.testing.test import id.walt.cli.util.getResourcePath import id.walt.did.utils.randomUUID diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidResolveCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidResolveCmdTest.kt index 46ebc2423..d7e009560 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidResolveCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdDidResolveCmdTest.kt @@ -1,5 +1,6 @@ package id.walt.cli.commands +import com.github.ajalt.clikt.core.parse import com.github.ajalt.clikt.testing.test import id.walt.cli.util.getResourcePath import id.walt.did.utils.randomUUID @@ -172,4 +173,4 @@ class WaltIdDidResolveCmdTest { } } } -} \ No newline at end of file +} diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyCmdTest.kt index edefba032..ec9bd1fb1 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyCmdTest.kt @@ -1,6 +1,7 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.PrintHelpMessage +import com.github.ajalt.clikt.core.parse import com.github.ajalt.clikt.testing.test import kotlinx.coroutines.test.runTest import kotlin.test.Test diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyConvertCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyConvertCmdTest.kt index cf3bd8702..c395a089c 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyConvertCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyConvertCmdTest.kt @@ -49,12 +49,9 @@ class WaltIdKeyConvertCmdTest { fun `should fail if --input is provided with no value`() { val command = KeyConvertCmd() - val failure = assertFailsWith { + assertFails { command.parse(listOf("-i")) } - - assertTrue(failure.errors.any { it is IncorrectOptionValueCount }) - assertTrue(failure.errors.any { it is MissingOption }) } @Test @@ -232,16 +229,20 @@ class WaltIdKeyConvertCmdTest { val inputFilePath = getResourcePath(this, inputFileName) class PassphraseTerminal : TerminalInterface { - override val info: TerminalInfo - get() = TerminalInfo( - width = 0, - height = 0, + override fun info( + ansiLevel: AnsiLevel?, + hyperlinks: Boolean?, + outputInteractive: Boolean?, + inputInteractive: Boolean? + ): TerminalInfo { + return TerminalInfo( ansiLevel = AnsiLevel.NONE, ansiHyperLinks = false, outputInteractive = false, inputInteractive = false, - crClearsLine = false + supportsAnsiCursor = false ) + } override fun completePrintRequest(request: PrintRequest) { StringWriter().write(request.text) diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyGenerateCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyGenerateCmdTest.kt index 1a61f4121..ff39bde8c 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyGenerateCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdKeyGenerateCmdTest.kt @@ -3,6 +3,7 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.BadParameterValue import com.github.ajalt.clikt.core.IncorrectOptionValueCount import com.github.ajalt.clikt.core.PrintHelpMessage +import com.github.ajalt.clikt.core.parse import com.github.ajalt.clikt.testing.CliktCommandTestResult import com.github.ajalt.clikt.testing.test import id.walt.crypto.keys.KeyType @@ -211,4 +212,4 @@ class WaltIdKeyGenerateCmdTest { assertContains(result.stdout, it.toRegex()) } } -} \ No newline at end of file +} diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCCmdTest.kt index 7b5695eaa..6613a6b77 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCCmdTest.kt @@ -1,6 +1,7 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.PrintHelpMessage +import com.github.ajalt.clikt.core.parse import com.github.ajalt.clikt.testing.test import kotlinx.coroutines.test.runTest import kotlin.test.Test @@ -18,11 +19,11 @@ class WaltIdVCCmdTest { command.parse(emptyList()) } - val helpMsg = """Sign and apply a wide range verification policies on W3C Verifiable Credentials (VCs).""" + val helpMsg = """Sign and apply a wide range verification policies on W3C Verifiable""" result1.message?.let { assertTrue(it.contains(helpMsg)) } val result2 = command.test(width = 800, height = 800) - assertTrue(result2.output.contains(helpMsg, ignoreCase = true)) + assertContains(result2.output, helpMsg) } @Test @@ -43,4 +44,4 @@ class WaltIdVCCmdTest { val result = command.test() assertContains(result.stdout, "verify") } -} \ No newline at end of file +} diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCSignCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCSignCmdTest.kt index 644e2547b..84ee57681 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCSignCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCSignCmdTest.kt @@ -3,6 +3,7 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.MissingArgument import com.github.ajalt.clikt.core.MissingOption import com.github.ajalt.clikt.core.PrintHelpMessage +import com.github.ajalt.clikt.core.parse import com.github.ajalt.clikt.testing.test import org.junit.jupiter.api.assertDoesNotThrow import kotlin.test.* @@ -56,7 +57,7 @@ class WaltIdVCSignCmdTest { fun `should accept one positional argument after --options`() { val result = command.test(listOf("--help"), width = 800, height = 800) - assertContains(result.stdout, "The file path to the Verifiable Credential that will be signed (required).") + assertContains(result.output, "The file path to the Verifiable Credential that will") } @Test diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCVerifyCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCVerifyCmdTest.kt index 0a8d08293..0e1e36438 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCVerifyCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCVerifyCmdTest.kt @@ -2,11 +2,11 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.MissingOption import com.github.ajalt.clikt.core.PrintHelpMessage +import com.github.ajalt.clikt.core.parse import com.github.ajalt.clikt.testing.test import id.walt.cli.util.KeyUtil import id.walt.cli.util.VCUtil import io.ktor.http.* -import io.ktor.server.application.* import io.ktor.server.engine.* import io.ktor.server.netty.* import io.ktor.server.response.* @@ -56,7 +56,7 @@ class WaltIdVCVerifyCmdTest { val schemaFilePath = "${resourcesPath}/schema/OpenBadgeV3_schema.json" - private val webhookTestServer: NettyApplicationEngine + private val webhookTestServer: EmbeddedServer private val webhookTestServerURL: String private val webhookTestServerSuccessURL: String private val webhookTestServerFailURL: String @@ -78,8 +78,8 @@ class WaltIdVCVerifyCmdTest { } }.start(false) runBlocking { - url = "http://" + webhookTestServer.resolvedConnectors() - .first().host + ":${webhookTestServer.resolvedConnectors().first().port}" + url = "http://" + webhookTestServer.engine.resolvedConnectors() + .first().host + ":${webhookTestServer.engine.resolvedConnectors().first().port}" } webhookTestServerURL = url webhookTestServerSuccessURL = "$webhookTestServerURL/success" diff --git a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVPCreateCmdTest.kt b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVPCreateCmdTest.kt index c3f35808d..3588dcbbb 100644 --- a/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVPCreateCmdTest.kt +++ b/waltid-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVPCreateCmdTest.kt @@ -1,6 +1,7 @@ package id.walt.cli.commands import com.github.ajalt.clikt.core.PrintHelpMessage +import com.github.ajalt.clikt.core.parse import com.github.ajalt.clikt.testing.test import id.walt.cli.util.getResourcePath import id.walt.did.utils.randomUUID @@ -234,4 +235,4 @@ class WaltIdVPCreateCmdTest { val outputPresSub = Json.decodeFromString(File(outputPresSubPath).readText()) assertEquals(expectedPresSub.descriptorMap, outputPresSub.descriptorMap, "Presentation submissions descriptor maps do not match") } -} \ No newline at end of file +} diff --git a/waltid-applications/waltid-openid4vc-ios-testApp/shared/build.gradle.kts b/waltid-applications/waltid-openid4vc-ios-testApp/shared/build.gradle.kts index 74d95af4d..6fba93497 100644 --- a/waltid-applications/waltid-openid4vc-ios-testApp/shared/build.gradle.kts +++ b/waltid-applications/waltid-openid4vc-ios-testApp/shared/build.gradle.kts @@ -24,7 +24,7 @@ kotlin { } sourceSets { - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" commonMain.dependencies { implementation(project(":waltid-libraries:sdjwt:waltid-sdjwt")) @@ -53,7 +53,7 @@ kotlin { iosSimulatorArm64Main.dependsOn(this) dependencies { implementation(project(":waltid-libraries:crypto:waltid-crypto-ios")) - implementation("io.ktor:ktor-client-darwin:2.3.12") + implementation("io.ktor:ktor-client-darwin:3.1.0") } } } diff --git a/waltid-libraries/auth/waltid-idpkit/build.gradle.kts b/waltid-libraries/auth/waltid-idpkit/build.gradle.kts index 305443d29..4ff9b5d74 100644 --- a/waltid-libraries/auth/waltid-idpkit/build.gradle.kts +++ b/waltid-libraries/auth/waltid-idpkit/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("jvm") - id("io.ktor.plugin") version "2.3.12" + id("io.ktor.plugin") version "3.1.0" kotlin("plugin.serialization") id("maven-publish") @@ -38,23 +38,22 @@ dependencies { implementation("io.ktor:ktor-client-content-negotiation") // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") implementation("com.eygraber:jsonpathkt-kotlinx:3.0.2") // OIDC - implementation("com.nimbusds:oauth2-oidc-sdk:11.12") - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") // for Ed25519 - implementation("com.google.crypto.tink:tink:1.15.0") { + implementation("com.google.crypto.tink:tink:1.16.0") { exclude("org.slf4j.simple") } // Logging - implementation("io.klogging:klogging-jvm:0.7.2") - implementation("io.klogging:slf4j-klogging:0.7.2") + implementation("io.klogging:klogging-jvm:0.9.1") + implementation("io.klogging:slf4j-klogging:0.9.1") testImplementation("io.ktor:ktor-server-test-host-jvm") testImplementation("org.jetbrains.kotlin:kotlin-test-junit") diff --git a/waltid-libraries/auth/waltid-idpkit/src/main/kotlin/id/walt/idp/poc/App.kt b/waltid-libraries/auth/waltid-idpkit/src/main/kotlin/id/walt/idp/poc/App.kt index 0ff4a2c46..3d926cb65 100644 --- a/waltid-libraries/auth/waltid-idpkit/src/main/kotlin/id/walt/idp/poc/App.kt +++ b/waltid-libraries/auth/waltid-idpkit/src/main/kotlin/id/walt/idp/poc/App.kt @@ -24,7 +24,7 @@ import io.ktor.serialization.kotlinx.json.* import io.ktor.server.application.* import io.ktor.server.cio.* import io.ktor.server.engine.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.CallLogging import io.ktor.server.plugins.contentnegotiation.* import io.ktor.server.plugins.doublereceive.* import io.ktor.server.plugins.statuspages.* @@ -107,31 +107,6 @@ fun main() { } } - fun toLogString(subject: Any): String = when (subject) { - is TextContent -> subject.text - is OutputStreamContent -> { - val channel = ByteChannel(true) - runBlocking { - subject.writeTo(channel) - StringBuilder().apply { - while (!channel.isClosedForRead) channel.readUTF8LineTo(this) - }.toString() - } - } - - else -> "???" - } - - suspend fun PipelineContext.logResponseBody(call: ApplicationCall) { - call.response.pipeline.intercept(ApplicationSendPipeline.Engine) { message -> - this@embeddedServer.log.debug("Response Body (${call.request.uri}): ${toLogString(message)}") - } - } - - intercept(ApplicationCallPipeline.Call) { - logResponseBody(call) - } - install(StatusPages) { exception { call, cause -> cause.printStackTrace() @@ -175,7 +150,7 @@ fun Application.test() { routing { get("/jwks") { - context.respond(mapOf( + call.respond(mapOf( "keys" to listOf(key).map { it.toPublicJWK().toJSONObject() } )) } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/build.gradle.kts b/waltid-libraries/auth/waltid-ktor-authnz/build.gradle.kts index 8e5bd3ad7..461cf8b8b 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/build.gradle.kts +++ b/waltid-libraries/auth/waltid-ktor-authnz/build.gradle.kts @@ -4,7 +4,7 @@ plugins { kotlin("jvm") kotlin("plugin.power-assert") kotlin("plugin.serialization") - id("io.ktor.plugin") version "2.3.12" + id("io.ktor.plugin") version "3.1.0" id("maven-publish") application @@ -30,10 +30,10 @@ repositories { dependencies { // Auth methods // Core Web3j library - implementation("org.web3j:core:4.9.8") + implementation("org.web3j:core:4.12.3") // (5.0.0 is an invalid version!) // Optional: Web3j utils - implementation("org.web3j:utils:4.9.8") + implementation("org.web3j:utils:4.12.3") // (5.0.0 is an invalid version!) // RADIUS @@ -44,7 +44,7 @@ dependencies { implementation("org.apache.directory.api:api-all:2.1.7") // TOTP/HOTP - implementation("com.atlassian:onetime:2.1.1") + implementation("com.atlassian:onetime:2.1.2") // JWT implementation(project(":waltid-libraries:crypto:waltid-crypto")) @@ -85,24 +85,24 @@ dependencies { implementation("io.ktor:ktor-serialization-kotlinx-json-jvm") // Ktor server external - implementation("io.github.smiley4:ktor-swagger-ui:3.5.1") + implementation("io.github.smiley4:ktor-swagger-ui:4.1.6") // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") implementation("com.eygraber:jsonpathkt-kotlinx:3.0.2") // Logging - implementation("io.klogging:klogging-jvm:0.7.2") - implementation("io.klogging:slf4j-klogging:0.7.2") + implementation("io.klogging:klogging-jvm:0.9.1") + implementation("io.klogging:slf4j-klogging:0.9.1") /* --- Testing --- */ testImplementation("io.ktor:ktor-client-logging") - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") // Ktor testImplementation("io.ktor:ktor-server-cio-jvm") - testImplementation("io.ktor:ktor-server-tests-jvm") + testImplementation("io.ktor:ktor-server-test-host") // Kotlin testImplementation("org.jetbrains.kotlin:kotlin-test-junit") diff --git a/waltid-libraries/auth/waltid-ktor-authnz/docs/new-auth-method.md b/waltid-libraries/auth/waltid-ktor-authnz/docs/new-auth-method.md index 42922e9a7..b2375d849 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/docs/new-auth-method.md +++ b/waltid-libraries/auth/waltid-ktor-authnz/docs/new-auth-method.md @@ -126,10 +126,10 @@ object MultiStepExample : AuthenticationMethod("multistep-example") { val publicKey: String ) - override fun Route.register(authContext: PipelineContext.() -> AuthContext) { + override fun Route.register(authContext: ApplicationCall.() -> AuthContext) { route("multistep-example") { get("nonce") { // Step 1 - context.respond(makeNonce()) + call.respond(makeNonce()) } post("signed", { // Step 2 @@ -191,7 +191,7 @@ fun Route.globalMultistepExample() { """.trimIndent() val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( tenant = call.request.host(), sessionId = call.parameters["sessionId"], @@ -225,7 +225,7 @@ fun Application.testApp() { post("register-by-identifier") { identifier -> val newAccountId = Uuid.random().toString() KtorAuthnzManager.accountStore.addAccountIdentifierToAccount(newAccountId, identifier) - context.respond(newAccountId) + call.respond(newAccountId) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/auth/KtorAuthnzAuthenticationHelpers.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/auth/KtorAuthnzAuthenticationHelpers.kt index acbac43d3..230f43610 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/auth/KtorAuthnzAuthenticationHelpers.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/auth/KtorAuthnzAuthenticationHelpers.kt @@ -4,25 +4,21 @@ import id.walt.ktorauthnz.KtorAuthnzManager import id.walt.ktorauthnz.sessions.AuthSession import io.ktor.server.application.* import io.ktor.server.auth.* +import io.ktor.server.routing.RoutingContext import io.ktor.util.pipeline.* -fun PipelineContext.getAuthToken(): String { - val token = call.principal()?.name +fun ApplicationCall.getAuthToken(): String { + val token = principal()?.name check(token != null) { "No token for request principal" } return token } // TODO: switch to @OptIn instead of @Deprecated -@Deprecated("Externally provided JWT token cannot resolve to authenticated session") -suspend fun PipelineContext.getAuthenticatedSession(): AuthSession { - val token = getAuthToken() - - return KtorAuthnzManager.tokenHandler.resolveTokenToSession(token) -} -suspend fun PipelineContext.getAuthenticatedAccount(): String { - val token = getAuthToken() +@Deprecated("Externally provided JWT token cannot resolve to authenticated session") +suspend fun RoutingContext.getAuthenticatedSession(): AuthSession = KtorAuthnzManager.tokenHandler.resolveTokenToSession(call.getAuthToken()) +@Deprecated("Externally provided JWT token cannot resolve to authenticated session") +suspend fun PipelineContext.getAuthenticatedSession(): AuthSession = KtorAuthnzManager.tokenHandler.resolveTokenToSession(call.getAuthToken()) - return KtorAuthnzManager.tokenHandler.getTokenAccountId(token) -} +suspend fun ApplicationCall.getAuthenticatedAccount(): String = KtorAuthnzManager.tokenHandler.getTokenAccountId(getAuthToken()) diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/AuthenticationMethod.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/AuthenticationMethod.kt index 8a51db578..7b2e42db7 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/AuthenticationMethod.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/AuthenticationMethod.kt @@ -13,7 +13,6 @@ import id.walt.ktorauthnz.sessions.SessionTokenCookieHandler import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.serialization.EncodeDefault import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable @@ -37,7 +36,7 @@ abstract class AuthenticationMethod(open val id: String) { /** Login routes */ abstract fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? = null ) @@ -81,7 +80,7 @@ abstract class AuthenticationMethod(open val id: String) { * - [supportsRegistration] does this method support automatic registration (set to true) * - [authenticationHandlesRegistration] Login & registration is not a combined step (set to false) */ - open fun Route.registerRegistrationRoutes(authContext: PipelineContext.() -> AuthContext): Unit = + open fun Route.registerRegistrationRoutes(authContext: ApplicationCall.() -> AuthContext): Unit = throw NotImplementedError("Authentication method ${this::class.simpleName} does not offer registration routes. Authentication routes handle registration: $authenticationHandlesRegistration") @@ -98,9 +97,7 @@ abstract class AuthenticationMethod(open val id: String) { return (storedData as? V) ?: error("${storedData::class.simpleName} is not requested ${V::class.simpleName}") } - suspend fun PipelineContext.getSession(authContext: PipelineContext.() -> AuthContext): AuthSession { - val currentContext = authContext.invoke(this) - + private suspend fun sessionForAuthContext(currentContext: AuthContext): AuthSession { val session = if (currentContext.implicitSessionGeneration && currentContext.sessionId == null) { // Implicit session start SessionManager.openImplicitGlobalSession(currentContext.initialFlow!!) @@ -112,6 +109,9 @@ abstract class AuthenticationMethod(open val id: String) { return session } + suspend fun ApplicationCall.getAuthSession(authContext: ApplicationCall.() -> AuthContext): AuthSession = + sessionForAuthContext(currentContext = authContext.invoke(this)) + // Relations open val relatedAuthMethodStoredData: KClass? = null open val relatedAuthMethodConfiguration: KClass? = null @@ -120,7 +120,7 @@ abstract class AuthenticationMethod(open val id: String) { fun Route.registerAuthenticationMethod( method: AuthenticationMethod, - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? = null ) { method.apply { @@ -130,7 +130,7 @@ fun Route.registerAuthenticationMethod( fun Route.registerAuthenticationMethods( methods: List, - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>>? = null ) { methods.forEach { method -> diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/EmailPass.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/EmailPass.kt index 92fbea279..1d386e876 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/EmailPass.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/EmailPass.kt @@ -16,7 +16,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.auth.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -62,24 +61,24 @@ object EmailPass : UserPassBasedAuthMethod("email", usernameName = "email") { data class EmailPassCredentials(val email: String, val password: String) override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("emailpass", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val credential = call.getUsernamePasswordFromRequest() - val identifier = auth(session, credential, context) + val identifier = auth(session, credential, call) - context.handleAuthSuccess(session, identifier.resolveToAccountId()) + call.handleAuthSuccess(session, identifier.resolveToAccountId()) } } - /*override fun Route.registerRegistrationRoutes(authContext: PipelineContext.() -> AuthContext) { + /*override fun Route.registerRegistrationRoutes(authContext: ApplicationCall.() -> AuthContext) { post("emailpass", { request { body() } response { HttpStatusCode.OK to { body() } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/JWT.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/JWT.kt index 3c90869d6..c8fc704fa 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/JWT.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/JWT.kt @@ -13,7 +13,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* object JWT : AuthenticationMethod("jwt") { @@ -30,20 +29,20 @@ object JWT : AuthenticationMethod("jwt") { } override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("jwt", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val config = session.lookupConfiguration(this@JWT) - val jwt = context.receiveText() + val jwt = call.receiveText() val id = auth(jwt, config) - context.handleAuthSuccess(session, id.resolveToAccountId()) + call.handleAuthSuccess(session, id.resolveToAccountId()) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Kerberos.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Kerberos.kt index c3667b445..21ff0343c 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Kerberos.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Kerberos.kt @@ -31,9 +31,9 @@ fun auth(kerberosRealm: String, kerberosKdc: String, servicePrincipal: String, u ) return try { - context.requestMutualAuth(true) - context.requestConf(true) - context.requestInteg(true) + call.requestMutualAuth(true) + call.requestConf(true) + call.requestInteg(true) val token = ByteArray(0) val outToken = context.initSecContext(token, 0, token.size) diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/LDAP.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/LDAP.kt index f4b5c70c7..06e41a6c8 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/LDAP.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/LDAP.kt @@ -13,7 +13,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.auth.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import org.apache.directory.api.ldap.model.exception.LdapException import org.apache.directory.ldap.client.api.LdapConnection import org.apache.directory.ldap.client.api.LdapNetworkConnection @@ -45,20 +44,20 @@ object LDAP : UserPassBasedAuthMethod("ldap") { } override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("ldap", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val credential = call.getUsernamePasswordFromRequest() - val identifier = auth(session, credential, context) + val identifier = auth(session, credential, call) - context.handleAuthSuccess(session, identifier.resolveToAccountId()) + call.handleAuthSuccess(session, identifier.resolveToAccountId()) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/OIDC.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/OIDC.kt index 879dca440..c96943fe6 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/OIDC.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/OIDC.kt @@ -17,7 +17,6 @@ import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.routing.* import io.ktor.server.util.* -import io.ktor.util.pipeline.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json @@ -151,24 +150,24 @@ object OIDC : AuthenticationMethod("oidc") { } override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { route("oidc") { get("auth") { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val config = session.lookupConfiguration(this@OIDC) val oidcAuthSession = createOidcSession(context = Unit, config) - context.respondRedirect(oidcAuthSession.authUrl) + call.respondRedirect(oidcAuthSession.authUrl) } get("callback") { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val config = session.lookupConfiguration(this@OIDC) - val params = context.parameters + val params = call.parameters val code = params.getOrFail("code") val state = params.getOrFail("state") @@ -182,7 +181,7 @@ object OIDC : AuthenticationMethod("oidc") { // TODO: better OIDC Identifier (make sure malicious cannot generate a clash per URL) val identifier = OIDCIdentifier(config.openIdConfiguration.authorizationEndpoint, sub) - context.handleAuthSuccess(session, identifier.resolveToAccountId()) + call.handleAuthSuccess(session, identifier.resolveToAccountId()) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/RADIUS.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/RADIUS.kt index 0e3ac948a..ef6b42abd 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/RADIUS.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/RADIUS.kt @@ -13,7 +13,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.auth.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import org.aaa4j.radius.client.RadiusClient import org.aaa4j.radius.client.clients.UdpRadiusClient import org.aaa4j.radius.core.attribute.StringData @@ -54,21 +53,20 @@ object RADIUS : UserPassBasedAuthMethod("radius") { return identifier } - override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("radius", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val credential = call.getUsernamePasswordFromRequest() - val identifier = auth(session, credential, context) - context.handleAuthSuccess(session, identifier.resolveToAccountId()) + val identifier = auth(session, credential, call) + call.handleAuthSuccess(session, identifier.resolveToAccountId()) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/TOTP.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/TOTP.kt index 75585efcf..3a582cdfb 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/TOTP.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/TOTP.kt @@ -17,7 +17,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.serialization.Serializable object TOTP : AuthenticationMethod("totp") { @@ -40,14 +39,14 @@ object TOTP : AuthenticationMethod("totp") { data class TOTPCode(val code: String) override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("totp", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val otp = when (call.request.contentType()) { ContentType.Application.Json -> call.receive().code @@ -59,7 +58,7 @@ object TOTP : AuthenticationMethod("totp") { auth(session, otp) - context.handleAuthSuccess(session, null) + call.handleAuthSuccess(session, null) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/UserPass.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/UserPass.kt index b77c21577..913f9d7b4 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/UserPass.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/UserPass.kt @@ -16,7 +16,6 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.auth.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.serialization.Serializable @Serializable @@ -44,20 +43,20 @@ object UserPass : UserPassBasedAuthMethod("userpass") { } override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { post("userpass", { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val credential = call.getUsernamePasswordFromRequest() - val identifier = auth(session, credential, context) + val identifier = auth(session, credential, call) - context.handleAuthSuccess(session, identifier.resolveToAccountId()) + call.handleAuthSuccess(session, identifier.resolveToAccountId()) } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/VerifiableCredential.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/VerifiableCredential.kt index 23c04c5ca..520b6ddfc 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/VerifiableCredential.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/VerifiableCredential.kt @@ -20,7 +20,6 @@ import io.ktor.server.request.* import io.ktor.server.response.* import io.ktor.server.routing.* import io.ktor.server.util.* -import io.ktor.util.pipeline.* import kotlinx.serialization.Serializable import kotlinx.serialization.json.* import kotlin.io.encoding.Base64 @@ -33,24 +32,24 @@ object VerifiableCredential : AuthenticationMethod("vc") { val verifierUrl = "http://localhost:7003" override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { route("vc", { }) { get("start-presentation") { - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val config = session.lookupConfiguration(this@VerifiableCredential) - val redirectUrl = context.request.uri.removeSuffix("/start-presentation") + "/callback" + val redirectUrl = call.request.uri.removeSuffix("/start-presentation") + "/callback" val resp = Verifier.verify(verifierUrl, config.verification, redirectUrl) - context.respond(resp.presentationRequest) + call.respond(resp.presentationRequest) } get("callback") { - context.respond("handle further...") + call.respond("handle further...") //val session = getSession(authContext) //context.handleAuthSuccess(session, ) } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Web3.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Web3.kt index b2ed0e7e1..b940cd9de 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Web3.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/Web3.kt @@ -14,7 +14,6 @@ import io.klogging.logger import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.coroutines.runBlocking import kotlinx.datetime.Clock import kotlinx.serialization.Serializable @@ -119,19 +118,19 @@ object Web3 : AuthenticationMethod("web3") { } override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { route("web3") { get("nonce") { val newNonce = makeNonce() - context.respond(newNonce) + call.respond(newNonce) } post("signed", { request { body() } }) { req -> - val session = getSession(authContext) + val session = call.getAuthSession(authContext) val address = verifySiweLogin(req) val identifier = Web3Identifier(address) @@ -142,7 +141,7 @@ object Web3 : AuthenticationMethod("web3") { registrationFunction.invoke(identifier) } - context.handleAuthSuccess(session, identifierResolved ?: identifier.resolveToAccountId()) + call.handleAuthSuccess(session, identifierResolved ?: identifier.resolveToAccountId()) } } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/GlobalIdentify.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/GlobalIdentify.kt index 79c784f1f..1d204bc16 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/GlobalIdentify.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/GlobalIdentify.kt @@ -9,7 +9,7 @@ import io.ktor.util.pipeline.* object GlobalIdentify : IdentifyVirtualAuth("identify-global") { override fun Route.registerAuthenticationRoutes( - authContext: PipelineContext.() -> AuthContext, + authContext: ApplicationCall.() -> AuthContext, functionAmendments: Map Unit>? ) { throw NotImplementedError("This method is internally referenced and not to be used by the caller.") diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/IdentifyEmail.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/IdentifyEmail.kt index 531dd3b44..1e7a4c68d 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/IdentifyEmail.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/main/kotlin/id/walt/ktorauthnz/methods/virtual/IdentifyEmail.kt @@ -18,13 +18,13 @@ object IdentifyEmail : IdentifyVirtualAuth("identify") { @Serializable data class IdentifyEmailRequest(val email: String) - override fun Route.register(authContext: PipelineContext.() -> AuthContext) { + override fun Route.register(authContext: ApplicationCall.() -> AuthContext) { post("identify-email", { request { body() } }) { // TODO: support the others (form, etc) - val email = context.receive().email + val email = call.receive().email val identifier = EmailIdentifier(email) val store = KtorAuthnzManager.accountStore diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/AuthFlowExampleApplication.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/AuthFlowExampleApplication.kt index 16493b8b8..72f01b3d2 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/AuthFlowExampleApplication.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/AuthFlowExampleApplication.kt @@ -47,7 +47,7 @@ fun loggingSetup() { } } -fun startExample(wait: Boolean = true, jwt: Boolean): ApplicationEngine { +fun startExample(wait: Boolean = true, jwt: Boolean): EmbeddedServer { loggingSetup() return embeddedServer(CIO, port = 8088, host = "0.0.0.0", module = { this.module(jwt) }) .start(wait = wait) @@ -63,7 +63,7 @@ fun Application.module(jwt: Boolean) { testApp(jwt) - collectRoutes().forEach { + /*collectRoutes().forEach { println(it) - } + }*/ } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/ExampleWeb.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/ExampleWeb.kt index 70f62d93b..732df7047 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/ExampleWeb.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/ExampleWeb.kt @@ -33,10 +33,10 @@ fun Route.globalMultistepExample() { """.trimIndent() val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"], + tenant = request.host(), + sessionId = parameters["sessionId"], implicitSessionGeneration = true, initialFlow = authFlow ) @@ -59,10 +59,10 @@ fun Route.globalImplicitSingleStep() { val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"], + tenant = request.host(), + sessionId = parameters["sessionId"], implicitSessionGeneration = true, initialFlow = authFlow ) @@ -87,10 +87,10 @@ fun Route.globalImplicitMultiStep() { val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"], + tenant = request.host(), + sessionId = parameters["sessionId"], implicitSessionGeneration = true, initialFlow = authFlow ) @@ -107,10 +107,10 @@ fun Route.globalExplicitMultiStep() { route("global-explicit2") { val methods = listOf(UserPass, TOTP) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"] ?: error("Missing sessionId") + tenant = request.host(), + sessionId = parameters["sessionId"] ?: error("Missing sessionId") ) } @@ -132,7 +132,7 @@ fun Route.globalExplicitMultiStep() { post("start") { val session = SessionManager.openExplicitGlobalSession(authFlow) - context.respond(session.toInformation()) + call.respond(session.toInformation()) } } } @@ -156,10 +156,10 @@ fun Route.globalImplicitVc() { val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"], + tenant = request.host(), + sessionId = parameters["sessionId"], implicitSessionGeneration = true, initialFlow = authFlow ) @@ -184,7 +184,7 @@ fun Route.globalImplicitVc() { val authFlow = AuthFlow.fromConfig(flowConfig) - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( tenant = call.request.host(), sessionId = call.parameters["sessionId"], @@ -202,7 +202,7 @@ fun Route.globalImplicitVc() { post("start") { val session = SessionManager.openExplicitGlobalSession(authFlow) - context.respond(session.toInformation()) + call.respond(session.toInformation()) } } }*/ @@ -245,8 +245,8 @@ fun Application.testApp(jwt: Boolean) { authenticate("ktor-authnz") { get("/protected") { - val token = getAuthToken() - val accountId = getAuthenticatedAccount() + val token = call.getAuthToken() + val accountId = call.getAuthenticatedAccount() call.respondText("Hello token ${token}, you are $accountId") } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/KtorAuthnzDevMockedTest.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/KtorAuthnzDevMockedTest.kt index 298240625..bb0f258ab 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/KtorAuthnzDevMockedTest.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/KtorAuthnzDevMockedTest.kt @@ -27,7 +27,7 @@ class KtorAuthnzDevMockedTest { routing { authenticate { get("/protected") { - context.respond("protected") + call.respond("protected") } } } @@ -56,8 +56,8 @@ class KtorAuthnzDevMockedTest { routing { authenticate("dev-auth") { get("/protected") { - val acc = getAuthenticatedAccount() - context.respond("protected! you are: $acc") + val acc = call.getAuthenticatedAccount() + call.respond("protected! you are: $acc") } } } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/RouteCollector.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/RouteCollector.kt index 72c0a1bc4..108ab36f6 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/RouteCollector.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/RouteCollector.kt @@ -28,41 +28,41 @@ fun Application.collectRoutes(): List { */ private fun Route.allRoutes(prefix: String = ""): List { val routes = mutableListOf() - - /** - * Checks if the route is a prefix (non-terminal) route. - * A prefix route is identified by having children with specific HTTP method selectors. - * - * @return True if the route is a prefix route, false otherwise. - */ - fun Route.isPrefixRoute(): Boolean { - return this.children.any { it.selector is HttpMethodRouteSelector } - } - - /** - * Recursive function to traverse the route tree and collect terminal routes. - * - * @param currentPath The current path accumulated from the parent routes. - */ - fun Route.collectRoutes(currentPath: String) { - val pathSegment = when (val selector = this.selector) { - is PathSegmentConstantRouteSelector -> "${currentPath}/${selector.value}" - is PathSegmentParameterRouteSelector -> "${currentPath}/{${selector.name}}" - is PathSegmentWildcardRouteSelector -> "${currentPath}/*" - else -> currentPath - } - - // Add the route if it's a terminal route (has an HttpMethodRouteSelector and is not a prefix route). - if (this.selector is HttpMethodRouteSelector && !this.isPrefixRoute()) { - val method = (this.selector as HttpMethodRouteSelector).method.value - routes.add("$method $pathSegment") - } - - // Recursively collect routes from children. - this.children.forEach { it.collectRoutes(pathSegment) } - } - - this.collectRoutes(prefix) +// +// /** +// * Checks if the route is a prefix (non-terminal) route. +// * A prefix route is identified by having children with specific HTTP method selectors. +// * +// * @return True if the route is a prefix route, false otherwise. +// */ +// fun Route.isPrefixRoute(): Boolean { +// return this.children.any { it.selector is HttpMethodRouteSelector } +// } +// +// /** +// * Recursive function to traverse the route tree and collect terminal routes. +// * +// * @param currentPath The current path accumulated from the parent routes. +// */ +// fun Route.collectRoutes(currentPath: String) { +// val pathSegment = when (val selector = this.selector) { +// is PathSegmentConstantRouteSelector -> "${currentPath}/${selector.value}" +// is PathSegmentParameterRouteSelector -> "${currentPath}/{${selector.name}}" +// is PathSegmentWildcardRouteSelector -> "${currentPath}/*" +// else -> currentPath +// } +// +// // Add the route if it's a terminal route (has an HttpMethodRouteSelector and is not a prefix route). +// if (this.selector is HttpMethodRouteSelector && !this.isPrefixRoute()) { +// val method = (this.selector as HttpMethodRouteSelector).method.value +// routes.add("$method $pathSegment") +// } +// +// // Recursively collect routes from children. +// this.children.forEach { it.collectRoutes(pathSegment) } +// } +// +// this.collectRoutes(prefix) return routes.distinct() } diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/Monitoring.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/Monitoring.kt index 3616dd9d3..4781b61a3 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/Monitoring.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/Monitoring.kt @@ -2,7 +2,7 @@ package id.walt.web.plugins import io.ktor.http.* import io.ktor.server.application.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.CallLogging import io.ktor.server.plugins.statuspages.* import io.ktor.server.response.* diff --git a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/OpenApi.kt b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/OpenApi.kt index 7b991c6bb..b0928f6db 100644 --- a/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/OpenApi.kt +++ b/waltid-libraries/auth/waltid-ktor-authnz/src/test/kotlin/id/walt/web/plugins/OpenApi.kt @@ -39,7 +39,7 @@ fun Application.configureOpenApi() { get("/", { summary = "Redirect to swagger interface for API documentation" }) { - context.respondRedirect("swagger") + call.respondRedirect("swagger") } } } diff --git a/waltid-libraries/auth/waltid-permissions/build.gradle.kts b/waltid-libraries/auth/waltid-permissions/build.gradle.kts index de5f59211..7e49c6032 100644 --- a/waltid-libraries/auth/waltid-permissions/build.gradle.kts +++ b/waltid-libraries/auth/waltid-permissions/build.gradle.kts @@ -65,15 +65,15 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") implementation("${SuspendTransPluginConstants.ANNOTATION_GROUP}:${SuspendTransPluginConstants.ANNOTATION_NAME}:${SuspendTransPluginConstants.ANNOTATION_VERSION}") } } val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } } diff --git a/waltid-libraries/credentials/waltid-dif-definitions-parser/build.gradle.kts b/waltid-libraries/credentials/waltid-dif-definitions-parser/build.gradle.kts index a0674332d..150e8b584 100644 --- a/waltid-libraries/credentials/waltid-dif-definitions-parser/build.gradle.kts +++ b/waltid-libraries/credentials/waltid-dif-definitions-parser/build.gradle.kts @@ -52,16 +52,16 @@ kotlin { dependencies { // JSON implementation("com.eygraber:jsonpathkt-kotlinx:3.0.2") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("io.github.optimumcode:json-schema-validator:0.2.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("io.github.optimumcode:json-schema-validator:0.4.0") implementation(project(":waltid-libraries:credentials:waltid-verifiable-credentials")) // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") } } val commonTest by getting { @@ -71,7 +71,7 @@ kotlin { } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation("org.slf4j:slf4j-simple:2.0.16") } } diff --git a/waltid-libraries/credentials/waltid-mdoc-credentials/build.gradle.kts b/waltid-libraries/credentials/waltid-mdoc-credentials/build.gradle.kts index 3507a6cd4..2492ca874 100644 --- a/waltid-libraries/credentials/waltid-mdoc-credentials/build.gradle.kts +++ b/waltid-libraries/credentials/waltid-mdoc-credentials/build.gradle.kts @@ -3,6 +3,7 @@ plugins { kotlin("plugin.serialization") id("dev.petuska.npm.publish") version "3.4.3" `maven-publish` + id("com.github.ben-manes.versions") } group = "id.walt.mdoc-credentials" @@ -55,10 +56,10 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") //implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.5.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") implementation("com.soywiz.korlibs.krypto:krypto:4.0.10") } } @@ -74,9 +75,9 @@ kotlin { } val jvmTest by getting { dependencies { - implementation("org.bouncycastle:bcprov-lts8on:2.73.6") - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") - implementation("io.mockk:mockk:1.13.11") + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") + implementation("io.mockk:mockk:1.13.16") implementation(kotlin("reflect")) } diff --git a/waltid-libraries/credentials/waltid-verifiable-credentials/build.gradle.kts b/waltid-libraries/credentials/waltid-verifiable-credentials/build.gradle.kts index 3a18a7692..e38960b4f 100644 --- a/waltid-libraries/credentials/waltid-verifiable-credentials/build.gradle.kts +++ b/waltid-libraries/credentials/waltid-verifiable-credentials/build.gradle.kts @@ -84,13 +84,13 @@ kotlin { iosSimulatorArm64() } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { val commonMain by getting { dependencies { // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("io.github.optimumcode:json-schema-validator:0.2.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("io.github.optimumcode:json-schema-validator:0.4.0") // Ktor client implementation("io.ktor:ktor-client-core:$ktor_version") @@ -101,14 +101,14 @@ kotlin { implementation("io.ktor:ktor-client-logging:$ktor_version") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Kotlinx - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") - implementation("app.softwork:kotlinx-uuid-core:0.1.2") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") + implementation("app.softwork:kotlinx-uuid-core:0.1.4") // Loggin - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") // walt.id api(project(":waltid-libraries:crypto:waltid-crypto")) @@ -122,7 +122,7 @@ kotlin { val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { @@ -136,9 +136,9 @@ kotlin { } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation("org.slf4j:slf4j-simple:2.0.16") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") } } val jsMain by getting { diff --git a/waltid-libraries/credentials/waltid-verification-policies/build.gradle.kts b/waltid-libraries/credentials/waltid-verification-policies/build.gradle.kts index fa1842617..e5515804b 100644 --- a/waltid-libraries/credentials/waltid-verification-policies/build.gradle.kts +++ b/waltid-libraries/credentials/waltid-verification-policies/build.gradle.kts @@ -61,21 +61,21 @@ kotlin { iosSimulatorArm64() } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { val commonMain by getting { dependencies { implementation("com.eygraber:jsonpathkt-kotlinx:3.0.2") // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1") - implementation("io.github.optimumcode:json-schema-validator:0.2.2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("io.github.optimumcode:json-schema-validator:0.4.0") implementation(project(":waltid-libraries:credentials:waltid-verifiable-credentials")) implementation(project(":waltid-libraries:credentials:waltid-dif-definitions-parser")) implementation(project(":waltid-libraries:sdjwt:waltid-sdjwt")) // Kotlinx - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Ktor client implementation("io.ktor:ktor-client-core:$ktor_version") @@ -86,10 +86,10 @@ kotlin { implementation("io.ktor:ktor-client-logging:$ktor_version") // Loggin - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // suspend-transform plugin annotations (required in the current version to avoid "compileOnly" warning) implementation("${SuspendTransPluginConstants.ANNOTATION_GROUP}:${SuspendTransPluginConstants.ANNOTATION_NAME}:${SuspendTransPluginConstants.ANNOTATION_VERSION}") @@ -98,14 +98,14 @@ kotlin { val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1") - implementation("org.slf4j:slf4j-simple:2.0.13") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0-M2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.slf4j:slf4j-simple:2.0.16") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") } } diff --git a/waltid-libraries/credentials/waltid-verification-policies/src/commonTest/kotlin/id/walt/policies/DynamicPolicyVerificationTest.kt b/waltid-libraries/credentials/waltid-verification-policies/src/commonTest/kotlin/id/walt/policies/DynamicPolicyVerificationTest.kt index 827ac7165..99227ad4c 100644 --- a/waltid-libraries/credentials/waltid-verification-policies/src/commonTest/kotlin/id/walt/policies/DynamicPolicyVerificationTest.kt +++ b/waltid-libraries/credentials/waltid-verification-policies/src/commonTest/kotlin/id/walt/policies/DynamicPolicyVerificationTest.kt @@ -11,7 +11,6 @@ import io.ktor.client.statement.* import io.ktor.http.* import io.ktor.serialization.kotlinx.json.* import kotlinx.coroutines.test.runTest -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.jsonArray @@ -30,8 +29,8 @@ class DynamicPolicyTest { return try { val response: HttpResponse = http.get("http://localhost:8181") response.status == HttpStatusCode.OK - } catch (e: Exception) { - println("Error connecting to OPA server: ${e.message}") + } catch (e: Throwable) { + println("OPA server is not available: ${e.stackTraceToString()}") false } finally { http.close() @@ -42,7 +41,7 @@ class DynamicPolicyTest { @Test fun testPresentationVerificationWithDynamicPolicy() = runTest { if (!isOpaServerRunning()) { - println("Skipping test: OPA server is not running.") + println("Skipping test: OPA server is not available.") return@runTest } DidService.apply { @@ -122,4 +121,4 @@ class DynamicPolicyTest { println("Results: " + x.size) println("OK: ${x.count { it.isSuccess() }}") } -} \ No newline at end of file +} diff --git a/waltid-libraries/crypto/waltid-crypto-android/build.gradle.kts b/waltid-libraries/crypto/waltid-crypto-android/build.gradle.kts index b22f70793..ac86764c9 100644 --- a/waltid-libraries/crypto/waltid-crypto-android/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-crypto-android/build.gradle.kts @@ -88,14 +88,14 @@ kotlin { val androidMain by getting { dependencies { api(project(":waltid-libraries:crypto:waltid-crypto")) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") } } val androidInstrumentedTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") implementation("androidx.test.ext:junit:1.2.1") implementation("androidx.test:runner:1.6.1") implementation("androidx.test:rules:1.6.1") @@ -104,8 +104,8 @@ kotlin { val androidUnitTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.junit.jupiter:junit-jupiter-api:5.11.0") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-api:5.11.4") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") } } publishing { diff --git a/waltid-libraries/crypto/waltid-crypto-aws/build.gradle.kts b/waltid-libraries/crypto/waltid-crypto-aws/build.gradle.kts index 4366a969b..6b4f7bad8 100644 --- a/waltid-libraries/crypto/waltid-crypto-aws/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-crypto-aws/build.gradle.kts @@ -14,22 +14,22 @@ repositories { dependencies { testImplementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") // walt.id api(project(":waltid-libraries:crypto:waltid-crypto")) // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // AWS - implementation("aws.sdk.kotlin:kms:1.3.91") + implementation("aws.sdk.kotlin:kms:1.4.22") // JOSE - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") } java { diff --git a/waltid-libraries/crypto/waltid-crypto-ios/build.gradle.kts b/waltid-libraries/crypto/waltid-crypto-ios/build.gradle.kts index 06e79c98b..8ab44423c 100644 --- a/waltid-libraries/crypto/waltid-crypto-ios/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-crypto-ios/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") kotlin("native.cocoapods") + id("com.github.ben-manes.versions") } kotlin { diff --git a/waltid-libraries/crypto/waltid-crypto-oci/build.gradle.kts b/waltid-libraries/crypto/waltid-crypto-oci/build.gradle.kts index a49ed9a65..aaa9328e5 100644 --- a/waltid-libraries/crypto/waltid-crypto-oci/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-crypto-oci/build.gradle.kts @@ -74,17 +74,17 @@ kotlin { val commonMain by getting { dependencies { // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Crypto - implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.5.3")) + implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.6.1")) implementation("org.kotlincrypto.hash:sha2") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") // walt.id api(project(":waltid-libraries:crypto:waltid-crypto")) @@ -94,19 +94,19 @@ kotlin { dependencies { implementation(kotlin("test-common")) implementation(kotlin("test-annotations-common")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { dependencies { // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.10.1") // OCI - implementation("com.oracle.oci.sdk:oci-java-sdk-shaded-full:3.49.0") + implementation("com.oracle.oci.sdk:oci-java-sdk-shaded-full:3.57.1") // JOSE - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") // walt.id api(project(":waltid-libraries:crypto:waltid-crypto")) @@ -114,15 +114,15 @@ kotlin { } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Logging implementation("org.slf4j:slf4j-simple:2.0.16") // Test implementation(kotlin("test")) - implementation("org.junit.jupiter:junit-jupiter-api:5.11.0") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-api:5.11.4") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") } } // val androidMain by getting { diff --git a/waltid-libraries/crypto/waltid-crypto/build.gradle.kts b/waltid-libraries/crypto/waltid-crypto/build.gradle.kts index a15ffb3d3..72643fd3b 100644 --- a/waltid-libraries/crypto/waltid-crypto/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-crypto/build.gradle.kts @@ -86,7 +86,7 @@ kotlin { iosSimulatorArm64() } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { @@ -97,7 +97,7 @@ kotlin { val commonMain by getting { dependencies { // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Ktor client implementation("io.ktor:ktor-client-core:$ktor_version") @@ -107,25 +107,25 @@ kotlin { implementation("io.ktor:ktor-client-json:$ktor_version") implementation("io.ktor:ktor-client-logging:$ktor_version") - implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.5.3")) + implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.6.1")) implementation("org.kotlincrypto.hash:sha2") // Date - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Cache - implementation("io.github.reactivecircus.cache4k:cache4k:0.13.0") + implementation("io.github.reactivecircus.cache4k:cache4k:0.14.0") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") implementation("${SuspendTransPluginConstants.ANNOTATION_GROUP}:${SuspendTransPluginConstants.ANNOTATION_NAME}:${SuspendTransPluginConstants.ANNOTATION_VERSION}") - implementation(platform("org.kotlincrypto.macs:bom:0.5.3")) + implementation(project.dependencies.platform("org.kotlincrypto.macs:bom:0.6.1")) implementation("org.kotlincrypto.macs:hmac-sha2") } @@ -134,24 +134,24 @@ kotlin { dependencies { implementation(kotlin("test-common")) implementation(kotlin("test-annotations-common")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { dependencies { - implementation("com.google.crypto.tink:tink:1.15.0") // for JOSE using Ed25519 + implementation("com.google.crypto.tink:tink:1.16.0") // for JOSE using Ed25519 - implementation("org.bouncycastle:bcprov-lts8on:2.73.6") // for secp256k1 (which was removed with Java 17) - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") // PEM import + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") // for secp256k1 (which was removed with Java 17) + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") // PEM import // Ktor client implementation("io.ktor:ktor-client-okhttp:$ktor_version") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.10.1") // JOSE - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") } } @@ -163,9 +163,9 @@ kotlin { // Test implementation(kotlin("test")) - implementation("org.junit.jupiter:junit-jupiter-api:5.11.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-api:5.11.4") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") } } val jsMain by getting { diff --git a/waltid-libraries/crypto/waltid-crypto/src/commonMain/kotlin/id/walt/crypto/keys/tse/TSEKey.kt b/waltid-libraries/crypto/waltid-crypto/src/commonMain/kotlin/id/walt/crypto/keys/tse/TSEKey.kt index e6d917adf..256fdb6e9 100644 --- a/waltid-libraries/crypto/waltid-crypto/src/commonMain/kotlin/id/walt/crypto/keys/tse/TSEKey.kt +++ b/waltid-libraries/crypto/waltid-crypto/src/commonMain/kotlin/id/walt/crypto/keys/tse/TSEKey.kt @@ -326,7 +326,6 @@ class TSEKey( else -> throw KeyTypeNotSupportedException(type) } - @OptIn(InternalAPI::class) @JvmBlocking @JvmAsync @JsPromise diff --git a/waltid-libraries/crypto/waltid-target-ios/build.gradle.kts b/waltid-libraries/crypto/waltid-target-ios/build.gradle.kts index 719c63fbd..660f3d209 100644 --- a/waltid-libraries/crypto/waltid-target-ios/build.gradle.kts +++ b/waltid-libraries/crypto/waltid-target-ios/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("multiplatform") kotlin("native.cocoapods") kotlin("plugin.serialization") + id("com.github.ben-manes.versions") } kotlin { @@ -55,8 +56,8 @@ kotlin { val commonMain by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") } } diff --git a/waltid-libraries/protocols/waltid-openid4vc/build.gradle.kts b/waltid-libraries/protocols/waltid-openid4vc/build.gradle.kts index a0c29eecf..e62124b5d 100644 --- a/waltid-libraries/protocols/waltid-openid4vc/build.gradle.kts +++ b/waltid-libraries/protocols/waltid-openid4vc/build.gradle.kts @@ -76,7 +76,7 @@ kotlin { iosSimulatorArm64() } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { @@ -86,17 +86,17 @@ kotlin { val commonMain by getting { dependencies { // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // HTTP implementation("io.ktor:ktor-client-core:$ktor_version") implementation("io.ktor:ktor-client-content-negotiation:$ktor_version") implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version") - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // walt.id implementation(project(":waltid-libraries:crypto:waltid-crypto")) @@ -108,13 +108,13 @@ kotlin { // -- Multiplatform -- // Multiplatform / Uuid - implementation("app.softwork:kotlinx-uuid-core:0.1.2") + implementation("app.softwork:kotlinx-uuid-core:0.1.4") // Multiplatform / Date & time - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Multiplatform / Hashes - implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.5.3")) + implementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.6.1")) implementation("org.kotlincrypto.hash:sha2") } } @@ -124,26 +124,26 @@ kotlin { implementation(project(":waltid-libraries:crypto:waltid-crypto")) implementation(project(":waltid-libraries:waltid-did")) implementation(project(":waltid-libraries:credentials:waltid-verifiable-credentials")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { dependencies { implementation("io.ktor:ktor-client-okhttp:$ktor_version") implementation("com.augustcellars.cose:cose-java:1.1.0") - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") } } val jvmTest by getting { dependencies { - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") implementation("io.kotest:kotest-runner-junit5:5.9.1") implementation("io.kotest:kotest-assertions-core:5.9.1") implementation("io.kotest:kotest-assertions-json:5.9.1") - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") - implementation("com.google.crypto.tink:tink:1.15.0") // for JOSE using Ed25519 - implementation("org.bouncycastle:bcprov-lts8on:2.73.6") // for secp256k1 (which was removed with Java 17) - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") // PEM import + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") + implementation("com.google.crypto.tink:tink:1.16.0") // for JOSE using Ed25519 + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") // for secp256k1 (which was removed with Java 17) + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") // PEM import implementation("io.ktor:ktor-server-core-jvm:$ktor_version") implementation("io.ktor:ktor-server-netty-jvm:$ktor_version") @@ -156,7 +156,7 @@ kotlin { implementation("io.ktor:ktor-client-content-negotiation:$ktor_version") implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version") implementation("io.ktor:ktor-client-logging-jvm:$ktor_version") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.1") implementation("io.ktor:ktor-client-okhttp:$ktor_version") implementation("com.augustcellars.cose:cose-java:1.1.0") diff --git a/waltid-libraries/sdjwt/waltid-sdjwt-ios/build.gradle.kts b/waltid-libraries/sdjwt/waltid-sdjwt-ios/build.gradle.kts index ab4167693..49e00a8fd 100644 --- a/waltid-libraries/sdjwt/waltid-sdjwt-ios/build.gradle.kts +++ b/waltid-libraries/sdjwt/waltid-sdjwt-ios/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("multiplatform") kotlin("native.cocoapods") kotlin("plugin.serialization") + id("com.github.ben-manes.versions") } kotlin { diff --git a/waltid-libraries/sdjwt/waltid-sdjwt/build.gradle.kts b/waltid-libraries/sdjwt/waltid-sdjwt/build.gradle.kts index c050dccd6..c7c2e362d 100644 --- a/waltid-libraries/sdjwt/waltid-sdjwt/build.gradle.kts +++ b/waltid-libraries/sdjwt/waltid-sdjwt/build.gradle.kts @@ -103,12 +103,12 @@ kotlin { val commonMain by getting { dependencies { - implementation("dev.whyoleg.cryptography:cryptography-random:0.3.1") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("dev.whyoleg.cryptography:cryptography-random:0.4.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") implementation("com.soywiz.korlibs.krypto:krypto:4.0.10") - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") } } val commonTest by getting { @@ -118,7 +118,7 @@ kotlin { } val jvmMain by getting { dependencies { - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") api(project(":waltid-libraries:crypto:waltid-crypto")) } } diff --git a/waltid-libraries/util/waltid-reporting/build.gradle.kts b/waltid-libraries/util/waltid-reporting/build.gradle.kts index 58a80b106..dbe9d10a8 100644 --- a/waltid-libraries/util/waltid-reporting/build.gradle.kts +++ b/waltid-libraries/util/waltid-reporting/build.gradle.kts @@ -46,12 +46,12 @@ kotlin { } } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { val commonMain by getting { dependencies { // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Ktor client implementation("io.ktor:ktor-client-core:$ktor_version") @@ -67,20 +67,20 @@ kotlin { implementation("it.justwrote:kjob-kron:0.2.0")*/ // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // datetime - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") } } val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") - implementation("org.junit.jupiter:junit-jupiter-api:5.11.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") + implementation("org.junit.jupiter:junit-jupiter-api:5.11.4") } } val jvmMain by getting { @@ -92,12 +92,12 @@ kotlin { implementation("org.slf4j:slf4j-simple:2.0.16") // JOSE - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") } } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") } } publishing { diff --git a/waltid-libraries/waltid-core-wallet/build.gradle.kts b/waltid-libraries/waltid-core-wallet/build.gradle.kts index faa86686b..ba8383113 100644 --- a/waltid-libraries/waltid-core-wallet/build.gradle.kts +++ b/waltid-libraries/waltid-core-wallet/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") id("maven-publish") + id("com.github.ben-manes.versions") } group = "id.walt.wallet" @@ -18,14 +19,14 @@ kotlin { jvmToolchain(21) sourceSets { - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" val commonMain by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.0") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.4") implementation(project(":waltid-libraries:crypto:waltid-crypto")) implementation(project(":waltid-libraries:waltid-did")) @@ -44,11 +45,11 @@ kotlin { implementation("io.ktor:ktor-client-logging:$ktor_version") // Bouncy Castle - implementation("org.bouncycastle:bcprov-lts8on:2.73.6") - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") // Problematic libraries: - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") implementation("com.augustcellars.cose:cose-java:1.1.0") } } @@ -61,13 +62,13 @@ kotlin { val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmTest by getting { dependencies { - implementation("org.junit.jupiter:junit-jupiter-api:5.11.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.junit.jupiter:junit-jupiter-api:5.11.4") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation("org.slf4j:slf4j-simple:2.0.16") } } diff --git a/waltid-libraries/waltid-did/build.gradle.kts b/waltid-libraries/waltid-did/build.gradle.kts index c2bf49c50..4da0ad520 100644 --- a/waltid-libraries/waltid-did/build.gradle.kts +++ b/waltid-libraries/waltid-did/build.gradle.kts @@ -84,12 +84,12 @@ kotlin { iosSimulatorArm64() } - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" sourceSets { val commonMain by getting { dependencies { // JSON - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Ktor client implementation("io.ktor:ktor-client-core:$ktor_version") @@ -100,22 +100,23 @@ kotlin { implementation("io.ktor:ktor-client-logging:$ktor_version") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Date - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Uuid - implementation("app.softwork:kotlinx-uuid-core:0.1.2") + implementation("app.softwork:kotlinx-uuid-core:0.1.4") // Crypto api(project(":waltid-libraries:crypto:waltid-crypto")) // Encodings - implementation("net.thauvin.erik.urlencoder:urlencoder-lib:1.5.0") + implementation("net.thauvin.erik.urlencoder:urlencoder-lib:1.6.0") // Logging - implementation("io.github.oshai:kotlin-logging:7.0.0") + implementation("io.github.oshai:kotlin-logging:7.0.4") + // suspend-transform plugin annotations (required in the current version to avoid "compileOnly" warning) implementation("${SuspendTransPluginConstants.ANNOTATION_GROUP}:${SuspendTransPluginConstants.ANNOTATION_NAME}:${SuspendTransPluginConstants.ANNOTATION_VERSION}") @@ -124,7 +125,7 @@ kotlin { val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { @@ -141,12 +142,16 @@ kotlin { } val jvmTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.slf4j:slf4j-simple:2.0.16") + + + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation(kotlin("test")) - implementation("org.junit.jupiter:junit-jupiter-params:5.11.0") + implementation("org.junit.jupiter:junit-jupiter-params:5.11.4") implementation("io.ktor:ktor-server-test-host:$ktor_version") implementation("io.ktor:ktor-server-content-negotiation:$ktor_version") - implementation("io.ktor:ktor-server-netty:2.3.12") + implementation("io.ktor:ktor-server-netty:$ktor_version") + implementation("io.ktor:ktor-network-tls-certificates:$ktor_version") } } val jsMain by getting { diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidCheqdDocument.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidCheqdDocument.kt index a02f55e06..c386f0864 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidCheqdDocument.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidCheqdDocument.kt @@ -1,7 +1,7 @@ package id.walt.did.dids.document import id.walt.did.dids.DidUtils -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished.DidDocument +import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.DidDocument import kotlinx.serialization.EncodeDefault import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.SerialName diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/DidCheqdRegistrar.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/DidCheqdRegistrar.kt index d471138d1..c94e80bd4 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/DidCheqdRegistrar.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/DidCheqdRegistrar.kt @@ -10,11 +10,11 @@ import id.walt.did.dids.registrar.dids.DidCreateOptions import id.walt.did.dids.registrar.local.LocalRegistrarMethod import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.Secret import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.SigningResponse -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.action.ActionDidState +import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.ActionDidState import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.didStateSerializationModule -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.failed.FailedDidState -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished.DidDocument -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished.FinishedDidState +import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.FailedDidState +import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.DidDocument +import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.FinishedDidState import id.walt.did.dids.registrar.local.cheqd.models.job.request.JobCreateRequest import id.walt.did.dids.registrar.local.cheqd.models.job.request.JobDeactivateRequest import id.walt.did.dids.registrar.local.cheqd.models.job.request.JobSignRequest @@ -24,6 +24,8 @@ import io.github.oshai.kotlinlogging.KotlinLogging import io.ktor.client.* import io.ktor.client.call.* import io.ktor.client.plugins.contentnegotiation.* +import io.ktor.client.plugins.logging.LogLevel +import io.ktor.client.plugins.logging.Logging import io.ktor.client.request.* import io.ktor.client.statement.* import io.ktor.http.* @@ -68,6 +70,9 @@ class DidCheqdRegistrar : LocalRegistrarMethod("cheqd") { install(ContentNegotiation) { json(json) } + install(Logging) { + level = LogLevel.BODY + } } @JvmBlocking @@ -133,11 +138,14 @@ class DidCheqdRegistrar : LocalRegistrarMethod("cheqd") { TODO() } - private suspend fun initiateDidJob(url: String, body: JsonElement) = + private suspend fun initiateDidJob(url: String, body: JsonElement): JobActionResponse = client.post(url) { contentType(ContentType.Application.Json) setBody(body) - }.body() + }.bodyAsText().let { + log.debug { "Try parse Job action response: $it" } + json.decodeFromString(it) + } private suspend fun finalizeDidJob(url: String, jobId: String, verificationMethodId: String, signatures: List) = let { client.post(url) { diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/ActionDidState.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/ActionDidState.kt similarity index 57% rename from waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/ActionDidState.kt rename to waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/ActionDidState.kt index 0f0561d3c..2c2812892 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/ActionDidState.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/ActionDidState.kt @@ -1,6 +1,5 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.action +package id.walt.did.dids.registrar.local.cheqd.models.job.didstates -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.DidState import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlin.js.ExperimentalJsExport @@ -17,4 +16,19 @@ data class ActionDidState( val did: String, val secret: Secret, val signingRequest: List, -) : DidState() +) : DidState() { + @OptIn(ExperimentalJsExport::class) + @Serializable + data class Secret( + val signingResponse: List, + ) + + @OptIn(ExperimentalJsExport::class) + @Serializable + data class SigningRequest( + val alg: String, + val kid: String, + val serializedPayload: String, + val type: String, + ) +} diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/DidDocument.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidDocument.kt similarity index 80% rename from waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/DidDocument.kt rename to waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidDocument.kt index b5ee14132..e67bb49b0 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/DidDocument.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidDocument.kt @@ -1,6 +1,5 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished +package id.walt.did.dids.registrar.local.cheqd.models.job.didstates -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.VerificationMethod import kotlinx.serialization.Serializable import kotlin.js.ExperimentalJsExport import kotlin.js.JsExport diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidState.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidState.kt index ecd2ad571..cc130962c 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidState.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/DidState.kt @@ -1,8 +1,5 @@ package id.walt.did.dids.registrar.local.cheqd.models.job.didstates -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.action.ActionDidState -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.failed.FailedDidState -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished.FinishedDidState import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Polymorphic import kotlinx.serialization.Serializable @@ -15,10 +12,10 @@ import kotlin.js.JsExport @OptIn(ExperimentalJsExport::class, ExperimentalSerializationApi::class) @JsExport -@Polymorphic +//@Polymorphic @Serializable @JsonClassDiscriminator("state") -abstract class DidState { +sealed class DidState { abstract val state: String } diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/failed/FailedDidState.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FailedDidState.kt similarity index 82% rename from waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/failed/FailedDidState.kt rename to waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FailedDidState.kt index 5bc65b1ca..f2377d276 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/failed/FailedDidState.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FailedDidState.kt @@ -1,6 +1,5 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.failed +package id.walt.did.dids.registrar.local.cheqd.models.job.didstates -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.DidState import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlin.js.ExperimentalJsExport diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/FinishedDidState.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FinishedDidState.kt similarity index 73% rename from waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/FinishedDidState.kt rename to waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FinishedDidState.kt index 2d39909f6..6e2ac2234 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/finished/FinishedDidState.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/FinishedDidState.kt @@ -1,7 +1,5 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished +package id.walt.did.dids.registrar.local.cheqd.models.job.didstates -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.DidState -import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.Secret import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlin.js.ExperimentalJsExport diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/Secret.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/Secret.kt deleted file mode 100644 index fdce134bc..000000000 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/Secret.kt +++ /dev/null @@ -1,12 +0,0 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.action - -import kotlinx.serialization.Serializable -import kotlin.js.ExperimentalJsExport -import kotlin.js.JsExport - -@OptIn(ExperimentalJsExport::class) -@JsExport -@Serializable -data class Secret( - val signingResponse: List, -) diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/SigningRequest.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/SigningRequest.kt deleted file mode 100644 index 30dc599a2..000000000 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/registrar/local/cheqd/models/job/didstates/action/SigningRequest.kt +++ /dev/null @@ -1,15 +0,0 @@ -package id.walt.did.dids.registrar.local.cheqd.models.job.didstates.action - -import kotlinx.serialization.Serializable -import kotlin.js.ExperimentalJsExport -import kotlin.js.JsExport - -@OptIn(ExperimentalJsExport::class) -@JsExport -@Serializable -data class SigningRequest( - val alg: String, - val kid: String, - val serializedPayload: String, - val type: String, -) diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/resolver/local/DidCheqdResolver.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/resolver/local/DidCheqdResolver.kt index e6d7b53bd..f0a20c5e1 100644 --- a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/resolver/local/DidCheqdResolver.kt +++ b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/resolver/local/DidCheqdResolver.kt @@ -58,7 +58,7 @@ class DidCheqdResolver : LocalResolverMethod("cheqd") { resolution.jsonObject["didDocument"]?.jsonObject ?: throw IllegalArgumentException("Response for did:cheqd did not contain a DID document!") }.let { - json.decodeFromString( + json.decodeFromString( it.toString() ) } diff --git a/waltid-libraries/waltid-did/src/jvmTest/kotlin/LocalDidWebConsistencyTest.kt b/waltid-libraries/waltid-did/src/jvmTest/kotlin/LocalDidWebConsistencyTest.kt index 8bbe1a80f..02ac18b8e 100644 --- a/waltid-libraries/waltid-did/src/jvmTest/kotlin/LocalDidWebConsistencyTest.kt +++ b/waltid-libraries/waltid-did/src/jvmTest/kotlin/LocalDidWebConsistencyTest.kt @@ -43,7 +43,7 @@ class LocalDidWebConsistencyTest { private val didWebTestEntryList: List private val didWebPathToDocMap = mutableMapOf() - private val didWebTestServer: NettyApplicationEngine + private val didWebTestServer: EmbeddedServer private val keyStoreFile = File(this.javaClass.classLoader.getResource("")!!.path.plus("keystore.jks")) private val keyStore = buildKeyStore { @@ -53,16 +53,14 @@ class LocalDidWebConsistencyTest { subject = X500Principal("CN=localhost, OU=walt.id, O=walt.id, C=AT") } }.also { it.saveToFile(keyStoreFile, "test123") } - private val environment = applicationEngineEnvironment { - envConfig() - } init { didWebTestEntryList = populateTestData() + didWebTestServer = embeddedServer( - Netty, - environment, - ).start(false) + Netty, applicationEnvironment(), { envConfig() }, + module = { module() } + ).start(wait = false) } @AfterTest @@ -102,10 +100,7 @@ class LocalDidWebConsistencyTest { } } - private fun ApplicationEngineEnvironmentBuilder.envConfig() { - module { - module() - } + private fun ApplicationEngine.Configuration.envConfig() { connector { port = 8000 } diff --git a/waltid-libraries/waltid-did/src/jvmTest/kotlin/TestServer.kt b/waltid-libraries/waltid-did/src/jvmTest/kotlin/TestServer.kt index 4a2e84e19..c0b1d1453 100644 --- a/waltid-libraries/waltid-did/src/jvmTest/kotlin/TestServer.kt +++ b/waltid-libraries/waltid-did/src/jvmTest/kotlin/TestServer.kt @@ -35,12 +35,10 @@ object TestServer { subject = X500Principal("CN=localhost, OU=walt.id, O=walt.id, C=AT") } }.also { it.saveToFile(keyStoreFile, "test123") } - private val environment = applicationEngineEnvironment { - envConfig() - } - val server: ApplicationEngine by lazy { + + val server: EmbeddedServer by lazy { println("Initializing embedded webserver...") - embeddedServer(Netty, environment) + embeddedServer(Netty, applicationEnvironment(), { envConfig() }, module = { module() }) } private fun Application.module() { @@ -63,10 +61,7 @@ object TestServer { } } - private fun ApplicationEngineEnvironmentBuilder.envConfig() { - module { - module() - } + private fun ApplicationEngine.Configuration.envConfig() { connector { port = 8000 } diff --git a/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt b/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt index b42ed3d04..98cb33988 100644 --- a/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt +++ b/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt @@ -12,9 +12,11 @@ import org.junit.jupiter.params.provider.Arguments import org.junit.jupiter.params.provider.Arguments.arguments import org.junit.jupiter.params.provider.MethodSource import java.util.stream.Stream +import kotlin.test.Ignore class DidCheqdRegistrarTest : DidRegistrarTestBase(DidCheqdRegistrar()) { + @Ignore @ParameterizedTest @MethodSource override fun `given did options with no key when register then returns a valid did result`( @@ -24,6 +26,7 @@ class DidCheqdRegistrarTest : DidRegistrarTestBase(DidCheqdRegistrar()) { super.`given did options with no key when register then returns a valid did result`(options, assert) } + @Ignore @ParameterizedTest @MethodSource override fun `given did options and key when register with key then returns a valid did result`( diff --git a/waltid-libraries/waltid-did/src/jvmTest/resources/simplelogger.properties b/waltid-libraries/waltid-did/src/jvmTest/resources/simplelogger.properties new file mode 100644 index 000000000..27efa1cfe --- /dev/null +++ b/waltid-libraries/waltid-did/src/jvmTest/resources/simplelogger.properties @@ -0,0 +1,4 @@ +org.slf4j.simpleLogger.showDateTime=true + +org.slf4j.simpleLogger.defaultLogLevel=debug +org.slf4j.simpleLogger.log.id.walt=trace diff --git a/waltid-libraries/waltid-java-compat/build.gradle.kts b/waltid-libraries/waltid-java-compat/build.gradle.kts index 8d2e52eff..1267226e0 100644 --- a/waltid-libraries/waltid-java-compat/build.gradle.kts +++ b/waltid-libraries/waltid-java-compat/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("jvm") id("maven-publish") //`maven-publish` + id("com.github.ben-manes.versions") } group = "id.walt" diff --git a/waltid-libraries/waltid-library-commons/build.gradle.kts b/waltid-libraries/waltid-library-commons/build.gradle.kts index 561a4a906..93a1cfba6 100644 --- a/waltid-libraries/waltid-library-commons/build.gradle.kts +++ b/waltid-libraries/waltid-library-commons/build.gradle.kts @@ -105,7 +105,7 @@ kotlin { dependencies { implementation(kotlin("test-common")) implementation(kotlin("test-annotations-common")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val jvmMain by getting { diff --git a/waltid-services/waltid-e2e-tests/build.gradle.kts b/waltid-services/waltid-e2e-tests/build.gradle.kts index 4227f1835..a3438ee16 100644 --- a/waltid-services/waltid-e2e-tests/build.gradle.kts +++ b/waltid-services/waltid-e2e-tests/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi plugins { kotlin("jvm") kotlin("plugin.power-assert") + id("com.github.ben-manes.versions") } group = "id.walt" @@ -15,15 +16,15 @@ repositories { dependencies { // Testing testImplementation(kotlin("test")) - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.9.0") - testImplementation("io.ktor:ktor-server-test-host:2.3.12") - testImplementation("io.ktor:ktor-client-cio:2.3.12") - testImplementation("io.ktor:ktor-client-content-negotiation:2.3.12") - testImplementation("io.ktor:ktor-client-logging:2.3.12") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.10.1") + testImplementation("io.ktor:ktor-server-test-host:3.1.0") + testImplementation("io.ktor:ktor-client-cio:3.1.0") + testImplementation("io.ktor:ktor-client-content-negotiation:3.1.0") + testImplementation("io.ktor:ktor-client-logging:3.1.0") // Command line formatting - testImplementation("com.github.ajalt.mordant:mordant:2.7.1") + testImplementation("com.github.ajalt.mordant:mordant:3.0.2") // Libraries to test testImplementation(project(":waltid-services:waltid-service-commons-test")) @@ -31,13 +32,13 @@ dependencies { testImplementation(project(":waltid-services:waltid-verifier-api")) testImplementation(project(":waltid-services:waltid-wallet-api")) - testImplementation("app.softwork:kotlinx-uuid-core:0.1.2") - testImplementation("com.nimbusds:nimbus-jose-jwt:9.37.3") + testImplementation("app.softwork:kotlinx-uuid-core:0.1.4") + testImplementation("com.nimbusds:nimbus-jose-jwt:10.0.1") testImplementation("com.augustcellars.cose:cose-java:1.1.0") - testImplementation("org.bouncycastle:bcpkix-lts8on:2.73.6") + testImplementation("org.bouncycastle:bcpkix-lts8on:2.73.7") // Multiplatform / Hashes - testImplementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.5.3")) + testImplementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.6.1")) testImplementation("org.kotlincrypto.hash:sha2") } diff --git a/waltid-services/waltid-issuer-api/build.gradle.kts b/waltid-services/waltid-issuer-api/build.gradle.kts index dc9ae9420..b3045bd95 100644 --- a/waltid-services/waltid-issuer-api/build.gradle.kts +++ b/waltid-services/waltid-issuer-api/build.gradle.kts @@ -3,16 +3,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.util.Properties object Versions { - const val KTOR_VERSION = "2.3.12" // also change 1 plugin - const val COROUTINES_VERSION = "1.9.0" - const val HOPLITE_VERSION = "2.8.0" + const val KTOR_VERSION = "3.1.0" // also change 1 plugin + const val COROUTINES_VERSION = "1.10.1" + const val HOPLITE_VERSION = "2.9.0" } plugins { kotlin("jvm") kotlin("plugin.serialization") - id("io.ktor.plugin") version "2.3.12" // Versions.KTOR_VERSION + id("io.ktor.plugin") version "3.1.0" // Versions.KTOR_VERSION id("org.owasp.dependencycheck") version "9.2.0" id("com.github.jk1.dependency-license-report") version "2.9" id("com.github.ben-manes.versions") @@ -66,7 +66,7 @@ dependencies { implementation("io.ktor:ktor-serialization-kotlinx-json-jvm:${Versions.KTOR_VERSION}") // Date - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Coroutines implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.COROUTINES_VERSION}") @@ -78,10 +78,10 @@ dependencies { implementation("com.sksamuel.hoplite:hoplite-hocon:${Versions.HOPLITE_VERSION}") // Logging - implementation("io.github.oshai:kotlin-logging-jvm:7.0.0") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.4") implementation("org.slf4j:jul-to-slf4j:2.0.16") - implementation("io.klogging:klogging-jvm:0.7.2") - implementation("io.klogging:slf4j-klogging:0.7.2") + implementation("io.klogging:klogging-jvm:0.9.1") + implementation("io.klogging:slf4j-klogging:0.9.1") // Test testImplementation(kotlin("test")) @@ -103,10 +103,10 @@ dependencies { // crypto implementation("com.augustcellars.cose:cose-java:1.1.0") - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") // Multiplatform / Hashes - testImplementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.5.3")) + testImplementation(project.dependencies.platform("org.kotlincrypto.hash:bom:0.6.1")) testImplementation("org.kotlincrypto.hash:sha2") } diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/NewTestOidcMetadata.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/NewTestOidcMetadata.kt index a06b2d74e..1626b8da4 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/NewTestOidcMetadata.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/NewTestOidcMetadata.kt @@ -8,7 +8,7 @@ import io.ktor.serialization.kotlinx.json.* import io.ktor.server.application.* import io.ktor.server.cio.* import io.ktor.server.engine.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.* import io.ktor.server.plugins.contentnegotiation.* import io.ktor.server.response.* import io.ktor.server.routing.* diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/entra/EntraIssuanceApi.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/entra/EntraIssuanceApi.kt index 8bf369459..76a3ca931 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/entra/EntraIssuanceApi.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/entra/EntraIssuanceApi.kt @@ -85,11 +85,11 @@ fun Application.entraIssuance() { body() } }) { - val req = context.receive() + val req = call.receive() val url = EntraIssuanceApi.entraIssuance(req.authorization, req.data) - context.respond(url) + call.respond(url) } } } diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/IssuerApi.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/IssuerApi.kt index 7e0a3efc6..a262f81f1 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/IssuerApi.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/IssuerApi.kt @@ -24,8 +24,6 @@ import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonPrimitive import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive -import redis.clients.jedis.exceptions.JedisAccessControlException -import redis.clients.jedis.exceptions.JedisConnectionException import kotlin.reflect.KClass import kotlin.time.Duration import kotlin.time.Duration.Companion.minutes @@ -40,7 +38,9 @@ suspend fun createCredentialOfferUri( val overwrittenIssuanceRequests = issuanceRequests.map { it.copy( credentialFormat = credentialFormat, - vct = if (credentialFormat == CredentialFormat.sd_jwt_vc) OidcApi.metadata.getVctByCredentialConfigurationId(it.credentialConfigurationId) ?: throw IllegalArgumentException("VCT not found") else null) + vct = if (credentialFormat == CredentialFormat.sd_jwt_vc) OidcApi.metadata.getVctByCredentialConfigurationId(it.credentialConfigurationId) + ?: throw IllegalArgumentException("VCT not found") else null + ) } val issuanceSession = OidcApi.initializeCredentialOffer( @@ -166,7 +166,7 @@ fun Application.issuerApi() { } } }) { - val req = context.receive() + val req = call.receive() val keyConfig = req.key.config?.mapValues { (key, value) -> if (key == "signingKeyPem") { JsonPrimitive(value.jsonPrimitive.content.trimIndent().replace(" ", "")) @@ -200,7 +200,7 @@ fun Application.issuerApi() { } else { serializedKey } - context.respond( + call.respond( HttpStatusCode.OK, IssuerOnboardingResponse(issuanceKey, did) ) } @@ -213,7 +213,7 @@ fun Application.issuerApi() { required = false } - fun PipelineContext.getCallbackUriHeader() = context.request.header("statusCallbackUri") + fun RoutingContext.getCallbackUriHeader() = call.request.header("statusCallbackUri") route("raw") { route("jwt") { @@ -266,15 +266,10 @@ fun Application.issuerApi() { } } }) { - - runCatching { - val body = context.receive() - validateRawSignatureRequest(body) - val signedCredential = executeCredentialSigning(body) - context.respond(HttpStatusCode.OK, signedCredential) - }.onFailure { - throwError(it) - } + val body = call.receive() + validateRawSignatureRequest(body) + val signedCredential = executeCredentialSigning(body) + call.respond(HttpStatusCode.OK, signedCredential) } } } @@ -344,14 +339,14 @@ fun Application.issuerApi() { } } }) { - runCatching { - val jwtIssuanceRequest = context.receive() - val offerUri = createCredentialOfferUri(listOf(jwtIssuanceRequest), getFormatByCredentialConfigurationId(jwtIssuanceRequest.credentialConfigurationId) ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), getCallbackUriHeader()) - context.respond(HttpStatusCode.OK, offerUri) - }.onFailure { - throwError(it) - } - + val jwtIssuanceRequest = call.receive() + val offerUri = createCredentialOfferUri( + listOf(jwtIssuanceRequest), + getFormatByCredentialConfigurationId(jwtIssuanceRequest.credentialConfigurationId) + ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), + getCallbackUriHeader() + ) + call.respond(HttpStatusCode.OK, offerUri) } post("issueBatch", { summary = "Signs a list of credentials and starts an OIDC credential exchange flow." @@ -380,16 +375,15 @@ fun Application.issuerApi() { } } }) { - - - runCatching { - val issuanceRequests = context.receive>() - val offerUri = createCredentialOfferUri(issuanceRequests, getFormatByCredentialConfigurationId(issuanceRequests.first().credentialConfigurationId) ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), getCallbackUriHeader()) - logger.debug { "Offer URI: $offerUri" } - context.respond(HttpStatusCode.OK, offerUri) - }.onFailure { - throwError(it) - } + val issuanceRequests = call.receive>() + val offerUri = createCredentialOfferUri( + issuanceRequests, + getFormatByCredentialConfigurationId(issuanceRequests.first().credentialConfigurationId) + ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), + getCallbackUriHeader() + ) + logger.debug { "Offer URI: $offerUri" } + call.respond(HttpStatusCode.OK, offerUri) } } @@ -407,7 +401,10 @@ fun Application.issuerApi() { example("W3C SD-JWT example", IssuanceExamples.sdJwtW3CExample) example("W3C SD-JWT PDA1 example", IssuanceExamples.sdJwtW3CPDA1Example) example("SD-JWT-VC example", IssuanceExamples.sdJwtVCExample) - example("SD-JWT-VC example featuring selectively disclosable sub and iat claims", IssuanceExamples.sdJwtVCExampleWithSDSub) + example( + "SD-JWT-VC example featuring selectively disclosable sub and iat claims", + IssuanceExamples.sdJwtVCExampleWithSDSub + ) example("SD-JWT-VC example with issuer DID", IssuanceExamples.sdJwtVCWithIssuerDidExample) required = true } @@ -425,20 +422,17 @@ fun Application.issuerApi() { } } }) { - runCatching { - val sdJwtIssuanceRequest = context.receive() - val offerUri = createCredentialOfferUri( - listOf(sdJwtIssuanceRequest), - getFormatByCredentialConfigurationId(sdJwtIssuanceRequest.credentialConfigurationId) ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), - getCallbackUriHeader() - ) + val sdJwtIssuanceRequest = call.receive() + val offerUri = createCredentialOfferUri( + listOf(sdJwtIssuanceRequest), + getFormatByCredentialConfigurationId(sdJwtIssuanceRequest.credentialConfigurationId) + ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), + getCallbackUriHeader() + ) - context.respond( - HttpStatusCode.OK, offerUri - ) - }.onFailure { - throwError(it) - } + call.respond( + HttpStatusCode.OK, offerUri + ) } post("issueBatch", { @@ -468,25 +462,20 @@ fun Application.issuerApi() { } } }) { + val sdJwtIssuanceRequests = call.receive>() + val offerUri = + createCredentialOfferUri( + sdJwtIssuanceRequests, + getFormatByCredentialConfigurationId(sdJwtIssuanceRequests.first().credentialConfigurationId) + ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), + getCallbackUriHeader() + ) + logger.debug { "Offer URI: $offerUri" } - runCatching { - val sdJwtIssuanceRequests = context.receive>() - val offerUri = - createCredentialOfferUri( - sdJwtIssuanceRequests, - getFormatByCredentialConfigurationId(sdJwtIssuanceRequests.first().credentialConfigurationId) ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), - getCallbackUriHeader() - ) - - logger.debug { "Offer URI: $offerUri" } - - context.respond( - HttpStatusCode.OK, offerUri - ) - }.onFailure { - throwError(it) - } + call.respond( + HttpStatusCode.OK, offerUri + ) } } @@ -504,13 +493,15 @@ fun Application.issuerApi() { } } }) { - val mdocIssuanceRequest = context.receive() + val mdocIssuanceRequest = call.receive() val offerUri = createCredentialOfferUri( listOf(mdocIssuanceRequest), - getFormatByCredentialConfigurationId(mdocIssuanceRequest.credentialConfigurationId) ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), - getCallbackUriHeader()) + getFormatByCredentialConfigurationId(mdocIssuanceRequest.credentialConfigurationId) + ?: throw IllegalArgumentException("Invalid Credential Configuration Id"), + getCallbackUriHeader() + ) - context.respond( + call.respond( HttpStatusCode.OK, offerUri ) } @@ -521,24 +512,6 @@ fun Application.issuerApi() { } } -private suspend fun PipelineContext.throwError( - it: Throwable -) { - when (it) { - is JedisConnectionException -> context.respond( - HttpStatusCode.InternalServerError, - "Distributed session management couldn't be initialized : Cannot connect to redis server." - ) - - is JedisAccessControlException -> context.respond( - HttpStatusCode.InternalServerError, - "Distributed session management couldn't be initialized : Cannot access redis server, wrong username/password." - ) - - else -> throw it - } -} - private fun validateRawSignatureRequest(body: JsonObject) { requireNotNull(body["issuerKey"]?.jsonObject) { "Missing issuerKey in the request body." } requireNotNull(body["subjectDid"]?.jsonPrimitive?.content) { "Missing subjectDid in the request body." } diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/OidcApi.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/OidcApi.kt index 20aea5910..235e5eea1 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/OidcApi.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance/OidcApi.kt @@ -435,7 +435,7 @@ object OidcApi : CIProvider() { ) } - context.respond(credentialOffer.toJSON()) + call.respond(credentialOffer.toJSON()) } post("{standardVersion}/credential") { diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance2/NewApiStub.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance2/NewApiStub.kt index 906e3aabb..025f67a1c 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance2/NewApiStub.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/issuance2/NewApiStub.kt @@ -38,7 +38,7 @@ object NewApiStub { } } }) { - val issuanceRequest = context.receive() + val issuanceRequest = call.receive() IssuanceOfferManager.makeOfferFor(issuanceRequest) } } diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/lspPotential/LspPotentialIssuanceInterop.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/lspPotential/LspPotentialIssuanceInterop.kt index 893bec1ed..e9a154fb5 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/lspPotential/LspPotentialIssuanceInterop.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/lspPotential/LspPotentialIssuanceInterop.kt @@ -56,7 +56,7 @@ fun Application.lspPotentialIssuanceTestApi() { val offerUri = LspPotentialIssuanceInterop.createInteropSampleCredentialOfferUrimDL( IssuanceExamples.mDLCredentialIssuanceData ) - context.respond( + call.respond( HttpStatusCode.OK, offerUri ) } @@ -64,7 +64,7 @@ fun Application.lspPotentialIssuanceTestApi() { val offerUri = LspPotentialIssuanceInterop.createInteropSampleCredentialOfferUriSdJwt( IssuanceExamples.sdJwtVCData ) - context.respond( + call.respond( HttpStatusCode.OK, offerUri ) } diff --git a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/web/plugins/Monitoring.kt b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/web/plugins/Monitoring.kt index d78ac1aea..7b8e86aea 100644 --- a/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/web/plugins/Monitoring.kt +++ b/waltid-services/waltid-issuer-api/src/main/kotlin/id/walt/issuer/web/plugins/Monitoring.kt @@ -4,7 +4,8 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.plugins.* import io.ktor.server.plugins.callid.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.CallLogging +import io.ktor.server.plugins.calllogging.processingTimeMillis import io.ktor.server.request.* import org.slf4j.event.Level diff --git a/waltid-services/waltid-service-commons-test/build.gradle.kts b/waltid-services/waltid-service-commons-test/build.gradle.kts index cda32d352..e8e899a28 100644 --- a/waltid-services/waltid-service-commons-test/build.gradle.kts +++ b/waltid-services/waltid-service-commons-test/build.gradle.kts @@ -3,7 +3,7 @@ plugins { kotlin("plugin.serialization") id("maven-publish") - id("com.github.ben-manes.versions") version "0.52.0" + id("com.github.ben-manes.versions") } group = "id.walt" @@ -14,7 +14,7 @@ repositories { } object Versions { - const val KTOR_VERSION = "2.3.12" // also change 1 plugin + const val KTOR_VERSION = "3.1.0" // also change 1 plugin } dependencies { @@ -23,7 +23,7 @@ dependencies { // Testing api(kotlin("test")) api("io.ktor:ktor-server-test-host:${Versions.KTOR_VERSION}") - api("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + api("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") implementation("io.ktor:ktor-client-okhttp-jvm:${Versions.KTOR_VERSION}") implementation("io.ktor:ktor-client-content-negotiation:${Versions.KTOR_VERSION}") diff --git a/waltid-services/waltid-service-commons/build.gradle.kts b/waltid-services/waltid-service-commons/build.gradle.kts index 0aa13b78a..e540b5388 100644 --- a/waltid-services/waltid-service-commons/build.gradle.kts +++ b/waltid-services/waltid-service-commons/build.gradle.kts @@ -3,7 +3,7 @@ plugins { kotlin("plugin.serialization") id("maven-publish") - id("com.github.ben-manes.versions") version "0.52.0" + id("com.github.ben-manes.versions") } group = "id.walt" @@ -14,7 +14,7 @@ repositories { } object Versions { - const val KTOR_VERSION = "2.3.12" // also change 1 plugin + const val KTOR_VERSION = "3.1.0" // also change 1 plugin } dependencies { @@ -30,40 +30,40 @@ dependencies { implementation("io.ktor:ktor-client-okhttp-jvm:${Versions.KTOR_VERSION}") // Logging - api("io.klogging:klogging-jvm:0.7.2") // JVM + ~JS - implementation("io.klogging:slf4j-klogging:0.7.2") + api("io.klogging:klogging-jvm:0.9.1") // JVM + ~JS + implementation("io.klogging:slf4j-klogging:0.9.1") implementation("org.slf4j:jul-to-slf4j:2.0.16") // CLI - api("com.github.ajalt.clikt:clikt:5.0.1") // JVM + api("com.github.ajalt.clikt:clikt:5.0.3") // JVM // Config - api("com.sksamuel.hoplite:hoplite-core:2.8.2") - api("com.sksamuel.hoplite:hoplite-hocon:2.8.2") - api("com.sksamuel.hoplite:hoplite-hikaricp:2.8.2") + api("com.sksamuel.hoplite:hoplite-core:2.9.0") + api("com.sksamuel.hoplite:hoplite-hocon:2.9.0") + api("com.sksamuel.hoplite:hoplite-hikaricp:2.9.0") // Kotlinx.serialization - api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Health checks - api("com.sksamuel.cohort:cohort-ktor:2.5.1") + api("com.sksamuel.cohort:cohort-ktor:2.6.1") // OpenAPI - api("io.github.smiley4:ktor-swagger-ui:3.5.1") - implementation("io.github.smiley4:schema-kenerator-core:1.4.1") + api("io.github.smiley4:ktor-swagger-ui:4.1.6") + /*implementation("io.github.smiley4:schema-kenerator-core:1.4.1") implementation("io.github.smiley4:schema-kenerator-serialization:1.4.1") implementation("io.github.smiley4:schema-kenerator-reflection:1.4.1") - implementation("io.github.smiley4:schema-kenerator-swagger:1.4.1") + implementation("io.github.smiley4:schema-kenerator-swagger:1.4.1")*/ // Persistence - api("io.github.reactivecircus.cache4k:cache4k:0.13.0") - api("app.softwork:kotlinx-uuid-core:0.1.2") + api("io.github.reactivecircus.cache4k:cache4k:0.14.0") + api("app.softwork:kotlinx-uuid-core:0.1.4") api("redis.clients:jedis:5.2.0") // Testing testApi(kotlin("test")) - testApi("io.ktor:ktor-server-test-host:2.3.12") - testApi("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + testApi("io.ktor:ktor-server-test-host:3.1.0") + testApi("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } tasks.test { diff --git a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/logging/setups/TraceLoggingSetup.kt b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/logging/setups/TraceLoggingSetup.kt index 91ae6efe8..0a88ab1b5 100644 --- a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/logging/setups/TraceLoggingSetup.kt +++ b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/logging/setups/TraceLoggingSetup.kt @@ -16,7 +16,7 @@ data object TraceLoggingSetup : LoggingSetup("trace", { } } logging { - fromLoggerBase("io.ktor.routing.Routing", stopOnMatch = true) + fromLoggerBase("io.ktor", stopOnMatch = true) fromMinLevel(Level.DEBUG) { toSink("stdout") } diff --git a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/FeatureFlagInformationModule.kt b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/FeatureFlagInformationModule.kt index fa39e86f7..418b52596 100644 --- a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/FeatureFlagInformationModule.kt +++ b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/FeatureFlagInformationModule.kt @@ -39,7 +39,7 @@ object FeatureFlagInformationModule { } } }) { - context.respond(FeatureManager.registeredFeatures.mapValues { it.value.description }) + call.respond(FeatureManager.registeredFeatures.mapValues { it.value.description }) } get("state", { summary = "Show state of features" @@ -57,7 +57,7 @@ object FeatureFlagInformationModule { val defaulted = registered.keys.subtract(enabled.keys).subtract(disabled.keys) .associateWith { registered[it]!!.description } - context.respond( + call.respond( FeatureFlagInformations( enabled = FeatureFlagInformation(enabled), disabled = FeatureFlagInformation(disabled), diff --git a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/OpenApiModule.kt b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/OpenApiModule.kt index 04e7f57c3..14d70ccc7 100644 --- a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/OpenApiModule.kt +++ b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/OpenApiModule.kt @@ -9,13 +9,13 @@ import io.github.smiley4.ktorswaggerui.dsl.config.PluginConfigDsl import io.github.smiley4.ktorswaggerui.dsl.routing.get import io.github.smiley4.ktorswaggerui.routing.openApiSpec import io.github.smiley4.ktorswaggerui.routing.swaggerUI -import io.github.smiley4.schemakenerator.core.connectSubTypes +/*import io.github.smiley4.schemakenerator.core.connectSubTypes import io.github.smiley4.schemakenerator.core.handleNameAnnotation import io.github.smiley4.schemakenerator.reflection.collectSubTypes import io.github.smiley4.schemakenerator.reflection.processReflection import io.github.smiley4.schemakenerator.serialization.processKotlinxSerialization import io.github.smiley4.schemakenerator.swagger.* -import io.github.smiley4.schemakenerator.swagger.data.TitleType +import io.github.smiley4.schemakenerator.swagger.data.TitleType*/ import io.klogging.noCoLogger import io.ktor.server.application.* import io.ktor.server.response.* @@ -39,7 +39,7 @@ object OpenApiModule { var custom: (PluginConfigDsl.() -> Unit)? = null } - private fun KType.processWithKotlinxSerializationGenerator() = processKotlinxSerialization() + /* private fun KType.processWithKotlinxSerializationGenerator() = processKotlinxSerialization() .connectSubTypes() .handleNameAnnotation() .generateSwaggerSchema() @@ -55,7 +55,7 @@ object OpenApiModule { .generateSwaggerSchema() .handleCoreAnnotations() .withTitle(TitleType.SIMPLE) - .compileReferencingRoot() + .compileReferencingRoot()*/ // Module fun Application.enable() { @@ -83,7 +83,7 @@ object OpenApiModule { schemas { val kotlinxPrefixes = listOf("id.walt") - generator = { type -> + /*generator = { type -> if (kotlinxPrefixes.any { type.toString().startsWith(it) }) { runCatching { @@ -96,7 +96,7 @@ object OpenApiModule { error("Could neither parse with kotlinx nor reflection: $type, due to $ex") } } else type.processWithReflectionGenerator() - } + }*/ } info { @@ -151,7 +151,7 @@ object OpenApiModule { get("/", { summary = "Redirect to swagger interface for API documentation" }) { - context.respondRedirect("swagger") + call.respondRedirect("swagger") } } } diff --git a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/ServiceHealthchecksDebugModule.kt b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/ServiceHealthchecksDebugModule.kt index 2145513b0..9d8051bde 100644 --- a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/ServiceHealthchecksDebugModule.kt +++ b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/modules/ServiceHealthchecksDebugModule.kt @@ -109,7 +109,7 @@ object ServiceHealthChecksDebugModule { if (debugConfig.ram) get("ram") { val rt = Runtime.getRuntime() val memory = ManagementFactory.getMemoryMXBean() - context.respond(buildJsonObject { + call.respond(buildJsonObject { put("free", rt.freeMemory()) put("max", rt.maxMemory()) put("total", rt.totalMemory()) @@ -122,7 +122,7 @@ object ServiceHealthChecksDebugModule { if (debugConfig.cpu) get("cpu") { val thread = ManagementFactory.getThreadMXBean() - context.respond(buildJsonObject { + call.respond(buildJsonObject { put("loadAverage", ManagementFactory.getOperatingSystemMXBean().systemLoadAverage) put("processors", ManagementFactory.getOperatingSystemMXBean().availableProcessors) put("threadCount", JsonPrimitive(thread.threadCount)) @@ -132,7 +132,7 @@ object ServiceHealthChecksDebugModule { } if (debugConfig.memoryPool) get("memoryPool") { - context.respond(buildJsonObject { + call.respond(buildJsonObject { ManagementFactory.getMemoryPoolMXBeans().forEach { putJsonObject(it.name) { put("type", JsonPrimitive(it.type.name)) diff --git a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/plugins/StatusPages.kt b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/plugins/StatusPages.kt index 3ef15ff12..80c3f312d 100644 --- a/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/plugins/StatusPages.kt +++ b/waltid-services/waltid-service-commons/src/main/kotlin/id/walt/commons/web/plugins/StatusPages.kt @@ -10,6 +10,7 @@ import io.ktor.server.response.* import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonPrimitive import kotlinx.serialization.json.encodeToJsonElement +import redis.clients.jedis.exceptions.JedisException import kotlin.reflect.jvm.jvmName @@ -35,6 +36,7 @@ private fun statusCodeForException(cause: Throwable) = when (cause) { is IllegalArgumentException -> HttpStatusCode.BadRequest is BadRequestException -> HttpStatusCode.BadRequest is IllegalStateException -> HttpStatusCode.InternalServerError + is JedisException -> HttpStatusCode.InternalServerError is WebException -> cause.status else -> HttpStatusCode.InternalServerError } diff --git a/waltid-services/waltid-verifier-api/build.gradle.kts b/waltid-services/waltid-verifier-api/build.gradle.kts index ce31baf11..7047f1ecf 100644 --- a/waltid-services/waltid-verifier-api/build.gradle.kts +++ b/waltid-services/waltid-verifier-api/build.gradle.kts @@ -3,17 +3,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.util.Properties object Versions { - const val KTOR_VERSION = "2.3.12" // also change 1 plugin - const val COROUTINES_VERSION = "1.9.0" - const val EXPOSED_VERSION = "0.43.0" - const val HOPLITE_VERSION = "2.8.0" + const val KTOR_VERSION = "3.1.0" // also change 1 plugin + const val COROUTINES_VERSION = "1.10.1" + const val HOPLITE_VERSION = "2.9.0" } plugins { kotlin("jvm") kotlin("plugin.serialization") - id("io.ktor.plugin") version "2.3.12" // Versions.KTOR_VERSION + id("io.ktor.plugin") version "3.1.0" // Versions.KTOR_VERSION id("org.owasp.dependencycheck") version "9.2.0" id("com.github.jk1.dependency-license-report") version "2.9" id("com.github.ben-manes.versions") @@ -66,13 +65,13 @@ dependencies { implementation("io.ktor:ktor-serialization-kotlinx-json-jvm:${Versions.KTOR_VERSION}") // Date - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Coroutines implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.COROUTINES_VERSION}") // Uuid - implementation("app.softwork:kotlinx-uuid-core:0.1.2") + implementation("app.softwork:kotlinx-uuid-core:0.1.4") /* -- Misc --*/ @@ -81,16 +80,16 @@ dependencies { implementation("com.sksamuel.hoplite:hoplite-hocon:${Versions.HOPLITE_VERSION}") // Logging - implementation("io.github.oshai:kotlin-logging-jvm:7.0.0") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.4") implementation("org.slf4j:jul-to-slf4j:2.0.16") - implementation("io.klogging:klogging-jvm:0.7.2") - implementation("io.klogging:slf4j-klogging:0.7.2") + implementation("io.klogging:klogging-jvm:0.9.1") + implementation("io.klogging:slf4j-klogging:0.9.1") implementation("io.ktor:ktor-client-okhttp-jvm:${Versions.KTOR_VERSION}") // Crypto implementation("com.augustcellars.cose:cose-java:1.1.0") - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") // Test testImplementation(kotlin("test")) diff --git a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApi.kt b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApi.kt index 5df49c4cc..0f071c4ed 100644 --- a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApi.kt +++ b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApi.kt @@ -17,6 +17,7 @@ import id.walt.verifier.config.OIDCVerifierServiceConfig import id.walt.verifier.oidc.RequestSigningCryptoProvider import id.walt.verifier.oidc.SwaggerPresentationSessionInfo import id.walt.verifier.oidc.VerificationUseCase +import id.walt.verifier.oidc.VerificationUseCase.FailedVerificationException import io.github.smiley4.ktorswaggerui.dsl.routing.get import io.github.smiley4.ktorswaggerui.dsl.routing.post import io.github.smiley4.ktorswaggerui.dsl.routing.route @@ -30,14 +31,14 @@ import io.ktor.server.application.* import io.ktor.server.plugins.* import io.ktor.server.request.* import io.ktor.server.response.* +import io.ktor.server.response.respond +import io.ktor.server.response.respondRedirect import io.ktor.server.routing.* import io.ktor.server.util.* import io.ktor.util.* -import io.ktor.util.pipeline.* import kotlinx.coroutines.runBlocking import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.* import kotlin.uuid.ExperimentalUuidApi import kotlin.uuid.Uuid @@ -215,18 +216,18 @@ fun Application.verifierApi() { }) { - val authorizeBaseUrl = context.request.header("authorizeBaseUrl") ?: defaultAuthorizeBaseUrl + val authorizeBaseUrl = call.request.header("authorizeBaseUrl") ?: defaultAuthorizeBaseUrl val responseMode = - context.request.header("responseMode")?.let { ResponseMode.fromString(it) } + call.request.header("responseMode")?.let { ResponseMode.fromString(it) } ?: ResponseMode.direct_post - val successRedirectUri = context.request.header("successRedirectUri") - val errorRedirectUri = context.request.header("errorRedirectUri") - val statusCallbackUri = context.request.header("statusCallbackUri") - val statusCallbackApiKey = context.request.header("statusCallbackApiKey") - val stateId = context.request.header("stateId") - val openId4VPProfile = context.request.header("openId4VPProfile") + val successRedirectUri = call.request.header("successRedirectUri") + val errorRedirectUri = call.request.header("errorRedirectUri") + val statusCallbackUri = call.request.header("statusCallbackUri") + val statusCallbackApiKey = call.request.header("statusCallbackApiKey") + val stateId = call.request.header("stateId") + val openId4VPProfile = call.request.header("openId4VPProfile") - val body = context.receive() + val body = call.receive() val session = verificationUseCase.createSession( vpPoliciesJson = body["vp_policies"], @@ -245,7 +246,7 @@ fun Application.verifierApi() { trustedRootCAs = body["trusted_root_cas"]?.jsonArray ) - context.respond( + call.respond( authorizeBaseUrl.plus("?").plus( when (session.openId4VPProfile) { OpenId4VPProfile.ISO_18013_7_MDOC -> session.authorizationRequest!!.toRequestObjectByReferenceHttpQueryString( @@ -294,11 +295,43 @@ fun Application.verifierApi() { logger.info { "POST verify/state" } val sessionId = call.parameters.getOrFail("state") logger.info { "State: $sessionId" } - verificationUseCase.verify(sessionId, context.request.call.receiveParameters().toMap()) + verificationUseCase.verify(sessionId, call.request.call.receiveParameters().toMap()) .onSuccess { - processVerificationSuccessResult(sessionId, it) + val session = verificationUseCase.getSession(sessionId!!) + if (session.walletInitiatedAuthState != null) { + val state = session.walletInitiatedAuthState + val code = Uuid.random().toString() + call.respondRedirect("openid://?code=$code&state=$state") + } else { + call.respond(HttpStatusCode.OK, it) + } }.onFailure { - processVerificationFailureResult(sessionId, it) + runBlocking { logger.debug(it) { "Verification failed ($it)" } } + val errorDescription = it.message ?: "Verification failed" + runBlocking { logger.error { "Error: $errorDescription" } } + if (sessionId != null) { + val session = verificationUseCase.getSession(sessionId) + if (session.walletInitiatedAuthState != null) { + val state = session.walletInitiatedAuthState + runBlocking { + this@post.call.respondRedirect( + "openid://?state=$state&error=invalid_request&error_description=${getErrorDescription(it)}" + ) + } + } else if (it is FailedVerificationException && it.redirectUrl != null) { + runBlocking { + this@post.call.respond(HttpStatusCode.BadRequest, it.redirectUrl) + } + + } else { + throw it + } + } else { + runBlocking { + logger.error(it) { "/verify error: $errorDescription" } + this@post.call.respond(HttpStatusCode.BadRequest, errorDescription) + } + } }.also { verificationUseCase.notifySubscribers(sessionId) } @@ -464,7 +497,7 @@ fun Application.verifierApi() { }, openId4VPProfile = OpenId4VPProfile.EBSIV3 ) - context.respondRedirect( + call.respondRedirect( "openid://?${ session.authorizationRequest!!.toEbsiRequestObjectByReferenceHttpQueryString( SERVER_URL.let { "$it/openid4vc/request/${session.id}" }) @@ -486,56 +519,3 @@ private fun getErrorDescription(it: Throwable): String? = when (it.message) { else -> null } - -private fun PipelineContext.processError( - sessionId: String, - error: Throwable -) { - val session = verificationUseCase.getSession(sessionId) - if (session.walletInitiatedAuthState != null) { - val state = session.walletInitiatedAuthState - runBlocking { - context.respondRedirect( - "openid://?state=$state&error=invalid_request&error_description=${getErrorDescription(error)}" - ) - } - } else if (error is VerificationUseCase.FailedVerificationException && error.redirectUrl != null) { - runBlocking { - context.respond(HttpStatusCode.BadRequest, error.redirectUrl) - } - - } else { - throw error - } -} - -private fun PipelineContext.processVerificationFailureResult( - sessionId: String?, - error: Throwable, -) { - runBlocking { logger.debug(error) { "Verification failed ($error)" } } - val errorDescription = error.message ?: "Verification failed" - runBlocking { logger.error { "Error: $errorDescription" } } - if (sessionId != null) { - processError(sessionId, error) - } else { - runBlocking { - logger.error(error) { "/verify error: $errorDescription" } - call.respond(HttpStatusCode.BadRequest, errorDescription) - } - } -} - -private suspend fun PipelineContext.processVerificationSuccessResult( - sessionId: String?, - redirectUrl: String, -) { - val session = verificationUseCase.getSession(sessionId!!) - if (session.walletInitiatedAuthState != null) { - val state = session.walletInitiatedAuthState - val code = Uuid.random().toString() - context.respondRedirect("openid://?code=$code&state=$state") - } else { - call.respond(HttpStatusCode.OK, redirectUrl) - } -} diff --git a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/entra/EntraVerifierApi.kt b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/entra/EntraVerifierApi.kt index a4c925fdc..71273a370 100644 --- a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/entra/EntraVerifierApi.kt +++ b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/entra/EntraVerifierApi.kt @@ -204,26 +204,26 @@ fun Application.entraVerifierApi() { request { body() } response { HttpStatusCode.OK to { body() } } }) { - val verifyRequest = context.receive() + val verifyRequest = call.receive() val res = EntraVerifierApi.createPresentationRequest(verifyRequest.entraVerification, verifyRequest.data) - context.respond(res.getOrThrow()) + call.respond(res.getOrThrow()) } post("verification-callback/{nonce}", { tags = listOf("Entra") }) { - val nonce = context.parameters["nonce"]?.let { Uuid.parse(it) } + val nonce = call.parameters["nonce"]?.let { Uuid.parse(it) } println("--- ENTRA CALLBACK ---") - println("Nonce: " + context.parameters["nonce"]) - println("Headers: " + context.request.headers) - //println("Body: " + context.receiveText()) - println("URL: " + context.url()) + println("Nonce: " + call.parameters["nonce"]) + println("Headers: " + call.request.headers) + //println("Body: " + call.receiveText()) + println("URL: " + call.url()) require(EntraVerifierApi.callbackMapping.containsKey(nonce)) { "Invalid nonce: $nonce" } - val body = context.receiveText() + val body = call.receiveText() println("Response: $body") val response = Json.decodeFromString(body) @@ -241,7 +241,7 @@ fun Application.entraVerifierApi() { EntraVerifierApi.policyStatusMapping[nonce!!] = result } - context.respond(HttpStatusCode.OK) + call.respond(HttpStatusCode.OK) } get("status/{nonce}", { @@ -249,7 +249,7 @@ fun Application.entraVerifierApi() { request { pathParameter("nonce") } response { HttpStatusCode.OK to { body() } } }) { - val nonce = context.parameters["nonce"]?.let { Uuid.parse(it) } + val nonce = call.parameters["nonce"]?.let { Uuid.parse(it) } val result = EntraVerifierApi.policyStatusMapping[nonce] @@ -270,8 +270,8 @@ fun Application.entraVerifierApi() { } } - context.respond(output) - } else context.respond(HttpStatusCode.NotFound) + call.respond(output) + } else call.respond(HttpStatusCode.NotFound) } } } diff --git a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/lspPotential/LspPotentialVerificationInterop.kt b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/lspPotential/LspPotentialVerificationInterop.kt index 1c5fed7f4..51ee51ba2 100644 --- a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/lspPotential/LspPotentialVerificationInterop.kt +++ b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/lspPotential/LspPotentialVerificationInterop.kt @@ -108,7 +108,7 @@ fun Application.lspPotentialVerificationTestApi() { } } }) { - val deviceJwk = context.request.call.receiveParameters().toMap()["jwk"] + val deviceJwk = call.request.call.receiveParameters().toMap()["jwk"] val devicePubKey = JWK.parse(deviceJwk!!.first()).toECKey().toPublicKey() val mdoc = MDocBuilder(MDocTypes.ISO_MDL) @@ -145,7 +145,7 @@ fun Application.lspPotentialVerificationTestApi() { } } }) { - val holderJwk = context.request.call.receiveParameters().toMap().get("jwk")!!.first() + val holderJwk = call.request.call.receiveParameters().toMap().get("jwk")!!.first() val sdJwtVc = SDJwtVC.sign( SDPayload.Companion.createSDPayload(buildJsonObject { diff --git a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/web/plugins/Monitoring.kt b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/web/plugins/Monitoring.kt index 25703b929..9a1b16ff5 100644 --- a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/web/plugins/Monitoring.kt +++ b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/web/plugins/Monitoring.kt @@ -3,7 +3,7 @@ package id.walt.verifier.web.plugins import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.plugins.callid.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.CallLogging import io.ktor.server.request.* import org.slf4j.event.Level diff --git a/waltid-services/waltid-wallet-api/build.gradle.kts b/waltid-services/waltid-wallet-api/build.gradle.kts index ce0df445e..121e0e1c4 100644 --- a/waltid-services/waltid-wallet-api/build.gradle.kts +++ b/waltid-services/waltid-wallet-api/build.gradle.kts @@ -4,7 +4,7 @@ import java.util.Properties plugins { kotlin("jvm") - id("io.ktor.plugin") version "2.3.12" + id("io.ktor.plugin") version "3.1.0" kotlin("plugin.serialization") id("com.github.ben-manes.versions") } @@ -64,7 +64,7 @@ dependencies { /* -- KTOR -- */ - val ktor_version = "2.3.12" + val ktor_version = "3.1.0" // Ktor server implementation("io.ktor:ktor-server-core-jvm:$ktor_version") implementation("io.ktor:ktor-server-auth-jvm:$ktor_version") @@ -96,22 +96,22 @@ dependencies { /* -- Kotlin -- */ // Kotlinx.serialization - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") // Date - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") // Uuid - implementation("app.softwork:kotlinx-uuid-core:0.1.2") + implementation("app.softwork:kotlinx-uuid-core:0.1.4") //implementation("app.softwork:kotlinx-uuid-exposed:0.1.2") /* -- Security -- */ // Bouncy Castle - implementation("org.bouncycastle:bcprov-lts8on:2.73.6") - implementation("org.bouncycastle:bcpkix-lts8on:2.73.6") + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") // Argon2 implementation("de.mkammerer:argon2-jvm:2.11") @@ -139,7 +139,7 @@ dependencies { testImplementation(project(":waltid-services:waltid-issuer-api")) testImplementation(project(":waltid-services:waltid-verifier-api")) - implementation("com.nimbusds:nimbus-jose-jwt:9.41.1") + implementation("com.nimbusds:nimbus-jose-jwt:10.0.1") implementation("com.augustcellars.cose:cose-java:1.1.0") implementation("io.ktor:ktor-client-java:$ktor_version") @@ -147,23 +147,23 @@ dependencies { /* -- Misc --*/ // Cache - implementation("io.github.reactivecircus.cache4k:cache4k:0.13.0") + implementation("io.github.reactivecircus.cache4k:cache4k:0.14.0") // Webauthn - implementation("com.webauthn4j:webauthn4j-core:0.26.0.RELEASE") { + /*implementation("com.webauthn4j:webauthn4j-core:0.28.5.RELEASE") { exclude("ch.qos.logback") - } + }*/ // Not implemented right now // DB - implementation("org.jetbrains.exposed:exposed-core:0.54.0") - implementation("org.jetbrains.exposed:exposed-jdbc:0.54.0") - implementation("org.jetbrains.exposed:exposed-dao:0.54.0") - implementation("org.jetbrains.exposed:exposed-java-time:0.54.0") - implementation("org.jetbrains.exposed:exposed-json:0.54.0") + implementation("org.jetbrains.exposed:exposed-core:0.59.0") + implementation("org.jetbrains.exposed:exposed-jdbc:0.59.0") + implementation("org.jetbrains.exposed:exposed-dao:0.59.0") + implementation("org.jetbrains.exposed:exposed-java-time:0.59.0") + implementation("org.jetbrains.exposed:exposed-json:0.59.0") // drivers - implementation("org.xerial:sqlite-jdbc:3.46.1.0") - implementation("org.postgresql:postgresql:42.7.4") - implementation("com.mysql:mysql-connector-j:9.0.0") + implementation("org.xerial:sqlite-jdbc:3.49.0.0") + implementation("org.postgresql:postgresql:42.7.5") + implementation("com.mysql:mysql-connector-j:9.2.0") implementation("com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre11") // Web push @@ -175,20 +175,20 @@ dependencies { implementation("com.sksamuel.hoplite:hoplite-hocon:2.8.0") implementation("com.sksamuel.hoplite:hoplite-yaml:2.8.0") implementation("com.sksamuel.hoplite:hoplite-hikaricp:2.8.0") - implementation("com.zaxxer:HikariCP:5.1.0") + implementation("com.zaxxer:HikariCP:6.2.1") // Logging - implementation("io.github.oshai:kotlin-logging-jvm:7.0.0") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.4") implementation("org.slf4j:jul-to-slf4j:2.0.16") - implementation("io.klogging:klogging-jvm:0.7.2") - implementation("io.klogging:slf4j-klogging:0.7.2") + implementation("io.klogging:klogging-jvm:0.9.1") + implementation("io.klogging:slf4j-klogging:0.9.1") // Test testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4") testImplementation("org.junit.jupiter:junit-jupiter-params:5.11.4") testImplementation(kotlin("test")) - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") - testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") + testImplementation("io.ktor:ktor-server-test-host:$ktor_version") testImplementation("io.mockk:mockk:1.13.16") - testImplementation("io.klogging:klogging-jvm:0.7.2") + testImplementation("io.klogging:klogging-jvm:0.9.1") } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/FeatureCatalog.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/FeatureCatalog.kt index 7002393fb..8a7e4203c 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/FeatureCatalog.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/FeatureCatalog.kt @@ -12,7 +12,8 @@ object FeatureCatalog : ServiceFeatureCatalog { val devModeFeature = OptionalFeature("dev-mode", "Development mode", default = false) val legacyAuthenticationFeature = OptionalFeature("auth", "Legacy authentication system", AuthConfig::class, true) - val ktorAuthnzAuthenticationFeature = OptionalFeature("ktor-authnz", "waltid-ktor-authnz authentication system", KtorAuthnzConfig::class, false) + val ktorAuthnzAuthenticationFeature = + OptionalFeature("ktor-authnz", "waltid-ktor-authnz authentication system", KtorAuthnzConfig::class, false) // val loginsMethodFeature = BaseFeature("logins", "Logins method management", LoginMethodsConfig::class) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/Db.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/Db.kt index ff292462f..6759bda90 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/Db.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/Db.kt @@ -94,7 +94,7 @@ object Db { val accountResult = AccountsService.register(request = EmailAccountRequest("Max Mustermann", "user@email.com", "password")) val accountId = accountResult.getOrNull()?.id!! val walletResult = AccountsService.getAccountWalletMappings("", accountId) - val walletId = walletResult.wallets[0].id + walletResult.wallets[0].id /*CredentialsService().add( wallet = walletId, diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/KotlinxUUIDTable.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/KotlinxUUIDTable.kt index 0af2d8067..71b690f2d 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/KotlinxUUIDTable.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/KotlinxUUIDTable.kt @@ -3,8 +3,9 @@ package id.walt.webwallet.db import app.softwork.uuid.isValidUuidString -import org.jetbrains.exposed.dao.id.* -import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.sql.ColumnType +import org.jetbrains.exposed.sql.Table import org.jetbrains.exposed.sql.vendors.currentDialect import java.nio.ByteBuffer import kotlin.uuid.ExperimentalUuidApi @@ -36,7 +37,7 @@ import kotlin.uuid.toKotlinUuid * Creates a binary column, with the specified [name], for storing Uuids. * Unlike the [Table.uuid] function, this one registers [kotlinx.uuid.Uuid] type instead of [java.util.Uuid]. **/ -public fun Table.kotlinxUuid(name: String): Column { +fun Table.kotlinxUuid(name: String): Column { return registerColumn(name, UuidColumnType()) } @@ -55,7 +56,7 @@ fun Table.typedUUID(name: String, factory: UUIDTypeFactory): Colum * Remember that using a [SecureRandom] may require to seed the system random source * otherwise a system may get stuck. **/ -public fun Column.autoGenerate(): Column = apply { +fun Column.autoGenerate(): Column = apply { defaultValueFun = { Uuid.random() } } @@ -63,7 +64,7 @@ public fun Column.autoGenerate(): Column = apply { * A [Uuid] column type for registering in exposed tables. * @see kotlinxUuid to see how it is used */ -public class UuidColumnType : ColumnType() { +class UuidColumnType : ColumnType() { override fun sqlType(): String = currentDialect.dataTypeProvider.uuidType() override fun valueFromDB(value: Any): Uuid = when { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WalletCredentials.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WalletCredentials.kt index 7fea28dda..54ccac905 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WalletCredentials.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WalletCredentials.kt @@ -61,11 +61,12 @@ data class WalletCredential @OptIn(ExperimentalUuidApi::class) constructor( companion object { fun parseDocument(document: String, id: String, format: CredentialFormat) = runCatching { - when(format) { + when (format) { CredentialFormat.ldp_vc -> Json.parseToJsonElement(document).jsonObject CredentialFormat.jwt_vc, CredentialFormat.sd_jwt_vc, CredentialFormat.jwt_vc_json, CredentialFormat.jwt_vc_json_ld -> document.decodeJws().payload .run { jsonObject["vc"]?.jsonObject ?: jsonObject } + CredentialFormat.mso_mdoc -> MDoc.fromCBORHex(document).toMapElement().toJsonElement().jsonObject else -> throw IllegalArgumentException("Unknown credential format") }?.toMutableMap().also { @@ -97,9 +98,10 @@ data class WalletCredential @OptIn(ExperimentalUuidApi::class) constructor( manifest?.let { JsonUtils.tryGetData(it, "display.card.issuedBy")?.jsonPrimitive?.content } fun parseFullDocument(document: String, disclosures: String?, id: String, format: CredentialFormat) = kotlin.runCatching { - when(format) { + when (format) { CredentialFormat.jwt_vc, CredentialFormat.sd_jwt_vc, CredentialFormat.jwt_vc_json, CredentialFormat.jwt_vc_json_ld -> SDJwt.parse(document + (disclosures?.let { "~$it" } ?: "")).fullPayload + else -> parseDocument(document, id, format) } }.onFailure { it.printStackTrace() } @@ -116,6 +118,7 @@ data class WalletCredential @OptIn(ExperimentalUuidApi::class) constructor( manifest = result[WalletCredentials.manifest], deletedOn = result[WalletCredentials.deletedOn]?.toKotlinInstant(), pending = result[WalletCredentials.pending], - format = CredentialFormat.fromValue(result[WalletCredentials.format]) ?: throw IllegalArgumentException("Credential format couldn't be decoded") + format = CredentialFormat.fromValue(result[WalletCredentials.format]) + ?: throw IllegalArgumentException("Credential format couldn't be decoded") ) } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WallletNotifications.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WallletNotifications.kt index f80b6350e..4365ee439 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WallletNotifications.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/db/models/WallletNotifications.kt @@ -4,7 +4,6 @@ import id.walt.webwallet.db.kotlinxUuid import kotlinx.datetime.Instant import kotlinx.datetime.toKotlinInstant import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.decodeFromJsonElement diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/SSIKit2WalletService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/SSIKit2WalletService.kt index f38f4e94b..b0630df0e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/SSIKit2WalletService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/SSIKit2WalletService.kt @@ -69,7 +69,6 @@ import kotlinx.coroutines.runBlocking import kotlinx.datetime.Clock import kotlinx.datetime.toJavaInstant import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.* import org.jetbrains.exposed.sql.insert import org.jetbrains.exposed.sql.selectAll diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/WalletServiceManager.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/WalletServiceManager.kt index 1d21fde3b..9492bdbb5 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/WalletServiceManager.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/WalletServiceManager.kt @@ -227,14 +227,17 @@ object WalletServiceManager { it[Wallets.id].value.toKotlinUuid() } - suspend fun matchCredentialsForPresentationDefinition(walletId: Uuid, presentationDefinition: PresentationDefinition): List { + suspend fun matchCredentialsForPresentationDefinition( + walletId: Uuid, + presentationDefinition: PresentationDefinition + ): List { val pd = Json.decodeFromJsonElement(presentationDefinition.toJSON()) val matches = credentialService.list(walletId, CredentialFilterObject.default).filter { cred -> val fullDoc = WalletCredential.parseFullDocument(cred.document, cred.disclosures, cred.id, cred.format) fullDoc != null && - pd.inputDescriptors.any { inputDesc -> - PresentationDefinitionParser.matchCredentialsForInputDescriptor(flowOf(fullDoc), inputDesc).toList().isNotEmpty() - } + pd.inputDescriptors.any { inputDesc -> + PresentationDefinitionParser.matchCredentialsForInputDescriptor(flowOf(fullDoc), inputDesc).toList().isNotEmpty() + } } return matches } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/authnz/AuthenticationService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/authnz/AuthenticationService.kt index 1b6c2134b..0f4b5e025 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/authnz/AuthenticationService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/authnz/AuthenticationService.kt @@ -13,7 +13,7 @@ import kotlinx.coroutines.withContext import org.jetbrains.exposed.sql.insert import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.transactions.transaction -import java.util.* +import java.util.UUID import kotlin.uuid.ExperimentalUuidApi @OptIn(ExperimentalUuidApi::class) @@ -26,8 +26,8 @@ class AuthenticationService(private val dispatcher: CoroutineDispatcher = Dispat ): Unit = withContext(dispatcher) { transaction { AuthnzAccountIdentifiers.insert { - it[AuthnzAccountIdentifiers.userId] = UUID.fromString(accountId) - it[AuthnzAccountIdentifiers.identifier] = newAccountIdentifier.accountIdentifierName + it[userId] = UUID.fromString(accountId) + it[identifier] = newAccountIdentifier.accountIdentifierName //it[AuthnzAccountIdentifiers.method] = } Unit // Explicitly return Unit @@ -46,9 +46,9 @@ class AuthenticationService(private val dispatcher: CoroutineDispatcher = Dispat val savableStoredData = data.transformSavable() transaction { val userId = AuthnzAccountIdentifiers - .select(AuthnzAccountIdentifiers.userId) + .select(userId) .where { AuthnzAccountIdentifiers.identifier eq accountIdentifier.accountIdentifierName } - .singleOrNull()?.get(AuthnzAccountIdentifiers.userId) + .singleOrNull()?.get(userId) ?: throw IllegalStateException("Account not found") AuthnzStoredData.insert { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/x5c/X5CAccountStrategy.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/x5c/X5CAccountStrategy.kt index 6966dbd26..d1e0030f8 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/x5c/X5CAccountStrategy.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/account/x5c/X5CAccountStrategy.kt @@ -20,7 +20,6 @@ import org.jetbrains.exposed.sql.insert import org.jetbrains.exposed.sql.transactions.transaction import kotlin.uuid.ExperimentalUuidApi import kotlin.uuid.Uuid -import kotlin.uuid.toJavaUuid object X5CAccountStrategy : PasswordlessAccountStrategy() { @@ -43,8 +42,8 @@ object X5CAccountStrategy : PasswordlessAccountStrategy() { override suspend fun authenticate(tenant: String, request: X5CAccountRequest): AuthenticatedUser { val thumbprint = validate(request.token) - val registeredUserId = AccountsService.getAccountByX5CId(tenant, thumbprint)?.id ?: - AccountsService.register(tenant, request).getOrThrow().id + val registeredUserId = + AccountsService.getAccountByX5CId(tenant, thumbprint)?.id ?: AccountsService.register(tenant, request).getOrThrow().id return X5CAuthenticatedUser(registeredUserId) } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/credentials/CredentialsService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/credentials/CredentialsService.kt index 3d6b21848..09fd906d1 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/credentials/CredentialsService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/credentials/CredentialsService.kt @@ -138,16 +138,18 @@ class CredentialsService { transaction { WalletCredentials.deleteWhere { (WalletCredentials.wallet eq wallet.toJavaUuid()) and (id eq credentialId) } } private fun categorizedQuery(wallet: Uuid, deleted: Boolean?, pending: Boolean?, categories: List) = - WalletCredentials.innerJoin(otherTable = WalletCredentialCategoryMap, + WalletCredentials.innerJoin( + otherTable = WalletCredentialCategoryMap, onColumn = { id }, otherColumn = { credential }, additionalConstraint = { WalletCredentials.wallet eq wallet.toJavaUuid() and (WalletCredentialCategoryMap.wallet eq wallet) and deletedCondition( deleted ) and pendingCondition(pending) - }).innerJoin(otherTable = WalletCategory, + }).innerJoin( + otherTable = WalletCategory, onColumn = { WalletCredentialCategoryMap.category }, - otherColumn = { WalletCategory.id }, + otherColumn = { id }, additionalConstraint = { WalletCategory.wallet eq wallet.toJavaUuid() and (WalletCredentialCategoryMap.wallet eq wallet) and (WalletCategory.name inList (categories)) }).selectAll() diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/dids/DidService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/dids/DidService.kt index 4f27d5b41..81bc013b4 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/dids/DidService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/dids/DidService.kt @@ -50,7 +50,11 @@ object DidsService { }.insertedCount fun delete(wallet: Uuid, did: String): Boolean = - transaction { WalletDids.deleteWhere { (WalletDids.wallet eq wallet.toJavaUuid()) and (WalletDids.did eq did.replace("%3A", ":").replace("%3D", "=")) } } > 0 + transaction { + WalletDids.deleteWhere { + (WalletDids.wallet eq wallet.toJavaUuid()) and (WalletDids.did eq did.replace("%3A", ":").replace("%3D", "=")) + } + } > 0 fun makeDidDefault(wallet: Uuid, newDefaultDid: String) { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/endpoint/EntraServiceEndpointProvider.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/endpoint/EntraServiceEndpointProvider.kt index 0953a32cc..b0f75ac12 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/endpoint/EntraServiceEndpointProvider.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/endpoint/EntraServiceEndpointProvider.kt @@ -19,7 +19,7 @@ class EntraServiceEndpointProvider( contentType(ContentType.Application.Json) setBody( IdentityHubRequest( - requestId = Uuid.random().toString(), + requestId = Uuid.random().toString(), target = did, messages = listOf( IdentityHubRequest.Message( diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/events/EventService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/events/EventService.kt index c125743aa..96bcf22b3 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/events/EventService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/events/EventService.kt @@ -4,9 +4,7 @@ package id.walt.webwallet.service.events import id.walt.webwallet.db.models.Events import kotlinx.datetime.toJavaInstant -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json - import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq import org.jetbrains.exposed.sql.javatime.date @@ -107,7 +105,7 @@ class EventService { sortOrder = sortOrder, sortBy = sortBy, dataFilter = dataFilter - ).limit(n = limit, offset = offset) + ).limit(count = limit).offset(start = offset) private fun getFilterQueryUnlimited( accountId: Uuid, @@ -116,7 +114,8 @@ class EventService { sortBy: String, dataFilter: Map>, ) = Events.selectAll().where { Events.account eq accountId or (Events.wallet eq walletId) } - .orderBy(getColumn(sortBy) ?: Events.timestamp, + .orderBy( + getColumn(sortBy) ?: Events.timestamp, sortOrder.takeIf { it.uppercase() == "ASC" }?.let { SortOrder.ASC } ?: SortOrder.DESC) .addWhereClause(dataFilter) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/CredentialOfferProcessor.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/CredentialOfferProcessor.kt index 64d87b741..60b1a329e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/CredentialOfferProcessor.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/CredentialOfferProcessor.kt @@ -16,18 +16,18 @@ object CredentialOfferProcessor { private val http = WalletHttpClients.getHttpClient() private val logger = logger() suspend fun process( - credentialRequests: List, - providerMetadata: OpenIDProviderMetadata, - accessToken: String, + credentialRequests: List, + providerMetadata: OpenIDProviderMetadata, + accessToken: String, ) = when (credentialRequests.size) { 1 -> processedSingleCredentialOffer(credentialRequests, providerMetadata, accessToken) else -> processBatchCredentialOffer(credentialRequests, providerMetadata, accessToken) } private suspend fun processBatchCredentialOffer( - credReqs: List, - providerMetadata: OpenIDProviderMetadata, - accessToken: String, + credReqs: List, + providerMetadata: OpenIDProviderMetadata, + accessToken: String, ): List { providerMetadata as OpenIDProviderMetadata.Draft13 @@ -51,9 +51,9 @@ object CredentialOfferProcessor { } private suspend fun processedSingleCredentialOffer( - credReqs: List, - providerMetadata: OpenIDProviderMetadata, - accessToken: String, + credReqs: List, + providerMetadata: OpenIDProviderMetadata, + accessToken: String, ): List { val credReq = credReqs.first() diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt index 7c6fd6266..eb2662526 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt @@ -2,10 +2,15 @@ package id.walt.webwallet.service.exchange import id.walt.did.dids.DidService import id.walt.oid4vc.OpenID4VCI -import id.walt.oid4vc.data.* +import id.walt.oid4vc.data.CredentialFormat +import id.walt.oid4vc.data.CredentialOffer +import id.walt.oid4vc.data.GrantType import id.walt.oid4vc.providers.TokenTarget import id.walt.oid4vc.requests.* -import id.walt.oid4vc.responses.* +import id.walt.oid4vc.responses.CredentialResponse +import id.walt.oid4vc.responses.EntraIssuanceCompletionCode +import id.walt.oid4vc.responses.EntraIssuanceCompletionErrorDetails +import id.walt.oid4vc.responses.EntraIssuanceCompletionResponse import id.walt.webwallet.manifest.extractor.EntraManifestExtractor import id.walt.webwallet.service.oidc4vc.TestCredentialWallet import io.klogging.logger @@ -16,7 +21,7 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive -object IssuanceService: IssuanceServiceBase() { +object IssuanceService : IssuanceServiceBase() { override val logger = logger() diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProcessedCredentialOffer.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProcessedCredentialOffer.kt index 3483019ee..555da7a8c 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProcessedCredentialOffer.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProcessedCredentialOffer.kt @@ -5,7 +5,7 @@ import id.walt.oid4vc.requests.EntraIssuanceRequest import id.walt.oid4vc.responses.CredentialResponse data class ProcessedCredentialOffer( - val credentialResponse: CredentialResponse, - val credentialRequest: CredentialRequest?, - val entraIssuanceRequest: EntraIssuanceRequest? = null + val credentialResponse: CredentialResponse, + val credentialRequest: CredentialRequest?, + val entraIssuanceRequest: EntraIssuanceRequest? = null ) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProofOfPossessionFactory.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProofOfPossessionFactory.kt index 539bcd5c7..13458fd55 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProofOfPossessionFactory.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/ProofOfPossessionFactory.kt @@ -10,46 +10,46 @@ import id.walt.oid4vc.data.ProofType import id.walt.webwallet.service.oidc4vc.TestCredentialWallet object ProofOfPossessionFactory { - suspend fun new( - useKeyProof: Boolean, - credentialWallet: TestCredentialWallet, - offeredCredential: OfferedCredential, - credentialOffer: CredentialOffer, - nonce: String? - ): ProofOfPossession = when (useKeyProof) { - true -> keyProofOfPossession(credentialWallet, offeredCredential, credentialOffer, nonce) - false -> didProofOfPossession(credentialWallet, offeredCredential, credentialOffer, nonce) - } + suspend fun new( + useKeyProof: Boolean, + credentialWallet: TestCredentialWallet, + offeredCredential: OfferedCredential, + credentialOffer: CredentialOffer, + nonce: String? + ): ProofOfPossession = when (useKeyProof) { + true -> keyProofOfPossession(credentialWallet, offeredCredential, credentialOffer, nonce) + false -> didProofOfPossession(credentialWallet, offeredCredential, credentialOffer, nonce) + } - private fun didProofOfPossession( - credentialWallet: TestCredentialWallet, - offeredCredential: OfferedCredential, - credentialOffer: CredentialOffer, - nonce: String? - ) = credentialWallet.generateDidProof( - did = credentialWallet.did, - issuerUrl = credentialOffer.credentialIssuer, - nonce = nonce, - proofType = offeredCredential.proofTypesSupported?.keys?.first() ?: ProofType.jwt - ) - - private suspend fun keyProofOfPossession( - credentialWallet: TestCredentialWallet, - offeredCredential: OfferedCredential, - credentialOffer: CredentialOffer, - nonce: String? - ): ProofOfPossession { - val key = DidService.resolveToKey(credentialWallet.did).getOrThrow() - val proofType = offeredCredential.proofTypesSupported?.keys?.first() ?: ProofType.jwt - return credentialWallet.generateKeyProof( - key = key, - cosePubKey = if (proofType == ProofType.cwt) OneKey( - ECKey.parse(key.getPublicKey().exportJWK()).toECPublicKey(), - null - ).AsCBOR().EncodeToBytes() else null, - issuerUrl = credentialOffer.credentialIssuer, - nonce = nonce, - proofType = proofType + private fun didProofOfPossession( + credentialWallet: TestCredentialWallet, + offeredCredential: OfferedCredential, + credentialOffer: CredentialOffer, + nonce: String? + ) = credentialWallet.generateDidProof( + did = credentialWallet.did, + issuerUrl = credentialOffer.credentialIssuer, + nonce = nonce, + proofType = offeredCredential.proofTypesSupported?.keys?.first() ?: ProofType.jwt ) - } + + private suspend fun keyProofOfPossession( + credentialWallet: TestCredentialWallet, + offeredCredential: OfferedCredential, + credentialOffer: CredentialOffer, + nonce: String? + ): ProofOfPossession { + val key = DidService.resolveToKey(credentialWallet.did).getOrThrow() + val proofType = offeredCredential.proofTypesSupported?.keys?.first() ?: ProofType.jwt + return credentialWallet.generateKeyProof( + key = key, + cosePubKey = if (proofType == ProofType.cwt) OneKey( + ECKey.parse(key.getPublicKey().exportJWK()).toECPublicKey(), + null + ).AsCBOR().EncodeToBytes() else null, + issuerUrl = credentialOffer.credentialIssuer, + nonce = nonce, + proofType = proofType + ) + } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/issuers/IssuersService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/issuers/IssuersService.kt index aef7e35af..75d1a2442 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/issuers/IssuersService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/issuers/IssuersService.kt @@ -30,7 +30,14 @@ object IssuersService { configurationEndpoint: String, authorized: Boolean = false, ) = transaction { - addToWalletQuery(wallet, did, description, uiEndpoint, configurationEndpoint, authorized) + WalletIssuers.upsert { + it[this.wallet] = wallet.toJavaUuid() + it[this.did] = did + it[this.description] = description + it[this.uiEndpoint] = uiEndpoint + it[this.configurationEndpoint] = configurationEndpoint + it[this.authorized] = authorized + } }.insertedCount fun authorize(wallet: Uuid, issuer: String) = transaction { @@ -45,32 +52,6 @@ object IssuersService { IssuerDataTransferObject(it) } - private fun addToWalletQuery( - wallet: Uuid, - did: String, - description: String?, - uiEndpoint: String, - configurationEndpoint: String, - authorized: Boolean, - ) = WalletIssuers.upsert( - keys = arrayOf(WalletIssuers.wallet, WalletIssuers.did), - onUpdate = listOf( - description?.let { WalletIssuers.description to stringLiteral(it) }, - WalletIssuers.uiEndpoint to stringLiteral(uiEndpoint), - WalletIssuers.configurationEndpoint to stringLiteral(configurationEndpoint), - WalletIssuers.authorized to booleanLiteral(authorized) - ).mapNotNull { - it - } - ) { - it[this.wallet] = wallet.toJavaUuid() - it[this.did] = did - it[this.description] = description - it[this.uiEndpoint] = uiEndpoint - it[this.configurationEndpoint] = configurationEndpoint - it[this.authorized] = authorized - } - //TODO: copied from CredentialsService private fun updateColumn(wallet: Uuid, issuer: String, update: (statement: UpdateStatement) -> Unit): Int = WalletIssuers.update({ WalletIssuers.wallet eq wallet.toJavaUuid() and (WalletIssuers.did eq issuer) }) { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/keys/KeysService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/keys/KeysService.kt index dc837b129..a0236d7e6 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/keys/KeysService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/keys/KeysService.kt @@ -27,7 +27,8 @@ object KeysService { WalletKeys.selectAll().where { WalletKeys.keyId eq keyId }.firstOrNull()?.let { WalletKey(it) } } - fun list(wallet: Uuid): List = WalletKeys.selectAll().where { WalletKeys.wallet eq wallet.toJavaUuid() }.map { WalletKey(it) } + fun list(wallet: Uuid): List = + WalletKeys.selectAll().where { WalletKeys.wallet eq wallet.toJavaUuid() }.map { WalletKey(it) } fun add(wallet: Uuid, keyId: String, document: String) = transaction { WalletKeys.insert { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/notifications/NotificationService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/notifications/NotificationService.kt index 2017ba41a..b722ea3a7 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/notifications/NotificationService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/notifications/NotificationService.kt @@ -43,7 +43,7 @@ object NotificationService { } fun delete(vararg ids: Uuid): Int = transaction { - WalletNotifications.deleteWhere { WalletNotifications.id inList ids.map { it.toJavaUuid() } } + WalletNotifications.deleteWhere { id inList ids.map { it.toJavaUuid() } } } fun update(vararg notification: Notification): Int = transaction { @@ -63,7 +63,8 @@ object NotificationService { }.andWhere { runCatching { LocalDate.parse(addedOn!!) }.getOrNull() ?.let { WalletNotifications.addedOn.date() eq dateParam(it.toJavaLocalDate()) } ?: Op.TRUE - }.orderBy(column = WalletNotifications.addedOn, + }.orderBy( + column = WalletNotifications.addedOn, order = ascending?.takeIf { it }?.let { SortOrder.ASC } ?: SortOrder.DESC) private fun insert(vararg notifications: Notification): List = WalletNotifications.batchInsert( diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/oidc4vc/TestCredentialWallet.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/oidc4vc/TestCredentialWallet.kt index d06ad4d6e..ab5b4af0e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/oidc4vc/TestCredentialWallet.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/oidc4vc/TestCredentialWallet.kt @@ -2,6 +2,7 @@ package id.walt.webwallet.service.oidc4vc + import COSE.AlgorithmID import com.nimbusds.jose.jwk.ECKey import id.walt.credentials.utils.VCFormat @@ -52,10 +53,7 @@ import io.ktor.util.* import kotlinx.coroutines.runBlocking import kotlinx.datetime.Clock import kotlinx.datetime.Instant -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.* - - import kotlin.time.Duration import kotlin.time.Duration.Companion.minutes import kotlin.uuid.ExperimentalUuidApi @@ -199,7 +197,7 @@ class TestCredentialWallet( val documentWithDisclosures = if (selectedDisclosures?.containsKey(it.id) == true) { it.document + "~${selectedDisclosures[it.id]!!.joinToString("~")}" } else { - it.document + it.document } SDJwtVC.parse(documentWithDisclosures).present( @@ -289,12 +287,14 @@ class TestCredentialWallet( credential.document, rootPathMDoc, ) + CredentialFormat.sd_jwt_vc -> buildDescriptorMappingSDJwtVC( session.presentationDefinition, index, credential.document, "$", ) + else -> buildDescriptorMappingJwtVP( session.presentationDefinition, index, @@ -448,7 +448,7 @@ class TestCredentialWallet( rootPath: String = "$", ) = let { val vcJws = vcJwsStr.base64UrlToBase64().decodeJws() - val type = vcJws.payload["vc"]?.jsonObject?.get("type")?.jsonArray?.last()?.jsonPrimitive?.contentOrNull + vcJws.payload["vc"]?.jsonObject?.get("type")?.jsonArray?.last()?.jsonPrimitive?.contentOrNull ?: "VerifiableCredential" DescriptorMapping( diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/push/PushManager.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/push/PushManager.kt index 1cc5a9830..ee6766e2e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/push/PushManager.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/push/PushManager.kt @@ -5,7 +5,6 @@ import com.interaso.webpush.WebPushService import id.walt.commons.config.ConfigManager import id.walt.webwallet.config.PushConfig import io.github.oshai.kotlinlogging.KotlinLogging -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json object PushManager { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/settings/SettingsService.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/settings/SettingsService.kt index 910d7f82a..70cf483f6 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/settings/SettingsService.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/settings/SettingsService.kt @@ -4,10 +4,8 @@ package id.walt.webwallet.service.settings import id.walt.webwallet.db.models.WalletSettings import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject - import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.upsert @@ -36,7 +34,8 @@ object SettingsService { } private fun tryParseSettings(settings: String?) = - runCatching { json.decodeFromString(settings ?: "") }.fold(onSuccess = { WalletSetting(it) }, + runCatching { json.decodeFromString(settings ?: "") }.fold( + onSuccess = { WalletSetting(it) }, onFailure = { WalletSetting.default }) } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ClaimCommons.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ClaimCommons.kt index c3062f398..e957ee788 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ClaimCommons.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ClaimCommons.kt @@ -36,19 +36,19 @@ object ClaimCommons { credentialType: String, eventUseCase: EventLogUseCase, ) = eventUseCase.log( - action = EventType.Credential.Receive, - originator = "", //parsedOfferReq.credentialOffer!!.credentialIssuer, - tenant = tenant, - accountId = account, - walletId = wallet, - data = eventUseCase.credentialEventData( - credential = credential, - subject = eventUseCase.subjectData(credential), - organization = eventUseCase.issuerData(credential), - type = credentialType - ), - credentialId = credential.id, - ) + action = EventType.Credential.Receive, + originator = "", //parsedOfferReq.credentialOffer!!.credentialIssuer, + tenant = tenant, + accountId = account, + walletId = wallet, + data = eventUseCase.credentialEventData( + credential = credential, + subject = eventUseCase.subjectData(credential), + organization = eventUseCase.issuerData(credential), + type = credentialType + ), + credentialId = credential.id, + ) fun storeWalletCredentials( wallet: Uuid, @@ -60,4 +60,4 @@ object ClaimCommons { credentials = credentials.toTypedArray(), ) } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ExternalSignatureClaimStrategy.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ExternalSignatureClaimStrategy.kt index 6860d7c1b..fa4f3bc14 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ExternalSignatureClaimStrategy.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/ExternalSignatureClaimStrategy.kt @@ -3,8 +3,8 @@ package id.walt.webwallet.usecase.claim import id.walt.crypto.keys.Key import id.walt.webwallet.service.SSIKit2WalletService import id.walt.webwallet.service.credentials.CredentialsService -import id.walt.webwallet.service.exchange.IssuanceServiceExternalSignatures.OfferedCredentialProofOfPossession import id.walt.webwallet.service.exchange.IssuanceServiceExternalSignatures +import id.walt.webwallet.service.exchange.IssuanceServiceExternalSignatures.OfferedCredentialProofOfPossession import id.walt.webwallet.usecase.event.EventLogUseCase import kotlin.uuid.ExperimentalUuidApi import kotlin.uuid.Uuid diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/SilentClaimStrategy.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/SilentClaimStrategy.kt index d980f981f..8b731be45 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/SilentClaimStrategy.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/claim/SilentClaimStrategy.kt @@ -104,7 +104,7 @@ class SilentClaimStrategy( addedOn = Clock.System.now(), manifest = data.manifest, deletedOn = null, - pending = issuerUseCase.get(wallet = it, did = issuerDid).getOrNull()?.authorized ?: true, + pending = issuerUseCase.get(wallet = it, did = issuerDid).getOrNull()?.authorized != false, format = data.format ), data.type ) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/entity/EntityNameResolutionUseCase.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/entity/EntityNameResolutionUseCase.kt index 6fb333e78..dc196d6b0 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/entity/EntityNameResolutionUseCase.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/entity/EntityNameResolutionUseCase.kt @@ -22,5 +22,5 @@ class EntityNameResolutionUseCase( private fun validateAge(age: Instant?) = age?.let { now().minus(it).inWholeDays <= cacheAge - } ?: false + } == true } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/issuer/IssuerUseCaseImpl.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/issuer/IssuerUseCaseImpl.kt index 22cf8fdc5..5b861e37b 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/issuer/IssuerUseCaseImpl.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/issuer/IssuerUseCaseImpl.kt @@ -55,9 +55,9 @@ class IssuerUseCaseImpl( suspend fun fetchCredentials(url: String): List { val issuerConfiguration = fetchConfiguration(url).jsonObject val credentialConfigurations = ( - issuerConfiguration["credential_configurations_supported"]?.jsonObject?.entries - ?: issuerConfiguration["credentials_supported"]?.jsonArray?.associateBy { it.jsonObject["id"]!!.jsonPrimitive.content }?.entries - ) + issuerConfiguration["credential_configurations_supported"]?.jsonObject?.entries + ?: issuerConfiguration["credentials_supported"]?.jsonArray?.associateBy { it.jsonObject["id"]!!.jsonPrimitive.content }?.entries + ) return credentialConfigurations?.mapNotNull { (key, value) -> value.jsonObject.let { jsonObject -> val format = jsonObject["format"]?.jsonPrimitive?.content diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/notification/NotificationFilterUseCase.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/notification/NotificationFilterUseCase.kt index 346fbe76a..cceba901d 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/notification/NotificationFilterUseCase.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/usecase/notification/NotificationFilterUseCase.kt @@ -26,7 +26,7 @@ class NotificationFilterUseCase( notificationFormatter.format(it) } - private fun parseSortOrder(sort: String) = sort.lowercase().takeIf { it == "asc" }?.let { true } ?: false + private fun parseSortOrder(sort: String) = sort.lowercase().takeIf { it == "asc" }?.let { true } == true private fun filterPending(notifications: List, showPending: Boolean?) = showPending?.let { pending -> credentialService.get(notifications.mapNotNull { (it.data as? Notification.CredentialIssuanceData)?.credentialId }) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/AccountController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/AccountController.kt index 0b372fd96..85c4f93f7 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/AccountController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/AccountController.kt @@ -23,8 +23,8 @@ fun Application.accounts() { summary = "Get wallets associated with account" response { HttpStatusCode.OK to { body() } } }) { - val user = getUserUUID() - context.respond(AccountsService.getAccountWalletMappings("", user)) // FIXME -> TENANT HERE + val user = call.getUserUUID() + call.respond(AccountsService.getAccountWalletMappings("", user)) // FIXME -> TENANT HERE } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CategoryController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CategoryController.kt index b3f0218ed..0d14ec1f2 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CategoryController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CategoryController.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalUuidApi::class) + package id.walt.webwallet.web.controllers import id.walt.webwallet.web.controllers.auth.getWalletService @@ -7,6 +9,7 @@ import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.util.* import kotlinx.serialization.json.JsonObject +import kotlin.uuid.ExperimentalUuidApi fun Application.categories() = walletRoute { route("categories", { @@ -21,7 +24,7 @@ fun Application.categories() = walletRoute { } } }) { - context.respond(getWalletService().listCategories()) + call.respond(call.getWalletService().listCategories()) } route("{name}", { request { @@ -38,9 +41,9 @@ fun Application.categories() = walletRoute { } }) { val name = call.parameters.getOrFail("name") - runCatching { getWalletService().addCategory(name) }.onSuccess { - context.respond(if (it) HttpStatusCode.Created else HttpStatusCode.BadRequest) - }.onFailure { context.respond(HttpStatusCode.BadRequest, it.localizedMessage) } + runCatching { call.getWalletService().addCategory(name) }.onSuccess { + call.respond(if (it) HttpStatusCode.Created else HttpStatusCode.BadRequest) + }.onFailure { call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } delete({ summary = "Delete category" @@ -50,9 +53,9 @@ fun Application.categories() = walletRoute { } }) { val name = call.parameters.getOrFail("name") - runCatching { getWalletService().deleteCategory(name) }.onSuccess { - context.respond(if (it) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) - }.onFailure { context.respond(HttpStatusCode.BadRequest, it.localizedMessage) } + runCatching { call.getWalletService().deleteCategory(name) }.onSuccess { + call.respond(if (it) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + }.onFailure { call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } put("rename/{newName}", { summary = "Rename category" @@ -68,9 +71,9 @@ fun Application.categories() = walletRoute { }) { val oldName = call.parameters.getOrFail("name") val newName = call.parameters.getOrFail("newName") - runCatching { getWalletService().renameCategory(oldName, newName) }.onSuccess { - context.respond(if (it) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) - }.onFailure { context.respond(HttpStatusCode.BadRequest, it.localizedMessage) } + runCatching { call.getWalletService().renameCategory(oldName, newName) }.onSuccess { + call.respond(if (it) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + }.onFailure { call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CredentialController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CredentialController.kt index b0fbd1c2d..0647b9a3f 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CredentialController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/CredentialController.kt @@ -59,8 +59,8 @@ fun Application.credentials() = walletRoute { val showPending = call.request.queryParameters["showPending"]?.toBooleanStrictOrNull() val sortBy = call.request.queryParameters["sortBy"] ?: "addedOn" val descending = call.request.queryParameters["descending"].toBoolean() - context.respond( - getWalletService().listCredentials( + call.respond( + call.getWalletService().listCredentials( CredentialFilterObject( categories = categories, showDeleted = showDeleted, @@ -98,7 +98,7 @@ fun Application.credentials() = walletRoute { } }) { val credentialId = call.parameters.getOrFail("credentialId") - context.respond(getWalletService().getCredential(credentialId)) + call.respond(call.getWalletService().getCredential(credentialId)) } delete({ summary = "Delete a credential" @@ -115,8 +115,8 @@ fun Application.credentials() = walletRoute { }) { val credentialId = call.parameters.getOrFail("credentialId") val permanent = call.request.queryParameters["permanent"].toBoolean() - context.respond( - if (getWalletService().deleteCredential( + call.respond( + if (call.getWalletService().deleteCredential( credentialId, permanent ) ) HttpStatusCode.Accepted else HttpStatusCode.BadRequest @@ -135,8 +135,8 @@ fun Application.credentials() = walletRoute { } }) { val credentialId = call.parameters.getOrFail("credentialId") - runCatching { getWalletService().restoreCredential(credentialId) }.onSuccess { - context.respond(HttpStatusCode.OK, it) + runCatching { call.getWalletService().restoreCredential(credentialId) }.onSuccess { + call.respond(HttpStatusCode.OK, it) }.onFailure { throw it } @@ -149,8 +149,8 @@ fun Application.credentials() = walletRoute { } }) { val credentialId = call.parameters.getOrFail("credentialId") - runCatching { getWalletService().acceptCredential(CredentialRequestParameter(credentialId)) }.onSuccess { - if (it) context.respond(HttpStatusCode.Accepted) else context.respond(HttpStatusCode.BadRequest) + runCatching { call.getWalletService().acceptCredential(CredentialRequestParameter(credentialId)) }.onSuccess { + if (it) call.respond(HttpStatusCode.Accepted) else call.respond(HttpStatusCode.BadRequest) }.onFailure { throw it } @@ -172,15 +172,15 @@ fun Application.credentials() = walletRoute { val credentialId = call.parameters.getOrFail("credentialId") val requestParameter = call.receiveNullable() runCatching { - getWalletService().rejectCredential( + call.getWalletService().rejectCredential( CredentialRequestParameter( credentialId = credentialId, parameter = requestParameter ) ) }.onSuccess { - if (it) context.respond(HttpStatusCode.Accepted) else context.respond(HttpStatusCode.BadRequest) + if (it) call.respond(HttpStatusCode.Accepted) else call.respond(HttpStatusCode.BadRequest) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } get("status", { @@ -198,11 +198,11 @@ fun Application.credentials() = walletRoute { }) { runCatching { val credentialId = call.parameters.getOrFail("credentialId") - WalletServiceManager.credentialStatusUseCase.get(getWalletId(), credentialId) + WalletServiceManager.credentialStatusUseCase.get(call.getWalletId(), credentialId) }.onSuccess { - context.respond(it) + call.respond(it) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } route("category", { @@ -223,9 +223,9 @@ fun Application.credentials() = walletRoute { }) { val credentialId = call.parameters.getOrFail("credentialId") val categories = call.receive>() - runCatching { getWalletService().attachCategory(credentialId, categories) }.onSuccess { - if (it) context.respond(HttpStatusCode.Created) else context.respond(HttpStatusCode.BadRequest) - }.onFailure { context.respond(HttpStatusCode.BadRequest, it.localizedMessage) } + runCatching { call.getWalletService().attachCategory(credentialId, categories) }.onSuccess { + if (it) call.respond(HttpStatusCode.Created) else call.respond(HttpStatusCode.BadRequest) + }.onFailure { call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } delete({ summary = "Detach category from credential" @@ -237,9 +237,9 @@ fun Application.credentials() = walletRoute { }) { val credentialId = call.parameters.getOrFail("credentialId") val categories = call.receive>() - runCatching { getWalletService().detachCategory(credentialId, categories) }.onSuccess { - if (it) context.respond(HttpStatusCode.Accepted) else context.respond(HttpStatusCode.BadRequest) - }.onFailure { context.respond(HttpStatusCode.BadRequest, it.localizedMessage) } + runCatching { call.getWalletService().detachCategory(credentialId, categories) }.onSuccess { + if (it) call.respond(HttpStatusCode.Accepted) else call.respond(HttpStatusCode.BadRequest) + }.onFailure { call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidController.kt index 5dfc47314..948dd2bce 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidController.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalUuidApi::class) + package id.walt.webwallet.web.controllers import id.walt.webwallet.db.models.WalletDid @@ -12,6 +14,7 @@ import io.ktor.server.application.* import io.ktor.server.response.* import kotlinx.coroutines.runBlocking import kotlinx.serialization.json.JsonObject +import kotlin.uuid.ExperimentalUuidApi fun Application.dids() = walletRoute { route("dids", { @@ -26,7 +29,7 @@ fun Application.dids() = walletRoute { } } }) { - context.respond(getWalletService().run { runBlocking { listDids() } }) + call.respond(call.getWalletService().run { runBlocking { listDids() } }) } route("{did}", { @@ -49,9 +52,9 @@ fun Application.dids() = walletRoute { } } }) { - context.respond( - getWalletService().loadDid( - context.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") + call.respond( + call.getWalletService().loadDid( + call.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") ) ) } @@ -63,11 +66,11 @@ fun Application.dids() = walletRoute { HttpStatusCode.BadRequest to { description = "DID could not be deleted" } } }) { - val success = getWalletService().deleteDid( - context.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") + val success = call.getWalletService().deleteDid( + call.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") ) - context.respond( + call.respond( if (success) HttpStatusCode.Accepted else HttpStatusCode.BadRequest ) @@ -89,10 +92,10 @@ fun Application.dids() = walletRoute { } response { HttpStatusCode.Accepted to { description = "Default DID updated" } } }) { - getWalletService().setDefault( - context.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") + call.getWalletService().setDefault( + call.parameters["did"] ?: throw IllegalArgumentException("No DID supplied") ) - context.respond(HttpStatusCode.Accepted) + call.respond(HttpStatusCode.Accepted) } route("create", { diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidCreation.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidCreation.kt index 2532218a0..3b335a84c 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidCreation.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidCreation.kt @@ -6,7 +6,9 @@ import io.ktor.http.* import io.ktor.server.response.* import io.ktor.server.routing.* import kotlinx.serialization.json.JsonPrimitive +import kotlin.uuid.ExperimentalUuidApi +@OptIn(ExperimentalUuidApi::class) object DidCreation { private const val DidKeyMethodName = "key" @@ -26,17 +28,17 @@ object DidCreation { } } }) { - getWalletService().createDid( - DidKeyMethodName, extractDidCreateParameters(DidKeyMethodName, context.request.queryParameters) - ).let { context.respond(it) } + call.getWalletService().createDid( + DidKeyMethodName, extractDidCreateParameters(DidKeyMethodName, call.request.queryParameters) + ).let { call.respond(it) } } post(DidJwkMethodName, { summary = "Create a did:jwk" }) { - getWalletService().createDid( - DidJwkMethodName, extractDidCreateParameters(DidJwkMethodName, context.request.queryParameters) - ).let { context.respond(it) } + call.getWalletService().createDid( + DidJwkMethodName, extractDidCreateParameters(DidJwkMethodName, call.request.queryParameters) + ).let { call.respond(it) } } post(DidWebMethodName, { @@ -50,8 +52,8 @@ object DidCreation { } } }) { - val parameters = extractDidCreateParameters(DidWebMethodName, context.request.queryParameters) - getWalletService().createDid(DidWebMethodName, parameters).let { context.respond(it) } + val parameters = extractDidCreateParameters(DidWebMethodName, call.request.queryParameters) + call.getWalletService().createDid(DidWebMethodName, parameters).let { call.respond(it) } } post(DidEbsiMethodName, { @@ -61,9 +63,9 @@ object DidCreation { queryParameter("bearerToken") { description = "Required for v1 (LegalEntity)" } } }) { - getWalletService().createDid( - DidEbsiMethodName, extractDidCreateParameters(DidEbsiMethodName, context.request.queryParameters) - ).let { context.respond(it) } + call.getWalletService().createDid( + DidEbsiMethodName, extractDidCreateParameters(DidEbsiMethodName, call.request.queryParameters) + ).let { call.respond(it) } } post(DidCheqdMethodName, { @@ -72,17 +74,17 @@ object DidCreation { queryParameter("network") { description = "testnet or mainnet" } } }) { - getWalletService().createDid( - DidCheqdMethodName, extractDidCreateParameters(DidCheqdMethodName, context.request.queryParameters) - ).let { context.respond(it) } + call.getWalletService().createDid( + DidCheqdMethodName, extractDidCreateParameters(DidCheqdMethodName, call.request.queryParameters) + ).let { call.respond(it) } } post(DidIotaMethodName, { summary = "Create a did:iota" }) { - getWalletService().createDid( - DidIotaMethodName, extractDidCreateParameters(DidIotaMethodName, context.request.queryParameters) - ).let { context.respond(it) } + call.getWalletService().createDid( + DidIotaMethodName, extractDidCreateParameters(DidIotaMethodName, call.request.queryParameters) + ).let { call.respond(it) } } } @@ -95,7 +97,7 @@ object DidCreation { when (method) { DidKeyMethodName -> mapOf( "useJwkJcsPub" to JsonPrimitive( - parameters["useJwkJcsPub"]?.toBoolean() ?: false + parameters["useJwkJcsPub"]?.toBoolean() == true ) ) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidWebRegistryController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidWebRegistryController.kt index 0ad9888a6..fc2f697fc 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidWebRegistryController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/DidWebRegistryController.kt @@ -23,7 +23,7 @@ fun Application.didRegistry() = webWalletRoute { } } }) { - context.respond(runBlocking { + call.respond(runBlocking { DidWebRegistryService.listRegisteredDids() }) } @@ -47,9 +47,9 @@ fun Application.didRegistry() = webWalletRoute { } }) { - val id = context.parameters["id"] ?: throw IllegalArgumentException("No ID supplied") + val id = call.parameters["id"] ?: throw IllegalArgumentException("No ID supplied") - context.respond( + call.respond( DidWebRegistryService.loadRegisteredDid(id) ) } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/EventLogController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/EventLogController.kt index 269da5524..d25813071 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/EventLogController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/EventLogController.kt @@ -63,10 +63,10 @@ fun Application.eventLogs() = walletRoute { val startingAfter = call.request.queryParameters["startingAfter"] val sortBy = call.request.queryParameters["sortBy"] val sortOrder = call.request.queryParameters["sortOrder"] - context.respond( + call.respond( eventFilterUseCase.filter( - accountId = getUserUUID(), - walletId = getWalletId(), + accountId = call.getUserUUID(), + walletId = call.getWalletId(), filter = EventLogFilter( limit = limit, startingAfter = startingAfter, @@ -91,8 +91,8 @@ fun Application.eventLogs() = walletRoute { HttpStatusCode.BadRequest to { description = "Event log could not be deleted" } } }) { - val id = context.parameters.getOrFail("id").toInt() - context.respond(HttpStatusCode.Accepted, eventUseCase.delete(id)) + val id = call.parameters.getOrFail("id").toInt() + call.respond(HttpStatusCode.Accepted, eventUseCase.delete(id)) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/HistoryController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/HistoryController.kt index 0c6928763..12dbdd952 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/HistoryController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/HistoryController.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalUuidApi::class) + package id.walt.webwallet.web.controllers import id.walt.webwallet.db.models.WalletOperationHistory @@ -8,6 +10,7 @@ import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.response.* import org.jetbrains.exposed.sql.transactions.transaction +import kotlin.uuid.ExperimentalUuidApi fun Application.history() = walletRoute { route("history", { @@ -21,8 +24,8 @@ fun Application.history() = walletRoute { } } }) { - val wallet = getWalletService() - context.respond(transaction { + val wallet = call.getWalletService() + call.respond(transaction { wallet.getHistory() }) } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/IssuersController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/IssuersController.kt index 656beee69..c22b92ee1 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/IssuersController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/IssuersController.kt @@ -31,7 +31,7 @@ fun Application.issuers() = walletRoute { } } }) { - context.respond(WalletServiceManager.issuerUseCase.list(getWalletService().walletId)) + call.respond(WalletServiceManager.issuerUseCase.list(call.getWalletService().walletId)) } post("add", { summary = "Add issuer to wallet" @@ -49,16 +49,16 @@ fun Application.issuers() = walletRoute { val issuer = call.receive() WalletServiceManager.issuerUseCase.add( IssuerDataTransferObject( - wallet = getWalletService().walletId, + wallet = call.getWalletService().walletId, did = issuer.name, description = issuer.description, uiEndpoint = issuer.uiEndpoint, configurationEndpoint = issuer.configurationEndpoint, ) ).onSuccess { - context.respond(HttpStatusCode.Created) + call.respond(HttpStatusCode.Created) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } route("{issuer}", { @@ -83,10 +83,10 @@ fun Application.issuers() = walletRoute { } } }) { - WalletServiceManager.issuerUseCase.get(getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { - context.respond(it) + WalletServiceManager.issuerUseCase.get(call.getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { + call.respond(it) }.onFailure { - context.respondText(it.localizedMessage, ContentType.Text.Plain, HttpStatusCode.NotFound) + call.respondText(it.localizedMessage, ContentType.Text.Plain, HttpStatusCode.NotFound) } } put("authorize", { @@ -96,10 +96,10 @@ fun Application.issuers() = walletRoute { HttpStatusCode.BadRequest to { description = "Authorization failed" } } }) { - WalletServiceManager.issuerUseCase.authorize(getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { - context.respond(HttpStatusCode.Accepted) + WalletServiceManager.issuerUseCase.authorize(call.getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { + call.respond(HttpStatusCode.Accepted) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } @@ -125,10 +125,10 @@ fun Application.issuers() = walletRoute { } } }) { - WalletServiceManager.issuerUseCase.credentials(getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { - context.respond(it) + WalletServiceManager.issuerUseCase.credentials(call.getWalletService().walletId, call.parameters.getOrFail("issuer")).onSuccess { + call.respond(it) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/KeyController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/KeyController.kt index b3f17c9a5..740ca12a5 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/KeyController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/KeyController.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalUuidApi::class) + package id.walt.webwallet.web.controllers import id.walt.crypto.keys.KeyGenerationRequest @@ -15,6 +17,7 @@ import io.ktor.server.util.* import kotlinx.coroutines.runBlocking import kotlinx.serialization.json.* import org.jetbrains.exposed.sql.transactions.transaction +import kotlin.uuid.ExperimentalUuidApi fun Application.keys() = walletRoute { route("keys", { @@ -29,7 +32,7 @@ fun Application.keys() = walletRoute { } } }) { - context.respond(getWalletService().run { transaction { runBlocking { listKeys() } } }) + call.respond(call.getWalletService().run { transaction { runBlocking { listKeys() } } }) } post("generate", { @@ -144,14 +147,14 @@ fun Application.keys() = walletRoute { } } }) { - val keyGenerationRequest = context.receive() + val keyGenerationRequest = call.receive() runCatching { - getWalletService().generateKey(keyGenerationRequest) + call.getWalletService().generateKey(keyGenerationRequest) }.onSuccess { - context.respond(HttpStatusCode.Created, it) + call.respond(HttpStatusCode.Created, it) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } @@ -165,11 +168,11 @@ fun Application.keys() = walletRoute { val body = call.receiveText() runCatching { - getWalletService().importKey(body) + call.getWalletService().importKey(body) } .onSuccess { key -> - context.respond( + call.respond( HttpStatusCode.Created, key ) @@ -205,9 +208,9 @@ fun Application.keys() = walletRoute { } } }) { - val jwk = context.request.queryParameters.getOrFail("JWK") - val signature = context.receive() - context.respond(getWalletService().verify(jwk, signature)) + val jwk = call.request.queryParameters.getOrFail("JWK") + val signature = call.receive() + call.respond(call.getWalletService().verify(jwk, signature)) } @@ -229,9 +232,9 @@ fun Application.keys() = walletRoute { } } }) { - context.respond( - getWalletService().loadKey( - context.parameters["keyId"] ?: throw IllegalArgumentException("No key supplied") + call.respond( + call.getWalletService().loadKey( + call.parameters["keyId"] ?: throw IllegalArgumentException("No key supplied") ) ) } @@ -245,8 +248,8 @@ fun Application.keys() = walletRoute { } } }) { - val keyId = context.parameters["keyId"] ?: error("No key supplied") - context.respond(getWalletService().getKeyMeta(keyId)) + val keyId = call.parameters["keyId"] ?: error("No key supplied") + call.respond(call.getWalletService().getKeyMeta(keyId)) } get("export", { @@ -266,12 +269,12 @@ fun Application.keys() = walletRoute { } } }) { - val keyId = context.parameters["keyId"] ?: throw IllegalArgumentException("No key id provided.") + val keyId = call.parameters["keyId"] ?: throw IllegalArgumentException("No key id provided.") - val format = context.request.queryParameters["format"] ?: "JWK" - val loadPrivateKey = context.request.queryParameters["loadPrivateKey"].toBoolean() + val format = call.request.queryParameters["format"] ?: "JWK" + val loadPrivateKey = call.request.queryParameters["loadPrivateKey"].toBoolean() - context.respond(getWalletService().exportKey(keyId, format, loadPrivateKey)) + call.respond(call.getWalletService().exportKey(keyId, format, loadPrivateKey)) } delete({ @@ -282,10 +285,10 @@ fun Application.keys() = walletRoute { HttpStatusCode.BadRequest to { description = "Key could not be deleted" } } }) { - val keyId = context.parameters.getOrFail("keyId") + val keyId = call.parameters.getOrFail("keyId") - val success = getWalletService().deleteKey(keyId) - context.respond(if (success) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + val success = call.getWalletService().deleteKey(keyId) + call.respond(if (success) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) } delete("remove", { @@ -295,10 +298,10 @@ fun Application.keys() = walletRoute { HttpStatusCode.BadRequest to { description = "Failed to remove the key" } } }) { - val keyId = context.parameters.getOrFail("keyId") + val keyId = call.parameters.getOrFail("keyId") - val success = getWalletService().removeKey(keyId) - context.respond(if (success) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + val success = call.getWalletService().removeKey(keyId) + call.respond(if (success) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) } post("sign", { @@ -313,9 +316,9 @@ fun Application.keys() = walletRoute { } } }) { - val keyId = context.parameters.getOrFail("keyId") - val message = context.receive() - context.respond(getWalletService().sign(keyId, message)) + val keyId = call.parameters.getOrFail("keyId") + val message = call.receive() + call.respond(call.getWalletService().sign(keyId, message)) } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ManifestController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ManifestController.kt index 92805e7e3..055f75152 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ManifestController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ManifestController.kt @@ -47,8 +47,8 @@ fun Application.manifest() = walletRoute { val credentialService = CredentialsService() val manifest = callManifest(call.parameters) { getManifest(it, credentialService) } when (manifest) { - null -> context.respond(HttpStatusCode.NoContent) - else -> context.respond(manifest) + null -> call.respond(HttpStatusCode.NoContent) + else -> call.respond(manifest) } } get("display", { @@ -75,8 +75,8 @@ fun Application.manifest() = walletRoute { }?.toString() when (manifest) { - null -> context.respond(HttpStatusCode.NoContent) - else -> context.respond(ManifestProvider.new(manifest).display()) + null -> call.respond(HttpStatusCode.NoContent) + else -> call.respond(ManifestProvider.new(manifest).display()) } } get("issuer", { @@ -103,8 +103,8 @@ fun Application.manifest() = walletRoute { }?.toString() when (manifest) { - null -> context.respond(HttpStatusCode.NoContent) - else -> context.respond(ManifestProvider.new(manifest).issuer()) + null -> call.respond(HttpStatusCode.NoContent) + else -> call.respond(ManifestProvider.new(manifest).issuer()) } } } @@ -140,8 +140,8 @@ fun Application.manifest() = walletRoute { val manifest = callManifest(call.parameters) { extractManifest(it) } when (manifest) { - null -> context.respond(HttpStatusCode.NoContent) - else -> context.respond(manifest) + null -> call.respond(HttpStatusCode.NoContent) + else -> call.respond(manifest) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/NotificationController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/NotificationController.kt index 015087e74..941426154 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/NotificationController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/NotificationController.kt @@ -82,9 +82,9 @@ object NotificationController { } } }) { - context.respond( + call.respond( WalletServiceManager.notificationFilterUseCase.filter( - getWalletId(), NotificationFilterParameter( + call.getWalletId(), NotificationFilterParameter( type = call.request.queryParameters["type"], isRead = call.request.queryParameters["isRead"]?.toBooleanStrictOrNull(), addedOn = call.request.queryParameters["addedOn"], @@ -101,7 +101,7 @@ object NotificationController { HttpStatusCode.BadRequest to { description = "Notifications could not be deleted" } } }) { - context.respond(if (WalletServiceManager.notificationUseCase.deleteAll(getWalletId()) > 0) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + call.respond(if (WalletServiceManager.notificationUseCase.deleteAll(call.getWalletId()) > 0) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) } put("status/{status}", { summary = "Set notification read status" @@ -123,7 +123,7 @@ object NotificationController { }) { val ids = call.receive>() val status = call.parameters.getOrFail("status").toBoolean() - context.respond( + call.respond( if (WalletServiceManager.notificationUseCase.setStatus( *ids.map { Uuid.parse(it) }.toTypedArray(), isRead = status ) > 0 @@ -149,7 +149,7 @@ object NotificationController { } }) { val id = call.parameters.getOrFail("id") - context.respond(WalletServiceManager.notificationUseCase.findById(Uuid.parse(id)).fold(onSuccess = { + call.respond(WalletServiceManager.notificationUseCase.findById(Uuid.parse(id)).fold(onSuccess = { it }, onFailure = { it.localizedMessage @@ -163,7 +163,7 @@ object NotificationController { } }) { val id = call.parameters.getOrFail("id") - context.respond(if (WalletServiceManager.notificationUseCase.deleteById(Uuid.parse(id)) > 0) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) + call.respond(if (WalletServiceManager.notificationUseCase.deleteById(Uuid.parse(id)) > 0) HttpStatusCode.Accepted else HttpStatusCode.BadRequest) } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReasonController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReasonController.kt index 8c116aceb..84ec197ed 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReasonController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReasonController.kt @@ -23,7 +23,7 @@ fun Application.reasons() = authenticatedWebWalletRoute { } }) { val service = RejectionReasonService() - context.respond(service.list()) + call.respond(service.list()) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReportsController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReportsController.kt index 5a45a3cf2..3bf9174b2 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReportsController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/ReportsController.kt @@ -37,10 +37,10 @@ fun Application.reports() = walletRoute { } }) { val limit = call.request.queryParameters["limit"]?.toIntOrNull() - context.respond( - getWalletService().getFrequentCredentials( + call.respond( + call.getWalletService().getFrequentCredentials( CredentialReportRequestParameter( - walletId = getWalletId(), limit = limit + walletId = call.getWalletId(), limit = limit ) ) ) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/SilentExchangeController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/SilentExchangeController.kt index ea9482ccf..9676e3594 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/SilentExchangeController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/SilentExchangeController.kt @@ -29,9 +29,9 @@ fun Application.silentExchange() = webWalletRoute { runCatching { WalletServiceManager.silentClaimStrategy.claim(did, offer) }.onSuccess { - context.respond(HttpStatusCode.Accepted, it.size) + call.respond(HttpStatusCode.Accepted, it.size) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/TrustController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/TrustController.kt index b47a2912b..8ffb02ec6 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/TrustController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/TrustController.kt @@ -25,7 +25,7 @@ fun Application.trustRegistry() = authenticatedWebWalletRoute { val result = request.isVerifier.takeIf { it } ?.let { WalletServiceManager.verifierTrustValidationService.validate(request.did, request.credentialType, request.egfUri) } ?: WalletServiceManager.issuerTrustValidationService.validate(request.did, request.credentialType, request.egfUri) - context.respond(TrustResponse(result)) + call.respond(TrustResponse(result)) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/UtilityController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/UtilityController.kt index d9c57e3d6..022f69b58 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/UtilityController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/UtilityController.kt @@ -11,24 +11,25 @@ import io.ktor.server.request.* import io.ktor.server.response.* fun Application.utility() { - webWalletRoute { - route("util", { tags = listOf("Utilities") }) { - post("parseMDoc", { - summary = "Parse MDOC document to JSON element" - request { - body { - example("Sample mdoc") { - value = "a267646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c6973737565725369676e6564a26a6e616d65537061636573a1716f72672e69736f2e31383031332e352e3183d8185852a4686469676573744944006672616e646f6d50fce6b21d930b5b99fad34980ab06c8ee71656c656d656e744964656e7469666965726b66616d696c795f6e616d656c656c656d656e7456616c756563446f65d8185852a4686469676573744944016672616e646f6d5058daba0e58ae65726d9ba1aaa62256ee71656c656d656e744964656e7469666965726a676976656e5f6e616d656c656c656d656e7456616c7565644a6f686ed8185858a4686469676573744944026672616e646f6d5063fd5066277bce71963369771b78c1f671656c656d656e744964656e7469666965726a62697274685f646174656c656c656d656e7456616c75656a313938302d30312d30316a697373756572417574688443a10126a1182159014b308201473081eea003020102020839edc87a9a78f92a300a06082a8648ce3d04030230173115301306035504030c0c4d444f4320524f4f54204341301e170d3234303530323133313333305a170d3235303530323133313333305a301b3119301706035504030c104d444f432054657374204973737565723059301306072a8648ce3d020106082a8648ce3d030107034200041b4448341885fa84140f77790c69de810b977a7236f490da306a0cbe2a0a441379ddde146b36a44b6ba7bbc067b04b71bad4b692a4616013d893d440ae253781a320301e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780300a06082a8648ce3d04030203480030450221008e70041000ddec2a230b2586ecc59f8acd156f5d933d9363bc5e2263bb0ab69802201885a8b537327a69b022620f07c5c45d6293b86eed927a3f04e82cc51cadf8635901c3d8185901bea66776657273696f6e63312e306f646967657374416c676f726974686d675348412d3235366c76616c756544696765737473a1716f72672e69736f2e31383031332e352e31a3005820ac6801aa40d9871db115c9ba804bbccbddf7f29a6773d626cb6604d468e8714e015820066fc7c19bce2aeaf2d655351da21dbb12561db212e21e8c3e969fa469fd1c7c025820dbf831a97d5b504ca70c212224109e243f01f82cb4cde7c704a7166fd671ed326d6465766963654b6579496e666fa1696465766963654b6579a4010220012158200f08fd91a6b62e757e090514cd54d506ea4fb4354e10cdaa24c7748f59fb5e10225820ffa4113b5aef1a4dbd3fb4b9da126bc1ffc09b9cc679b4673dd321f021f2fc2167646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c76616c6964697479496e666fa3667369676e6564c0781e323032342d30372d32355431333a30353a33312e3438333237373433355a6976616c696446726f6dc0781e323032342d30372d32355431333a30353a33312e3438333237373738305a6a76616c6964556e74696cc0781e323032352d30372d32355431333a30353a33312e3438333237373836335a5840d57ee4f1a38cf49860b2f9b7c8f2469faa68720a8b731eae1d727e681bf0299fe86c0c120407cc8f0a7b951a6db6eac4c1905f07436fc556be1a65c13e432490" + webWalletRoute { + route("util", { tags = listOf("Utilities") }) { + post("parseMDoc", { + summary = "Parse MDOC document to JSON element" + request { + body { + example("Sample mdoc") { + value = + "a267646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c6973737565725369676e6564a26a6e616d65537061636573a1716f72672e69736f2e31383031332e352e3183d8185852a4686469676573744944006672616e646f6d50fce6b21d930b5b99fad34980ab06c8ee71656c656d656e744964656e7469666965726b66616d696c795f6e616d656c656c656d656e7456616c756563446f65d8185852a4686469676573744944016672616e646f6d5058daba0e58ae65726d9ba1aaa62256ee71656c656d656e744964656e7469666965726a676976656e5f6e616d656c656c656d656e7456616c7565644a6f686ed8185858a4686469676573744944026672616e646f6d5063fd5066277bce71963369771b78c1f671656c656d656e744964656e7469666965726a62697274685f646174656c656c656d656e7456616c75656a313938302d30312d30316a697373756572417574688443a10126a1182159014b308201473081eea003020102020839edc87a9a78f92a300a06082a8648ce3d04030230173115301306035504030c0c4d444f4320524f4f54204341301e170d3234303530323133313333305a170d3235303530323133313333305a301b3119301706035504030c104d444f432054657374204973737565723059301306072a8648ce3d020106082a8648ce3d030107034200041b4448341885fa84140f77790c69de810b977a7236f490da306a0cbe2a0a441379ddde146b36a44b6ba7bbc067b04b71bad4b692a4616013d893d440ae253781a320301e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780300a06082a8648ce3d04030203480030450221008e70041000ddec2a230b2586ecc59f8acd156f5d933d9363bc5e2263bb0ab69802201885a8b537327a69b022620f07c5c45d6293b86eed927a3f04e82cc51cadf8635901c3d8185901bea66776657273696f6e63312e306f646967657374416c676f726974686d675348412d3235366c76616c756544696765737473a1716f72672e69736f2e31383031332e352e31a3005820ac6801aa40d9871db115c9ba804bbccbddf7f29a6773d626cb6604d468e8714e015820066fc7c19bce2aeaf2d655351da21dbb12561db212e21e8c3e969fa469fd1c7c025820dbf831a97d5b504ca70c212224109e243f01f82cb4cde7c704a7166fd671ed326d6465766963654b6579496e666fa1696465766963654b6579a4010220012158200f08fd91a6b62e757e090514cd54d506ea4fb4354e10cdaa24c7748f59fb5e10225820ffa4113b5aef1a4dbd3fb4b9da126bc1ffc09b9cc679b4673dd321f021f2fc2167646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c76616c6964697479496e666fa3667369676e6564c0781e323032342d30372d32355431333a30353a33312e3438333237373433355a6976616c696446726f6dc0781e323032342d30372d32355431333a30353a33312e3438333237373738305a6a76616c6964556e74696cc0781e323032352d30372d32355431333a30353a33312e3438333237373836335a5840d57ee4f1a38cf49860b2f9b7c8f2469faa68720a8b731eae1d727e681bf0299fe86c0c120407cc8f0a7b951a6db6eac4c1905f07436fc556be1a65c13e432490" + } + } + } + response { + HttpStatusCode.OK to { description = "MDoc successfully parsed to JSON" } + } + }) { + val mdoc = call.receive() + call.respond(DataElement.fromCBORHex(mdoc).toJsonElement()) } - } } - response { - HttpStatusCode.OK to { description = "MDoc successfully parsed to JSON" } - } - }) { - val mdoc = call.receive() - call.respond(DataElement.fromCBORHex(mdoc).toJsonElement()) - } } - } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/WalletSettingsController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/WalletSettingsController.kt index a94b1f342..3f8cc933c 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/WalletSettingsController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/WalletSettingsController.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalUuidApi::class) + package id.walt.webwallet.web.controllers import id.walt.webwallet.service.settings.WalletSetting @@ -10,6 +12,7 @@ import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.response.* import kotlinx.serialization.json.JsonObject +import kotlin.uuid.ExperimentalUuidApi fun Application.settings() = walletRoute { route("settings", { @@ -25,10 +28,10 @@ fun Application.settings() = walletRoute { HttpStatusCode.BadRequest to { description = "Error fetching wallet settings" } } }) { - runCatching { getWalletService().getSettings() }.onSuccess { - context.respond(HttpStatusCode.OK, it) + runCatching { call.getWalletService().getSettings() }.onSuccess { + call.respond(HttpStatusCode.OK, it) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } //put @@ -44,11 +47,11 @@ fun Application.settings() = walletRoute { }) { runCatching { val request = call.receive() - getWalletService().setSettings(request) + call.getWalletService().setSettings(request) }.onSuccess { - context.respond(HttpStatusCode.Accepted) + call.respond(HttpStatusCode.Accepted) }.onFailure { - context.respond(HttpStatusCode.BadRequest, it.localizedMessage) + call.respond(HttpStatusCode.BadRequest, it.localizedMessage) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/Web3Controller.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/Web3Controller.kt index 1d5d36868..8445bcc1e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/Web3Controller.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/Web3Controller.kt @@ -31,8 +31,8 @@ fun Application.web3accounts() = walletRoute { } } }) { - val wallet = getWalletService() - context.respond>(wallet.getLinkedWallets()) + val wallet = call.getWalletService() + call.respond>(wallet.getLinkedWallets()) } post("link", { @@ -49,9 +49,9 @@ fun Application.web3accounts() = walletRoute { } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val data = Json.decodeFromString(call.receive()) - context.respond(wallet.linkWallet(data)) + call.respond(wallet.linkWallet(data)) } post("unlink", { @@ -63,9 +63,9 @@ fun Application.web3accounts() = walletRoute { HttpStatusCode.OK to { description = "Wallet unlinked" } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val walletId = Uuid.parse(call.receiveText()) - context.respond(wallet.unlinkWallet(walletId)) + call.respond(wallet.unlinkWallet(walletId)) } post("connect", { @@ -82,9 +82,9 @@ fun Application.web3accounts() = walletRoute { } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val walletId = Uuid.parse(call.receiveText()) - context.respond(wallet.connectWallet(walletId)) + call.respond(wallet.connectWallet(walletId)) } post("disconnect", { @@ -96,9 +96,9 @@ fun Application.web3accounts() = walletRoute { HttpStatusCode.OK to { description = "Wallet disconnected" } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val walletId = Uuid.parse(call.receiveText()) - context.respond(wallet.disconnectWallet(walletId)) + call.respond(wallet.disconnectWallet(walletId)) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/AuthController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/AuthController.kt index 0fdefaccf..67bfe7651 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/AuthController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/AuthController.kt @@ -32,14 +32,13 @@ import io.ktor.server.auth.* import io.ktor.server.plugins.* import io.ktor.server.request.* import io.ktor.server.response.* +import io.ktor.server.routing.* import io.ktor.server.sessions.* -import io.ktor.util.pipeline.* import kotlinx.coroutines.runBlocking import kotlinx.datetime.Clock import kotlinx.datetime.toJavaInstant import kotlinx.serialization.Serializable import kotlinx.serialization.SerializationException -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.* import org.jetbrains.exposed.sql.and import org.jetbrains.exposed.sql.selectAll @@ -58,9 +57,11 @@ data class ByteLoginRequest(val username: String, val password: ByteArray) { override fun toString() = "[LOGIN REQUEST FOR: $username]" } -data class LoginTokenSession(val token: String) : Principal +@Serializable +data class LoginTokenSession(val token: String) -data class OidcTokenSession(val token: String) : Principal +@Serializable +data class OidcTokenSession(val token: String) object AuthKeys { private val config = ConfigManager.getConfig() @@ -132,7 +133,7 @@ suspend fun ApplicationCall.getLoginRequest() = runCatching { }.getOrElse { throw LoginRequestError(it) } -suspend fun PipelineContext.doLogin() { +suspend fun RoutingContext.doLogin() { val reqBody = call.getLoginRequest() val authenticatedUser = AccountsService.authenticate("", reqBody).getOrThrow() val now = Clock.System.now().toJavaInstant() @@ -159,14 +160,14 @@ suspend fun PipelineContext.doLogin() { ) } -fun PipelineContext.getUserId() = - call.principal("auth-session") - ?: call.principal("auth-bearer") - ?: call.principal("auth-bearer-alternative") - ?: call.principal() // bearer is registered with no name for some reason +fun ApplicationCall.getUserId() = + principal("auth-session") + ?: principal("auth-bearer") + ?: principal("auth-bearer-alternative") + ?: principal() // bearer is registered with no name for some reason ?: throw UnauthorizedException("Could not find user authorization within request.") -suspend fun PipelineContext.getUserUUID() = +suspend fun ApplicationCall.getUserUUID() = runCatching { when { FeatureManager.isFeatureEnabled(FeatureCatalog.legacyAuthenticationFeature) -> Uuid.parse(getUserId().name) @@ -175,25 +176,23 @@ suspend fun PipelineContext.getUserUUID() = } }.getOrElse { throw IllegalArgumentException("Invalid user id: $it") } -fun PipelineContext.getWalletId() = +fun ApplicationCall.getWalletId() = runCatching { - Uuid.parse(call.parameters["wallet"] ?: throw IllegalArgumentException("No wallet ID provided")) + Uuid.parse(parameters["wallet"] ?: throw IllegalArgumentException("No wallet ID provided")) }.getOrElse { throw IllegalArgumentException("Invalid wallet ID provided: ${it.message}") } .also { ensurePermissionsForWallet(AccountWalletPermissions.READ_ONLY, walletId = it) } -suspend fun PipelineContext.getWalletService(walletId: Uuid) = - WalletServiceManager.getWalletService("", getUserUUID(), walletId) // FIXME -> TENANT HERE - -suspend fun PipelineContext.getWalletService() = - WalletServiceManager.getWalletService("", getUserUUID(), getWalletId()) // FIXME -> TENANT HERE +@OptIn(ExperimentalUuidApi::class) +suspend fun ApplicationCall.getWalletService(walletId: Uuid? = null) = + WalletServiceManager.getWalletService("", getUserUUID(), walletId ?: getWalletId()) // FIXME -> TENANT HERE -fun PipelineContext.getUsersSessionToken(): String? = - call.sessions.get(LoginTokenSession::class)?.token - ?: call.request.authorization()?.removePrefix("Bearer ") +fun ApplicationCall.getUsersSessionToken(): String? = + sessions.get(LoginTokenSession::class)?.token + ?: request.authorization()?.removePrefix("Bearer ") -fun PipelineContext.ensurePermissionsForWallet( +fun ApplicationCall.ensurePermissionsForWallet( required: AccountWalletPermissions, userId: Uuid = runBlocking { getUserUUID() }, diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/Controller.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/Controller.kt index 971e35165..1330fb578 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/Controller.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/Controller.kt @@ -1,12 +1,10 @@ package id.walt.webwallet.web.controllers.auth import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute -import io.ktor.server.application.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* interface Controller { fun routes(name: String): Route.() -> Route fun apiBuilder(): OpenApiRoute.() -> Unit - suspend fun PipelineContext.execute() -} \ No newline at end of file + suspend fun RoutingContext.execute() +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/DefaultAuthRoutes.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/DefaultAuthRoutes.kt index 5f5fab7e9..c87d6e9ae 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/DefaultAuthRoutes.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/DefaultAuthRoutes.kt @@ -34,7 +34,7 @@ fun Application.defaultAuthRoutes() = webWalletRoute { } } }) { - getUsersSessionToken()?.run { + call.getUsersSessionToken()?.run { val jwsObject = JWSObject.parse(this) val uuid = Json.parseToJsonElement(jwsObject.payload.toString()).jsonObject["sub"]?.jsonPrimitive?.content.toString() @@ -42,7 +42,7 @@ fun Application.defaultAuthRoutes() = webWalletRoute { } ?: call.respond(HttpStatusCode.BadRequest) } get("session", { summary = "Return session ID if logged in" }) { - val token = getUsersSessionToken() ?: throw UnauthorizedException("Invalid session") + val token = call.getUsersSessionToken() ?: throw UnauthorizedException("Invalid session") call.respond(mapOf("token" to mapOf("accessToken" to token))) } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzController.kt index fc680b224..b0f58244f 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzController.kt @@ -20,7 +20,6 @@ import io.github.smiley4.ktorswaggerui.dsl.routing.route import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* import kotlinx.datetime.Clock import kotlinx.datetime.toJavaInstant import org.jetbrains.exposed.sql.insert @@ -68,10 +67,10 @@ fun Application.ktorAuthnzRoutes() { summary = "Account authentication" description = "Configured authentication flow:

${flowConfig.toString().replace("\n", "
")}" }) { - val contextFunction: PipelineContext.() -> AuthContext = { + val contextFunction: ApplicationCall.() -> AuthContext = { AuthContext( - tenant = call.request.host(), - sessionId = call.parameters["sessionId"], + tenant = request.host(), + sessionId = parameters["sessionId"], implicitSessionGeneration = true, initialFlow = authConfig.authFlow ) diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzFrontendController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzFrontendController.kt index 51266e631..25609336e 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzFrontendController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/KtorAuthnzFrontendController.kt @@ -31,7 +31,7 @@ fun Application.ktorAuthnzFrontendRoutes() { } } }) { - call.respond(getAuthenticatedAccount()) + call.respond(call.getAuthenticatedAccount()) } get("session", { summary = "Return session ID if logged in" }) { val token = getAuthenticatedSession().token ?: throw UnauthorizedException("Invalid session") @@ -52,12 +52,12 @@ fun Application.ktorAuthnzFrontendRoutes() { account to sessionToken } else { - val authenticatedAccount = getAuthenticatedAccount() + val authenticatedAccount = call.getAuthenticatedAccount() val authenticatedSessionToken = getAuthenticatedSession().token authenticatedAccount to authenticatedSessionToken } - context.respond( + call.respond( buildJsonObject { put("id", account) put("token", token) @@ -69,7 +69,7 @@ fun Application.ktorAuthnzFrontendRoutes() { call.response.cookies.append("ktor-authnz-auth", "", CookieEncoding.URI_ENCODING, 0L, GMTDate()) call.response.cookies.append("auth.token", "", CookieEncoding.URI_ENCODING, 0L, GMTDate()) - context.respond(HttpStatusCode.OK) + call.respond(HttpStatusCode.OK) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LoginControllerBase.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LoginControllerBase.kt index 0501422c9..5e9d636fe 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LoginControllerBase.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LoginControllerBase.kt @@ -8,10 +8,8 @@ import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute import io.github.smiley4.ktorswaggerui.dsl.routing.post import io.github.smiley4.ktorswaggerui.dsl.routing.route import io.ktor.http.* -import io.ktor.server.application.* import io.ktor.server.plugins.ratelimit.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* abstract class LoginControllerBase( private val path: String = defaultAuthPath, @@ -52,7 +50,7 @@ abstract class LoginControllerBase( } } - override suspend fun PipelineContext.execute() { + override suspend fun RoutingContext.execute() { doLogin() } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LogoutControllerBase.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LogoutControllerBase.kt index ded1735ec..60052dedf 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LogoutControllerBase.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/LogoutControllerBase.kt @@ -5,11 +5,9 @@ import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute import io.github.smiley4.ktorswaggerui.dsl.routing.post import io.github.smiley4.ktorswaggerui.dsl.routing.route import io.ktor.http.* -import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.routing.* import io.ktor.server.sessions.* -import io.ktor.util.pipeline.* abstract class LogoutControllerBase( private val path: String = defaultAuthPath, @@ -28,12 +26,12 @@ abstract class LogoutControllerBase( response { HttpStatusCode.OK to { description = "Logged out." } } } - override suspend fun PipelineContext.execute() { + override suspend fun RoutingContext.execute() { clearUserSession() call.respond(HttpStatusCode.OK) } - protected fun PipelineContext.clearUserSession() { + protected fun RoutingContext.clearUserSession() { call.sessions.get()?.let { logger.debug { "Clearing login token session" } call.sessions.clear() @@ -44,4 +42,4 @@ abstract class LogoutControllerBase( call.sessions.clear() } } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/RegisterControllerBase.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/RegisterControllerBase.kt index d1e64236d..51b609780 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/RegisterControllerBase.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/RegisterControllerBase.kt @@ -7,11 +7,9 @@ import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute import io.github.smiley4.ktorswaggerui.dsl.routing.post import io.github.smiley4.ktorswaggerui.dsl.routing.route import io.ktor.http.* -import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.response.* import io.ktor.server.routing.* -import io.ktor.util.pipeline.* abstract class RegisterControllerBase( private val path: String = defaultAuthPath, @@ -53,7 +51,7 @@ abstract class RegisterControllerBase( } } - override suspend fun PipelineContext.execute() { + override suspend fun RoutingContext.execute() { // val jsonObject = call.receive() // val type = jsonObject["type"]?.jsonPrimitive?.contentOrNull // if (type.isNullOrEmpty()) { @@ -71,4 +69,4 @@ abstract class RegisterControllerBase( throw it } } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/keycloak/KeycloakLogoutController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/keycloak/KeycloakLogoutController.kt index 1f605a3a1..59905c4da 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/keycloak/KeycloakLogoutController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/keycloak/KeycloakLogoutController.kt @@ -5,10 +5,9 @@ import id.walt.webwallet.web.controllers.auth.LogoutControllerBase import id.walt.webwallet.web.model.KeycloakLogoutRequest import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute import io.ktor.http.* -import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.response.* -import io.ktor.util.pipeline.* +import io.ktor.server.routing.* import kotlinx.serialization.json.Json class KeycloakLogoutController : LogoutControllerBase(keycloakAuthPath, keycloakAuthTags) { @@ -29,10 +28,10 @@ class KeycloakLogoutController : LogoutControllerBase(keycloakAuthPath, keycloak response { HttpStatusCode.OK to { description = "Keycloak HTTP status code." } } } - override suspend fun PipelineContext.execute() { + override suspend fun RoutingContext.execute() { clearUserSession() logger.debug { "Clearing Keycloak user session" } val req = Json.decodeFromString(call.receive()) call.respond("Keycloak responded with: ${KeycloakAccountStrategy.logout(req)}") } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/oidc/OidcLogoutController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/oidc/OidcLogoutController.kt index 2b1e5a814..153553e96 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/oidc/OidcLogoutController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/auth/oidc/OidcLogoutController.kt @@ -3,13 +3,12 @@ package id.walt.webwallet.web.controllers.auth.oidc import id.walt.webwallet.service.WalletServiceManager.oidcConfig import id.walt.webwallet.web.controllers.auth.LogoutControllerBase import io.github.smiley4.ktorswaggerui.dsl.routes.OpenApiRoute -import io.ktor.server.application.* import io.ktor.server.response.* -import io.ktor.util.pipeline.* +import io.ktor.server.routing.* class OidcLogoutController : LogoutControllerBase() { override fun apiBuilder(): OpenApiRoute.() -> Unit = { description = "Logout via OIDC provider" } - override suspend fun PipelineContext.execute() { + override suspend fun RoutingContext.execute() { call.respondRedirect("${oidcConfig.logoutUrl}?post_logout_redirect_uri=${oidcConfig.publicBaseUrl}&client_id=${oidcConfig.clientId}") } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeController.kt index 8c5a52ebd..8cddf317b 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeController.kt @@ -16,8 +16,8 @@ import id.walt.webwallet.web.controllers.auth.getUserUUID import id.walt.webwallet.web.controllers.auth.getWalletId import id.walt.webwallet.web.controllers.auth.getWalletService import id.walt.webwallet.web.controllers.exchange.openapi.ExchangeOpenApiCommons -import io.github.smiley4.ktorswaggerui.dsl.routing.get import id.walt.webwallet.web.controllers.walletRoute +import io.github.smiley4.ktorswaggerui.dsl.routing.get import io.github.smiley4.ktorswaggerui.dsl.routing.post import io.github.smiley4.ktorswaggerui.dsl.routing.route import io.ktor.http.* @@ -47,7 +47,7 @@ fun Application.exchange() = walletRoute { response(ExchangeOpenApiCommons.useOfferRequestEndpointResponseParams()) }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val did = call.request.queryParameters["did"] ?: wallet.listDids().firstOrNull()?.did ?: throw IllegalArgumentException("No DID to use supplied and no DID was found in wallet.") @@ -58,7 +58,7 @@ fun Application.exchange() = walletRoute { runCatching { WalletServiceManager.explicitClaimStrategy.claim( tenant = wallet.tenant, - account = getUserUUID(), + account = call.getUserUUID(), wallet = wallet.walletId, did = did, offer = offer, @@ -74,10 +74,10 @@ fun Application.exchange() = walletRoute { ) } }.onSuccess { - context.respond(HttpStatusCode.OK, it) + call.respond(HttpStatusCode.OK, it) }.onFailure { error -> error.printStackTrace() - context.respond(HttpStatusCode.BadRequest, error.message ?: "Unknown error") + call.respond(HttpStatusCode.BadRequest, error.message ?: "Unknown error") } } post("matchCredentialsForPresentationDefinition", { @@ -94,9 +94,10 @@ fun Application.exchange() = walletRoute { } } }) { - val presentationDefinition = PresentationDefinition.fromJSON(context.receive()) - val matchedCredentials = WalletServiceManager.matchCredentialsForPresentationDefinition(getWalletId(), presentationDefinition) - context.respond(matchedCredentials) + val presentationDefinition = PresentationDefinition.fromJSON(call.receive()) + val matchedCredentials = + WalletServiceManager.matchCredentialsForPresentationDefinition(call.getWalletId(), presentationDefinition) + call.respond(matchedCredentials) } post("unmatchedCredentialsForPresentationDefinition", { summary = @@ -113,11 +114,11 @@ fun Application.exchange() = walletRoute { } } }) { - val presentationDefinition = PresentationDefinition.fromJSON(context.receive()) + val presentationDefinition = PresentationDefinition.fromJSON(call.receive()) val unmatchedCredentialTypes = WalletServiceManager.unmatchedPresentationDefinitionCredentialsUseCase.find( - getWalletId(), presentationDefinition + call.getWalletId(), presentationDefinition ) - context.respond(unmatchedCredentialTypes) + call.respond(unmatchedCredentialTypes) } post("usePresentationRequest", { @@ -128,7 +129,7 @@ fun Application.exchange() = walletRoute { } response(ExchangeOpenApiCommons.usePresentationRequestResponse()) }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val req = call.receive() println("req: $req") @@ -169,7 +170,7 @@ fun Application.exchange() = walletRoute { ) ) - context.respond(HttpStatusCode.OK, mapOf("redirectUri" to result.getOrThrow())) + call.respond(HttpStatusCode.OK, mapOf("redirectUri" to result.getOrThrow())) } else { val err = result.exceptionOrNull() println("Presentation failed: $err") @@ -189,7 +190,7 @@ fun Application.exchange() = walletRoute { ) when (err) { is SSIKit2WalletService.PresentationError -> { - context.respond( + call.respond( HttpStatusCode.BadRequest, mapOf( "redirectUri" to err.redirectUri, "errorMessage" to err.message @@ -197,7 +198,7 @@ fun Application.exchange() = walletRoute { ) } - else -> context.respond(HttpStatusCode.BadRequest, mapOf("errorMessage" to err?.message)) + else -> call.respond(HttpStatusCode.BadRequest, mapOf("errorMessage" to err?.message)) } } } @@ -213,10 +214,10 @@ fun Application.exchange() = walletRoute { } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val request = call.receiveText() val parsedRequest = wallet.resolvePresentationRequest(request) - context.respond(parsedRequest) + call.respond(parsedRequest) } post("resolveCredentialOffer", { summary = "Return resolved / parsed credential offer" @@ -232,14 +233,14 @@ fun Application.exchange() = walletRoute { } } }) { - val wallet = getWalletService() + val wallet = call.getWalletService() val request = call.receiveText() val reqParams = Url(request).parameters.toMap() val parsedOffer = wallet.resolveCredentialOffer(CredentialOfferRequest.fromHttpParameters(reqParams)) val serializedOffer = Json.encodeToString(CredentialOfferSerializer, parsedOffer) - context.respondText(serializedOffer, ContentType.Application.Json) + call.respondText(serializedOffer, ContentType.Application.Json) } get("resolveVctUrl", { summary = "Receive an verifiable credential type (VCT) URL and return resolved vct object as described in IETF SD-JWT VC" @@ -258,14 +259,14 @@ fun Application.exchange() = walletRoute { } }) { val vct = call.request.queryParameters["vct"] ?: throw IllegalArgumentException("VCT not set") - val wallet = getWalletService() + val wallet = call.getWalletService() runCatching { wallet.resolveVct(vct) }.onSuccess { - context.respond(HttpStatusCode.OK, it.toJSON()) + call.respond(HttpStatusCode.OK, it.toJSON()) }.onFailure { error -> error.printStackTrace() - context.respond(HttpStatusCode.BadRequest, error.message ?: "Unknown error") + call.respond(HttpStatusCode.BadRequest, error.message ?: "Unknown error") } } get("resolveIssuerOpenIDMetadata", { @@ -282,7 +283,7 @@ fun Application.exchange() = walletRoute { }) { val issuer = call.request.queryParameters["issuer"] ?: throw BadRequestException("Issuer base url not set") val serializedMetadata = Json.encodeToString(OpenIDProviderMetadataSerializer, OpenID4VCI.resolveCIProviderMetadata(issuer)) - context.respondText(serializedMetadata, ContentType.Application.Json) + call.respondText(serializedMetadata, ContentType.Application.Json) } } } diff --git a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeExternalSignaturesController.kt b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeExternalSignaturesController.kt index edd0ea4b8..fd39d2b41 100644 --- a/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeExternalSignaturesController.kt +++ b/waltid-services/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeExternalSignaturesController.kt @@ -5,12 +5,13 @@ package id.walt.webwallet.web.controllers.exchange import com.nimbusds.jose.jwk.JWK import com.nimbusds.jose.jwk.KeyUse import com.nimbusds.jose.util.Base64URL -import id.walt.credentials.utils.VCFormat import id.walt.crypto.keys.KeyGenerationRequest import id.walt.crypto.keys.KeyManager import id.walt.crypto.keys.KeyType import id.walt.crypto.utils.JsonUtils.toJsonElement -import id.walt.oid4vc.data.* +import id.walt.oid4vc.data.CredentialFormat +import id.walt.oid4vc.data.ResponseMode +import id.walt.oid4vc.data.VpTokenParameter import id.walt.oid4vc.data.dif.PresentationSubmission import id.walt.oid4vc.errors.AuthorizationError import id.walt.oid4vc.requests.AuthorizationRequest @@ -48,7 +49,10 @@ import io.ktor.server.request.* import io.ktor.server.response.* import io.ktor.util.* import kotlinx.coroutines.runBlocking -import kotlinx.serialization.json.* +import kotlinx.serialization.json.JsonArray +import kotlinx.serialization.json.JsonPrimitive +import kotlinx.serialization.json.jsonArray +import kotlinx.serialization.json.jsonObject import kotlin.uuid.ExperimentalUuidApi import kotlin.uuid.Uuid @@ -101,7 +105,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { } } }) { - val walletService = getWalletService() + val walletService = call.getWalletService() runCatching { val req = call.receive() logger.debug { "Request: $req" } @@ -169,7 +173,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { req.disclosures, ) - val (rootPathVP, rootPathMDoc) = if (ietfVpTokenParams != null && w3cJwtVpTokenParams == null) { + val (rootPathVP, _) = if (ietfVpTokenParams != null && w3cJwtVpTokenParams == null) { Pair("$", "$[0]") } else if (ietfVpTokenParams != null) { Pair("$[0]", "$[1]") @@ -215,14 +219,14 @@ fun Application.exchangeExternalSignatures() = walletRoute { }.onSuccess { responsePayload -> logger.debug { "Response payload: $responsePayload" } - context.respond( + call.respond( HttpStatusCode.OK, responsePayload, ) }.onFailure { error -> logger.debug { "error: $error" } - context.respond( + call.respond( HttpStatusCode.BadRequest, error.message ?: "Unknown error", ) @@ -253,7 +257,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { response(ExchangeOpenApiCommons.usePresentationRequestResponse()) }) { - val walletService = getWalletService() + val walletService = call.getWalletService() runCatching { val req = call.receive() @@ -312,7 +316,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { if (authReq.responseMode == ResponseMode.direct_post_jwt) { val encKey = authReq.clientMetadata?.jwks?.get("keys")?.jsonArray?.first { jwk -> - JWK.parse(jwk.toString()).keyUse?.equals(KeyUse.ENCRYPTION) ?: false + JWK.parse(jwk.toString()).keyUse?.equals(KeyUse.ENCRYPTION) == true }?.jsonObject ?: throw Exception("No ephemeral reader key found") val ephemeralWalletKey = runBlocking { KeyManager.createKey(KeyGenerationRequest(keyType = KeyType.secp256r1)) } @@ -379,14 +383,14 @@ fun Application.exchangeExternalSignatures() = walletRoute { } else { throw PresentationError( message = - if (responseBody.isNotBlank()) "Presentation failed:\n $responseBody" - else "Presentation failed", + if (responseBody.isNotBlank()) "Presentation failed:\n $responseBody" + else "Presentation failed", redirectUri = "" ) } } }.onSuccess { - context.respond( + call.respond( HttpStatusCode.OK, it, ) @@ -394,7 +398,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { logger.debug { "error: $error" } when (error) { is PresentationError -> { - context.respond( + call.respond( HttpStatusCode.BadRequest, mapOf( "redirectUri" to error.redirectUri, @@ -404,7 +408,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { } else -> { - context.respond( + call.respond( HttpStatusCode.BadRequest, mapOf( "errorMessage" to error.message @@ -451,7 +455,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { } } }) { - val walletService = getWalletService() + val walletService = call.getWalletService() runCatching { val req = call.receive() @@ -497,12 +501,12 @@ fun Application.exchangeExternalSignatures() = walletRoute { ) } }.onSuccess { responsePayload -> - context.respond( + call.respond( HttpStatusCode.OK, responsePayload, ) }.onFailure { error -> - context.respond( + call.respond( HttpStatusCode.BadRequest, error.message ?: "Unknown error", ) @@ -532,7 +536,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { response(ExchangeOpenApiCommons.useOfferRequestEndpointResponseParams()) }) { - val walletService = getWalletService() + val walletService = call.getWalletService() runCatching { val req = call.receive() @@ -546,7 +550,7 @@ fun Application.exchangeExternalSignatures() = walletRoute { tenantId = walletService.tenant, accountId = walletService.accountId, walletId = walletService.walletId, - pending = req.requireUserInput ?: true, + pending = req.requireUserInput != false, did = did, offerURL = req.offerURL, credentialIssuerURL = req.credentialIssuer, @@ -554,12 +558,12 @@ fun Application.exchangeExternalSignatures() = walletRoute { offeredCredentialProofsOfPossession = req.offeredCredentialProofsOfPossession, ) }.onSuccess { walletCredentialList -> - context.respond( + call.respond( HttpStatusCode.OK, walletCredentialList, ) }.onFailure { error -> - context.respond( + call.respond( HttpStatusCode.BadRequest, error.message ?: "Unknown error", ) diff --git a/waltid-services/waltid-wallet-api/src/main/resources/example_klogging.conf b/waltid-services/waltid-wallet-api/src/main/resources/example_klogging.conf index 7de60d22a..40438a6d0 100644 --- a/waltid-services/waltid-wallet-api/src/main/resources/example_klogging.conf +++ b/waltid-services/waltid-wallet-api/src/main/resources/example_klogging.conf @@ -1,17 +1,17 @@ sinks = { - stdout = { - renderWith = "RENDER_ANSI" - sendTo = "STDOUT" - } + stdout = { + renderWith = "RENDER_ANSI" + sendTo = "STDOUT" + } } logging = [ - { - levelRanges = [ - { - fromMinLevel = "INFO" - toSinks = ["stdout"] - } - ] - } + { + levelRanges = [ + { + fromMinLevel = "INFO" + toSinks = ["stdout"] + } + ] + } ] diff --git a/waltid-services/waltid-wallet-api/src/test/kotlin/E2EWalletTestBase.kt b/waltid-services/waltid-wallet-api/src/test/kotlin/E2EWalletTestBase.kt index c32329d03..7576ef2dd 100644 --- a/waltid-services/waltid-wallet-api/src/test/kotlin/E2EWalletTestBase.kt +++ b/waltid-services/waltid-wallet-api/src/test/kotlin/E2EWalletTestBase.kt @@ -14,9 +14,7 @@ import io.ktor.client.call.* import io.ktor.client.request.* import io.ktor.client.statement.* import io.ktor.http.* -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.* - import kotlin.test.assertEquals import kotlin.test.assertNotEquals import kotlin.test.assertNotNull diff --git a/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/service/credentials/status/fetch/DefaultStatusListCredentialFetchStrategyTest.kt b/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/service/credentials/status/fetch/DefaultStatusListCredentialFetchStrategyTest.kt index 9de753f63..799fbca75 100644 --- a/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/service/credentials/status/fetch/DefaultStatusListCredentialFetchStrategyTest.kt +++ b/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/service/credentials/status/fetch/DefaultStatusListCredentialFetchStrategyTest.kt @@ -76,12 +76,9 @@ class DefaultStatusListCredentialFetchStrategyTest { const val credentialResourcePath = "credential-status/status-list-credential" const val statusCredentialPath = "credentials/%s" - private val environment = applicationEngineEnvironment { - envConfig() - } - val server: ApplicationEngine by lazy { + val server: EmbeddedServer<*, *> by lazy { println("Initializing embedded webserver...") - embeddedServer(CIO, environment) + embeddedServer(CIO, applicationEnvironment(), { envConfig() }, module = { module() }) } private fun Application.module() { @@ -90,20 +87,17 @@ class DefaultStatusListCredentialFetchStrategyTest { } routing { get("credentials/{id}") { - val id = context.parameters.getOrFail("id") + val id = call.parameters.getOrFail("id") val credential = TestUtils.loadResource("$credentialResourcePath/$id.json") call.respond(credential) } } } - private fun ApplicationEngineEnvironmentBuilder.envConfig() { - module { - module() - } + private fun ApplicationEngine.Configuration.envConfig() { connector { port = serverPort } } } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/utils/PKIXUtilsTest.kt b/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/utils/PKIXUtilsTest.kt index 3414cea76..4b16616b9 100644 --- a/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/utils/PKIXUtilsTest.kt +++ b/waltid-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/utils/PKIXUtilsTest.kt @@ -1,8 +1,8 @@ package id.walt.webwallet.utils import kotlinx.coroutines.test.runTest -import org.junit.Test import java.security.KeyPairGenerator +import kotlin.test.Test import kotlin.test.assertTrue class PKIXUtilsTest { @@ -18,6 +18,6 @@ class PKIXUtilsTest { val keyPair = keyPairGenerator.generateKeyPair() val pemEncodedPrivateKey = PKIXUtils.pemEncodeJavaPrivateKey(keyPair.private) val decodedPrivateKey = PKIXUtils.pemDecodeJavaPrivateKey(pemEncodedPrivateKey) - assertTrue { keyPair.private.encoded.contentEquals(decodedPrivateKey.encoded)} + assertTrue { keyPair.private.encoded.contentEquals(decodedPrivateKey.encoded) } } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message-vc-wrapped.json b/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message-vc-wrapped.json index 805c64d7e..bf1d31698 100644 --- a/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message-vc-wrapped.json +++ b/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message-vc-wrapped.json @@ -1,19 +1,15 @@ { - "vc": - { - "type": - [ + "vc": { + "type": [ "VerifiableCredential", "RevocationList2020" ], - "credentialSubject": - { + "credentialSubject": { "id": "urn:uuid:cca8bd0a-83c2-4ae1-9f43-e99943cdfa5c", "type": "RevocationList2020", "statusPurpose": "status", "statusSize": 2, - "statusMessage": - [ + "statusMessage": [ { "status": "0x0", "message": "valid" @@ -34,4 +30,4 @@ "encodedList": "H4sIAAAAAAAA/zMwNABDAKb12i0IAAAA" } } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message.json b/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message.json index 01fc9f023..05b10a4d2 100644 --- a/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message.json +++ b/waltid-services/waltid-wallet-api/src/test/resources/credential-status/status-list-credential/revocation-list-with-status-message.json @@ -1,17 +1,14 @@ { - "type": - [ + "type": [ "VerifiableCredential", "RevocationList2020" ], - "credentialSubject": - { + "credentialSubject": { "id": "urn:uuid:cca8bd0a-83c2-4ae1-9f43-e99943cdfa5c", "type": "RevocationList2020", "statusPurpose": "status", "statusSize": 2, - "statusMessage": - [ + "statusMessage": [ { "status": "0x0", "message": "valid" @@ -31,4 +28,4 @@ ], "encodedList": "H4sIAAAAAAAA/zMwNABDAKb12i0IAAAA" } -} \ No newline at end of file +} diff --git a/waltid-services/waltid-web3login-microservice/build.gradle.kts b/waltid-services/waltid-web3login-microservice/build.gradle.kts index 855a813f3..d235b0689 100644 --- a/waltid-services/waltid-web3login-microservice/build.gradle.kts +++ b/waltid-services/waltid-web3login-microservice/build.gradle.kts @@ -1,7 +1,8 @@ plugins { kotlin("jvm") version "2.0.0" - id("io.ktor.plugin") version "2.3.12" + id("io.ktor.plugin") version "3.1.0" id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0" + id("com.github.ben-manes.versions") } group = "id.walt" @@ -27,7 +28,6 @@ dependencies { implementation("io.ktor:ktor-server-content-negotiation-jvm") implementation("io.ktor:ktor-serialization-kotlinx-json-jvm") implementation("io.ktor:ktor-server-cio-jvm") - testImplementation("io.ktor:ktor-server-tests-jvm") testImplementation(kotlin("test-junit")) // nftkit diff --git a/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/NftController.kt b/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/NftController.kt index ed5fb2b64..903c05038 100644 --- a/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/NftController.kt +++ b/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/NftController.kt @@ -37,7 +37,7 @@ fun Application.nfts() = walletRoute { }) { val nft = getNftService() val ecosystem = call.parameters["ecosystem"] ?: throw IllegalArgumentException("No ecosystem provided") - context.respond(nft.getChains(ecosystem = ecosystem)) + call.respond(nft.getChains(ecosystem = ecosystem)) } get("filter", { summary = "Fetch the list of tokens with details" @@ -61,9 +61,9 @@ fun Application.nfts() = walletRoute { } }) { val nft = getNftService() - val accountIds = context.request.queryParameters.getAll("accountId") - val networks = context.request.queryParameters.getAll("network") - context.respond( + val accountIds = call.request.queryParameters.getAll("accountId") + val networks = call.request.queryParameters.getAll("network") + call.respond( nft.filterTokens("", FilterParameter(accountIds ?: emptyList(), networks ?: emptyList())) // FIXME -> TENANT HERE ) @@ -91,7 +91,7 @@ fun Application.nfts() = walletRoute { val nft = getNftService() val chain = call.parameters["chain"] ?: throw IllegalArgumentException("No chain provided") val account = call.parameters["account"] ?: throw IllegalArgumentException("No account provided") - context.respond( + call.respond( nft.getTokens( "", // FIXME -> TENANT HERE ListFetchParameter( @@ -137,7 +137,7 @@ fun Application.nfts() = walletRoute { val account = call.parameters["account"] ?: throw IllegalArgumentException("No account provided") val contract = call.parameters["contract"] ?: throw IllegalArgumentException("No contract provided") val tokenId = call.parameters["tokenId"] ?: throw IllegalArgumentException("No tokenId provided") - val collection = context.request.queryParameters["collectionId"] + val collection = call.request.queryParameters["collectionId"] val nft = getNftService() runCatching { nft.getTokenDetails( @@ -151,7 +151,7 @@ fun Application.nfts() = walletRoute { ) ) }.onSuccess { - context.respond(it) + call.respond(it) }.onFailure { context.response.status(HttpStatusCode.NotFound) } } get("marketplace/{chain}/{contract}/{tokenId}", { @@ -185,7 +185,7 @@ fun Application.nfts() = walletRoute { tokenId = call.parameters["tokenId"] ?: throw IllegalArgumentException("No tokenId provided") ) )?.run { - context.respond(this) + call.respond(this) } ?: run { context.response.status(HttpStatusCode.NotFound) } @@ -217,7 +217,7 @@ fun Application.nfts() = walletRoute { ?: throw IllegalArgumentException("No contract provided"), ) )?.run { - context.respond(this) + call.respond(this) } ?: run { context.response.status(HttpStatusCode.NotFound) } diff --git a/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/plugins/Monitoring.kt b/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/plugins/Monitoring.kt index 88530779a..4bc819b85 100644 --- a/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/plugins/Monitoring.kt +++ b/waltid-services/waltid-web3login-microservice/src/main/kotlin/id/walt/plugins/Monitoring.kt @@ -1,7 +1,7 @@ package id.walt.plugins import io.ktor.server.application.* -import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.calllogging.CallLogging import io.ktor.server.request.* import org.slf4j.event.* From 9d52b59ab6f4883d8b489973ba63701164cf021e Mon Sep 17 00:00:00 2001 From: waltkb <68587968+waltkb@users.noreply.github.com> Date: Tue, 18 Feb 2025 00:07:58 +0100 Subject: [PATCH 3/6] Update dependencies, fix build issues --- .../auth/waltid-idpkit/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - waltid-libraries/auth/waltid-idpkit/gradlew | 234 ------------------ .../auth/waltid-idpkit/gradlew.bat | 89 ------- .../waltid-wallet-api/gradle.properties | 1 - .../gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - 9 files changed, 336 deletions(-) delete mode 100644 waltid-libraries/auth/waltid-idpkit/gradle.properties delete mode 100644 waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.jar delete mode 100644 waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.properties delete mode 100755 waltid-libraries/auth/waltid-idpkit/gradlew delete mode 100644 waltid-libraries/auth/waltid-idpkit/gradlew.bat delete mode 100644 waltid-services/waltid-wallet-api/gradle.properties delete mode 100644 waltid-services/waltid-web3login-microservice/gradle.properties delete mode 100644 waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.jar delete mode 100644 waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.properties diff --git a/waltid-libraries/auth/waltid-idpkit/gradle.properties b/waltid-libraries/auth/waltid-idpkit/gradle.properties deleted file mode 100644 index 7fc6f1ff2..000000000 --- a/waltid-libraries/auth/waltid-idpkit/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.code.style=official diff --git a/waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.jar b/waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.properties b/waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e411586a5..000000000 --- a/waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/waltid-libraries/auth/waltid-idpkit/gradlew b/waltid-libraries/auth/waltid-idpkit/gradlew deleted file mode 100755 index 1b6c78733..000000000 --- a/waltid-libraries/auth/waltid-idpkit/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/waltid-libraries/auth/waltid-idpkit/gradlew.bat b/waltid-libraries/auth/waltid-idpkit/gradlew.bat deleted file mode 100644 index 107acd32c..000000000 --- a/waltid-libraries/auth/waltid-idpkit/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/waltid-services/waltid-wallet-api/gradle.properties b/waltid-services/waltid-wallet-api/gradle.properties deleted file mode 100644 index 7fc6f1ff2..000000000 --- a/waltid-services/waltid-wallet-api/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.code.style=official diff --git a/waltid-services/waltid-web3login-microservice/gradle.properties b/waltid-services/waltid-web3login-microservice/gradle.properties deleted file mode 100644 index 7fc6f1ff2..000000000 --- a/waltid-services/waltid-web3login-microservice/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.code.style=official diff --git a/waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.jar b/waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.properties b/waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e411586a5..000000000 --- a/waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists From 1d2965c07cee56560d57f6fa8d4c128c2a69c79f Mon Sep 17 00:00:00 2001 From: waltkb <68587968+waltkb@users.noreply.github.com> Date: Tue, 18 Feb 2025 00:07:58 +0100 Subject: [PATCH 4/6] Update dependencies, fix build issues --- .../auth/waltid-idpkit/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - waltid-libraries/auth/waltid-idpkit/gradlew | 234 ------------------ .../auth/waltid-idpkit/gradlew.bat | 89 ------- .../src/test/kotlin/WaltidServicesE2ETests.kt | 1 + .../src/test/resources/keys/rsa.json | 10 +- .../waltid-wallet-api/gradle.properties | 1 - .../gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - 11 files changed, 3 insertions(+), 344 deletions(-) delete mode 100644 waltid-libraries/auth/waltid-idpkit/gradle.properties delete mode 100644 waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.jar delete mode 100644 waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.properties delete mode 100755 waltid-libraries/auth/waltid-idpkit/gradlew delete mode 100644 waltid-libraries/auth/waltid-idpkit/gradlew.bat delete mode 100644 waltid-services/waltid-wallet-api/gradle.properties delete mode 100644 waltid-services/waltid-web3login-microservice/gradle.properties delete mode 100644 waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.jar delete mode 100644 waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.properties diff --git a/waltid-libraries/auth/waltid-idpkit/gradle.properties b/waltid-libraries/auth/waltid-idpkit/gradle.properties deleted file mode 100644 index 7fc6f1ff2..000000000 --- a/waltid-libraries/auth/waltid-idpkit/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.code.style=official diff --git a/waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.jar b/waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.properties b/waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e411586a5..000000000 --- a/waltid-libraries/auth/waltid-idpkit/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/waltid-libraries/auth/waltid-idpkit/gradlew b/waltid-libraries/auth/waltid-idpkit/gradlew deleted file mode 100755 index 1b6c78733..000000000 --- a/waltid-libraries/auth/waltid-idpkit/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/waltid-libraries/auth/waltid-idpkit/gradlew.bat b/waltid-libraries/auth/waltid-idpkit/gradlew.bat deleted file mode 100644 index 107acd32c..000000000 --- a/waltid-libraries/auth/waltid-idpkit/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/waltid-services/waltid-e2e-tests/src/test/kotlin/WaltidServicesE2ETests.kt b/waltid-services/waltid-e2e-tests/src/test/kotlin/WaltidServicesE2ETests.kt index 26657186c..619b1e2a8 100644 --- a/waltid-services/waltid-e2e-tests/src/test/kotlin/WaltidServicesE2ETests.kt +++ b/waltid-services/waltid-e2e-tests/src/test/kotlin/WaltidServicesE2ETests.kt @@ -43,6 +43,7 @@ import io.ktor.server.application.* import io.ktor.server.util.* import kotlinx.coroutines.runBlocking import kotlinx.serialization.json.* +import kotlin.system.exitProcess import kotlin.test.* import kotlin.time.Duration.Companion.minutes import kotlin.uuid.ExperimentalUuidApi diff --git a/waltid-services/waltid-e2e-tests/src/test/resources/keys/rsa.json b/waltid-services/waltid-e2e-tests/src/test/resources/keys/rsa.json index ab4ba21f5..a941716da 100644 --- a/waltid-services/waltid-e2e-tests/src/test/resources/keys/rsa.json +++ b/waltid-services/waltid-e2e-tests/src/test/resources/keys/rsa.json @@ -1,12 +1,6 @@ { "kty": "RSA", - "n": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx - 4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMs - tn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2 - QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbI - SD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqb - w0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw - ", + "n": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw", "e": "AQAB", "kid": "2011-04-29" -} \ No newline at end of file +} diff --git a/waltid-services/waltid-wallet-api/gradle.properties b/waltid-services/waltid-wallet-api/gradle.properties deleted file mode 100644 index 7fc6f1ff2..000000000 --- a/waltid-services/waltid-wallet-api/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.code.style=official diff --git a/waltid-services/waltid-web3login-microservice/gradle.properties b/waltid-services/waltid-web3login-microservice/gradle.properties deleted file mode 100644 index 7fc6f1ff2..000000000 --- a/waltid-services/waltid-web3login-microservice/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.code.style=official diff --git a/waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.jar b/waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.properties b/waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e411586a5..000000000 --- a/waltid-services/waltid-web3login-microservice/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists From 194c9de547f95df199ea8bf1229d63cd9f8404be Mon Sep 17 00:00:00 2001 From: waltkb <68587968+waltkb@users.noreply.github.com> Date: Tue, 18 Feb 2025 00:42:12 +0100 Subject: [PATCH 5/6] Merge remote-tracking branch 'origin/fix-build' into fix-build --- .../src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt b/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt index 98cb33988..d3da39a58 100644 --- a/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt +++ b/waltid-libraries/waltid-did/src/jvmTest/kotlin/registrars/DidCheqdRegistrarTest.kt @@ -16,7 +16,7 @@ import kotlin.test.Ignore class DidCheqdRegistrarTest : DidRegistrarTestBase(DidCheqdRegistrar()) { - @Ignore + @Ignore // FIXME: CHEQD registrar returns "e.g. ..." instaed of actual secret @ParameterizedTest @MethodSource override fun `given did options with no key when register then returns a valid did result`( @@ -26,7 +26,7 @@ class DidCheqdRegistrarTest : DidRegistrarTestBase(DidCheqdRegistrar()) { super.`given did options with no key when register then returns a valid did result`(options, assert) } - @Ignore + @Ignore // FIXME: CHEQD registrar returns "e.g. ..." instaed of actual secret @ParameterizedTest @MethodSource override fun `given did options and key when register with key then returns a valid did result`( From 63b27f886f9872003c672f55f34839376cdd5ee9 Mon Sep 17 00:00:00 2001 From: waltkb <68587968+waltkb@users.noreply.github.com> Date: Tue, 18 Feb 2025 01:00:45 +0100 Subject: [PATCH 6/6] Update Gradle JVM version --- waltid-services/waltid-issuer-api/Dockerfile | 2 +- waltid-services/waltid-verifier-api/Dockerfile | 2 +- waltid-services/waltid-wallet-api/remotedb-only.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/waltid-services/waltid-issuer-api/Dockerfile b/waltid-services/waltid-issuer-api/Dockerfile index d81e2a269..40ad14ed4 100644 --- a/waltid-services/waltid-issuer-api/Dockerfile +++ b/waltid-services/waltid-issuer-api/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/gradle:jdk17 AS buildstage +FROM docker.io/gradle:jdk21 AS buildstage COPY gradle/ /work/gradle COPY settings.gradle.kts build.gradle.kts gradle.properties gradlew /work/ diff --git a/waltid-services/waltid-verifier-api/Dockerfile b/waltid-services/waltid-verifier-api/Dockerfile index 0a3503c1d..1b52bca16 100644 --- a/waltid-services/waltid-verifier-api/Dockerfile +++ b/waltid-services/waltid-verifier-api/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/gradle:jdk17 AS buildstage +FROM docker.io/gradle:jdk21 AS buildstage COPY gradle/ /work/gradle COPY settings.gradle.kts build.gradle.kts gradle.properties gradlew /work/ diff --git a/waltid-services/waltid-wallet-api/remotedb-only.Dockerfile b/waltid-services/waltid-wallet-api/remotedb-only.Dockerfile index 7bfcefea7..3ca251364 100644 --- a/waltid-services/waltid-wallet-api/remotedb-only.Dockerfile +++ b/waltid-services/waltid-wallet-api/remotedb-only.Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/gradle:jdk17 as buildstage +FROM docker.io/gradle:jdk21 as buildstage COPY gradle/ /work/gradle COPY settings.gradle.kts build.gradle.kts gradle.properties gradlew /work/