Fix HTTPS (#591)

Co-authored-by: hfhbd <[email protected]>
hfhbd · Jul 27, 2022 · efb0297 · efb0297
1 parent 1f8d0d9
commit efb0297
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -52,6 +52,7 @@ dependencies {
     implementation("io.ktor:ktor-server-resources:$ktor")
     implementation("io.ktor:ktor-server-content-negotiation:$ktor")
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor")
+    implementation("io.ktor:ktor-server-forwarded-header:$ktor")
 
     // Apache 2, https://github.com/hfhbd/cloudkitclient/releases/latest
     implementation("app.softwork:cloudkitclient-core:0.1.0")

diff --git a/backend/src/main/kotlin/app/softwork/composetodo/main.kt b/backend/src/main/kotlin/app/softwork/composetodo/main.kt
@@ -7,6 +7,7 @@ import io.ktor.server.application.*
 import io.ktor.server.cio.*
 import io.ktor.server.engine.*
 import io.ktor.server.plugins.cors.routing.*
+import io.ktor.server.plugins.forwardedheaders.*
 import org.slf4j.*
 import java.util.*
 import kotlin.reflect.*
@@ -31,6 +32,7 @@ fun main() {
             allowMethod(HttpMethod.Delete)
             allowMethod(HttpMethod.Put)
         }
+        install(XForwardedHeaders)
         TodoModule(db = db, jwtProvider = jwtProvider)
     }.start(wait = true)
 }

diff --git a/clients/build.gradle.kts b/clients/build.gradle.kts
@@ -28,7 +28,7 @@ kotlin {
                 export(projects.shared)
                 export("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
                 export("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
-                export("app.softwork:kotlinx-uuid-core:0.0.15")
+                export("app.softwork:kotlinx-uuid-core:0.0.16-sqldelight2a03")
                 embedBitcode = BitcodeEmbeddingMode.DISABLE
             }
         }
@@ -51,7 +51,7 @@ kotlin {
             dependencies {
                 api(projects.shared)
                 implementation("app.cash.sqldelight:coroutines-extensions:$sqlDelight")
-                implementation("app.softwork:kotlinx-uuid-sqldelight:0.0.15")
+                implementation("app.softwork:kotlinx-uuid-sqldelight:0.0.16-sqldelight2a03")
 
                 api("io.ktor:ktor-client-logging:$ktor")
             }

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -27,7 +27,7 @@ kotlin {
                 api("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
                 // Apache 2, https://github.com/hfhbd/kotlinx-uuid/releases
-                api("app.softwork:kotlinx-uuid-core:0.0.15")
+                api("app.softwork:kotlinx-uuid-core:0.0.16-sqldelight2a03")
 
                 // Apache 2, https://github.com/ktorio/ktor/releases/latest
                 val ktor = "2.0.3"

diff --git a/shared/src/commonMain/kotlin/app/softwork/composetodo/API.kt b/shared/src/commonMain/kotlin/app/softwork/composetodo/API.kt
@@ -65,7 +65,7 @@ public sealed interface API {
         @Throws(IOException::class, CancellationException::class)
         public suspend fun silentLogin(): LoggedIn? {
             val response = client.get(RefreshToken())
-            return if (response.status == HttpStatusCode.BadRequest) {
+            return if (response.status == HttpStatusCode.BadRequest || response.status == HttpStatusCode.Unauthorized) {
                 null
             } else {
                 LoggedIn(response.body(), client)