diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b9585c1..de63e7f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ ktlint-version = "14.2.0" detekt-version = "1.23.8" kotlin-serialization = "1.11.0" koin-version = "4.2.2" -wire-sdk-version = "0.0.18" +wire-sdk-version = "0.2.0" redis-version = "6.7.1.RELEASE" mustache-version = "0.9.14" mockk-version = "1.14.11" diff --git a/src/main/kotlin/com/wire/github/EventsHandler.kt b/src/main/kotlin/com/wire/github/EventsHandler.kt index 7816463..60b6703 100644 --- a/src/main/kotlin/com/wire/github/EventsHandler.kt +++ b/src/main/kotlin/com/wire/github/EventsHandler.kt @@ -4,7 +4,7 @@ import com.wire.github.util.ENV_VAR_HOST import com.wire.github.util.SessionIdentifierGenerator import com.wire.github.util.toStorageKey import com.wire.sdk.WireEventsHandlerSuspending -import com.wire.sdk.model.ConversationData +import com.wire.sdk.model.Conversation import com.wire.sdk.model.ConversationMember import com.wire.sdk.model.QualifiedId import com.wire.sdk.model.WireMessage @@ -43,7 +43,7 @@ class EventsHandler : WireEventsHandlerSuspending() { } override suspend fun onAppAddedToConversation( - conversation: ConversationData, + conversation: Conversation, members: List ) { logger.info( diff --git a/src/main/kotlin/com/wire/github/config/Modules.kt b/src/main/kotlin/com/wire/github/config/Modules.kt index 6625e4e..6d3c13e 100644 --- a/src/main/kotlin/com/wire/github/config/Modules.kt +++ b/src/main/kotlin/com/wire/github/config/Modules.kt @@ -4,12 +4,13 @@ import com.wire.github.EventsHandler import com.wire.github.util.ENV_VAR_API_HOST import com.wire.github.util.ENV_VAR_API_TOKEN import com.wire.github.util.ENV_VAR_APPLICATION_ID -import com.wire.github.util.ENV_VAR_CRYPTOGRAPHY_STORAGE_PASSWORD +import com.wire.github.util.ENV_VAR_CRYPTOGRAPHY_STORAGE_KEY import com.wire.github.util.ENV_VAR_REDIS_HOST import com.wire.github.util.ENV_VAR_REDIS_PORT import com.wire.github.util.SignatureValidator import com.wire.github.util.TemplateHandler import com.wire.sdk.WireAppSdk +import io.ktor.utils.io.core.toByteArray import io.lettuce.core.RedisClient import io.lettuce.core.api.StatefulRedisConnection import org.koin.dsl.module @@ -31,6 +32,6 @@ private fun wireAppSdk(): WireAppSdk = applicationId = ENV_VAR_APPLICATION_ID, apiToken = ENV_VAR_API_TOKEN, apiHost = ENV_VAR_API_HOST, - cryptographyStoragePassword = ENV_VAR_CRYPTOGRAPHY_STORAGE_PASSWORD, + cryptographyStorageKey = ENV_VAR_CRYPTOGRAPHY_STORAGE_KEY.toByteArray(), wireEventsHandler = EventsHandler() ) diff --git a/src/main/kotlin/com/wire/github/util/EnvironmentVariables.kt b/src/main/kotlin/com/wire/github/util/EnvironmentVariables.kt index ef197e9..ac924b8 100644 --- a/src/main/kotlin/com/wire/github/util/EnvironmentVariables.kt +++ b/src/main/kotlin/com/wire/github/util/EnvironmentVariables.kt @@ -95,5 +95,5 @@ val ENV_VAR_API_HOST: String = System * If lost or forgotten, there is no future access to the database. * Must be exactly 32 characters */ -val ENV_VAR_CRYPTOGRAPHY_STORAGE_PASSWORD: String = System +val ENV_VAR_CRYPTOGRAPHY_STORAGE_KEY: String = System .getenv("WIRE_SDK_CRYPTOGRAPHY_STORAGE_PASSWORD")