diff --git a/compose-app/src/commonMain/kotlin/xyz/xfqlittlefan/fhraise/ui/pages/root/SignIn.kt b/compose-app/src/commonMain/kotlin/xyz/xfqlittlefan/fhraise/ui/pages/root/SignIn.kt index bbabc5b..8a9557f 100644 --- a/compose-app/src/commonMain/kotlin/xyz/xfqlittlefan/fhraise/ui/pages/root/SignIn.kt +++ b/compose-app/src/commonMain/kotlin/xyz/xfqlittlefan/fhraise/ui/pages/root/SignIn.kt @@ -56,8 +56,8 @@ import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp -import fhraise.`compose-app`.generated.resources.Res -import fhraise.`compose-app`.generated.resources.fhraise_logo +import fhraise.compose_app.generated.resources.Res +import fhraise.compose_app.generated.resources.fhraise_logo import kotlinx.coroutines.launch import org.jetbrains.compose.resources.ExperimentalResourceApi import org.jetbrains.compose.resources.painterResource diff --git a/compose-app/src/desktopMain/kotlin/main.kt b/compose-app/src/desktopMain/kotlin/main.kt index 33a0ebe..7c684fe 100644 --- a/compose-app/src/desktopMain/kotlin/main.kt +++ b/compose-app/src/desktopMain/kotlin/main.kt @@ -27,8 +27,8 @@ import com.arkivanov.decompose.DefaultComponentContext import com.arkivanov.decompose.ExperimentalDecomposeApi import com.arkivanov.decompose.extensions.compose.lifecycle.LifecycleController import com.arkivanov.essenty.lifecycle.LifecycleRegistry -import fhraise.`compose-app`.generated.resources.Res -import fhraise.`compose-app`.generated.resources.fhraise_logo +import fhraise.compose_app.generated.resources.Res +import fhraise.compose_app.generated.resources.fhraise_logo import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map import kotlinx.coroutines.runBlocking diff --git a/server/src/main/kotlin/xyz/xfqlittlefan/fhraise/api/Auth.kt b/server/src/main/kotlin/xyz/xfqlittlefan/fhraise/api/Auth.kt index 41665d9..d088a93 100644 --- a/server/src/main/kotlin/xyz/xfqlittlefan/fhraise/api/Auth.kt +++ b/server/src/main/kotlin/xyz/xfqlittlefan/fhraise/api/Auth.kt @@ -159,7 +159,7 @@ private fun Route.apiAuthRequest() = rateLimit(rateLimitName) { when (req.type) { FhraiseToken, QrCode, SmsCode, EmailCode -> { - val code = appDatabase.queryOrGenerateVerificationCode(this, token.hashCode()) + val code = appDatabase.queryOrGenerateVerificationCode(application, token.hashCode()) if (body.dry) { call.respond(Api.Auth.Type.Request.ResponseBody.Success(token)) diff --git a/settings.gradle.kts b/settings.gradle.kts index d72d7d9..9c84498 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -38,4 +38,4 @@ dependencyResolutionManagement { include(":compose-app") include(":server") include(":shared") -include("keycloak-spi") +include(":keycloak-spi")