Dynamo add fix

lightningkite · Oct 9, 2023 · 33a7cdc · 33a7cdc
1 parent 605208e
commit 33a7cdc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/demo/src/main/kotlin/Server.kt b/demo/src/main/kotlin/Server.kt
@@ -246,7 +246,7 @@ object Server : ServerPathGroup(ServerPath.root) {
     val proofEmail = EmailProofEndpoints(path("proof/email"), pins, email, { to, pin ->
         Email(
             subject = "Log In Code",
-            to = listOf(),
+            to = listOf(EmailLabeledValue(to)),
             plainText = "Your PIN is $pin."
         )
     })

diff --git a/server-dynamodb/src/main/kotlin/com/lightningkite/lightningserver/db/DynamoDbCache.kt b/server-dynamodb/src/main/kotlin/com/lightningkite/lightningserver/db/DynamoDbCache.kt
@@ -159,10 +159,11 @@ class DynamoDbCache(val makeClient: () -> DynamoDbAsyncClient, val tableName: St
         client.updateItem {
             it.tableName(tableName)
             it.key(mapOf("key" to AttributeValue.fromS(key)))
-            it.updateExpression("SET #exp = :exp, #v = #v + :v")
+            it.updateExpression("SET #exp = :exp, #v = if_not_exists(#v, :z) + :v")
             it.expressionAttributeNames(mapOf("#v" to "value", "#exp" to "expiration"))
             it.expressionAttributeValues(
                 mapOf(
+                    ":z" to AttributeValue.fromN("0"),
                     ":v" to AttributeValue.fromN(value.toString()),
                     ":exp" to (timeToLive?.let { AttributeValue.fromN(now().plus(it).epochSeconds.toString()) }
                         ?: AttributeValue.fromNul(true))

diff --git a/server-testing/src/main/kotlin/com/lightningkite/lightningserver/cache/CacheTest.kt b/server-testing/src/main/kotlin/com/lightningkite/lightningserver/cache/CacheTest.kt
@@ -35,6 +35,9 @@ abstract class CacheTest {
             cache.remove(key)
             assertTrue(cache.modify<Int>(key) { it?.plus(1) ?: 0 })
             assertEquals(0, cache.get<Int>(key))
+
+            cache.remove(key)
+            cache.add(key, 1)
         }
     }
 

diff --git a/server-testing/src/test/kotlin/com/lightningkite/lightningserver/TestSettings.kt b/server-testing/src/test/kotlin/com/lightningkite/lightningserver/TestSettings.kt
@@ -2,6 +2,7 @@ package com.lightningkite.lightningserver
 
 import com.lightningkite.lightningdb.collection
 import com.lightningkite.lightningdb.test.User
+import com.lightningkite.lightningserver.auth.JwtSigner
 import com.lightningkite.lightningserver.auth.authOptions
 import com.lightningkite.lightningserver.auth.oauth.OauthProviderCredentials
 import com.lightningkite.lightningserver.auth.oauth.OauthProviderCredentialsApple
@@ -33,6 +34,7 @@ object TestSettings {
     val sms = setting("sms", SMSSettings("test"))
     val cache = setting("cache", CacheSettings())
     val files = setting("files", FilesSettings())
+    val jwtSigner = setting("jwtSigner", JwtSigner())
     val oauthGoogle = setting<OauthProviderCredentials?>("oauth_google", null)
     val oauthApple = setting<OauthProviderCredentialsApple?>("oauth_apple", null)
     val oauthGithub = setting<OauthProviderCredentials?>("oauth_github", null)
@@ -47,7 +49,7 @@ object TestSettings {
     )
     val emailAccess: UserEmailAccess<User, UUID> = info.userEmailAccess { User(email = it, phoneNumber = it) }
     val path = ServerPath("auth")
-    val baseAuth = BaseAuthEndpoints(path, emailAccess, 1.hours, 5.minutes)
+    val baseAuth = BaseAuthEndpoints(path, emailAccess, jwtSigner, 1.hours, 5.minutes)
     val emailAuth = EmailAuthEndpoints(baseAuth, emailAccess, cache, email)
 
     init {

diff --git a/server-testing/src/test/kotlin/com/lightningkite/lightningserver/auth/SmsAuthTest.kt b/server-testing/src/test/kotlin/com/lightningkite/lightningserver/auth/SmsAuthTest.kt
@@ -40,7 +40,7 @@ class SmsAuthTest {
         )
         val phoneAccess: UserPhoneAccess<User, UUID> = info.userPhoneAccess { User(email = "$it@phone", phoneNumber = it) }
         val path = ServerPath("auth")
-        val baseAuth = BaseAuthEndpoints(path, phoneAccess, expiration = 1.hours, emailExpiration = 5.minutes)
+        val baseAuth = BaseAuthEndpoints(path, phoneAccess, TestSettings.jwtSigner, expiration = 1.hours, emailExpiration = 5.minutes)
         val phoneAuth = SmsAuthEndpoints(baseAuth, phoneAccess, TestSettings.cache, TestSettings.sms)
         runBlocking {
             phoneAuth.loginSms.implementation(AuthAndPathParts(null, null, arrayOf()), "8013693729")
@@ -65,7 +65,7 @@ class SmsAuthTest {
         )
         val phoneAccess: UserPhoneAccess<User, UUID> = info.userPhoneAccess { User(email = "$it@phone", phoneNumber = it) }
         val path = ServerPath("auth")
-        val baseAuth = BaseAuthEndpoints(path, phoneAccess, expiration = 1.hours, emailExpiration = 5.minutes)
+        val baseAuth = BaseAuthEndpoints(path, phoneAccess, TestSettings.jwtSigner, expiration = 1.hours, emailExpiration = 5.minutes)
         val phoneAuth = SmsAuthEndpoints(baseAuth, phoneAccess, TestSettings.cache, TestSettings.sms)
         runBlocking {
             phoneAuth.loginSms.implementation(AuthAndPathParts(null, null, arrayOf()), "8013693729")

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -26,7 +26,7 @@ kotlin {
     js(IR) {
         browser()
     }
-//    ios()
+    ios()
 //    androidTarget()
 
     sourceSets {