Apple Sign In signature for kid

dariopellegrini · Nov 22, 2021 · bef3d2e · bef3d2e
1 parent 1ac10a3
commit bef3d2e
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 28 deletions.
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/src/main/kotlin/com/dariopellegrini/kdone/application/Application.kt b/src/main/kotlin/com/dariopellegrini/kdone/application/Application.kt
@@ -43,6 +43,10 @@ fun Application.installKDone(mongoDatabase: MongoDatabase,
         header(HttpHeaders.AcceptLanguage)
         header("facebookToken")
         header("facebookId")
+        header("appleToken")
+        header("appleId")
+        header("googleToken")
+        header("googleId")
         exposeHeader(HttpHeaders.Authorization)
         allowNonSimpleContentTypes = true
         anyHost()
@@ -59,7 +63,7 @@ fun Application.installKDone(mongoDatabase: MongoDatabase,
             verifier {
                 jwtConfig.verifier
             }
-            realm = "kdone.dariopellegrini.com"
+            realm = jwtConfig.issuer
             validate { credentials ->
                 JWTValidator().validate(credentials)
             }

diff --git a/src/main/kotlin/com/dariopellegrini/kdone/auth/JWTConfig.kt b/src/main/kotlin/com/dariopellegrini/kdone/auth/JWTConfig.kt
@@ -6,7 +6,7 @@ import com.auth0.jwt.algorithms.Algorithm
 import java.util.*
 
 class JWTConfig(private val secret: String,
-                private val issuer: String = "kdone.com",
+                val issuer: String = "kdone.com",
                 private val validityInMs: Long? = null, // 100 hours
                 private val algorithm: Algorithm = Algorithm.HMAC512(secret)) {
 

diff --git a/src/main/kotlin/com/dariopellegrini/kdone/extensions/ApplicationCallExtensions.kt b/src/main/kotlin/com/dariopellegrini/kdone/extensions/ApplicationCallExtensions.kt
@@ -26,21 +26,22 @@ import kotlin.reflect.full.isSubclassOf
 import kotlin.reflect.jvm.javaField
 import kotlin.reflect.jvm.jvmErasure
 
-suspend inline fun <reified T: Any>ApplicationCall.receiveMap(): Map<String, Any> {
-    val inputMap = this.receive<Map<String, Any>>()
+suspend inline fun <reified T: Any>ApplicationCall.receiveMap(): Map<String, Any?> {
+    val inputMap = this.receive<Map<String, Any?>>()
     val kClass = T::class
     val propertiesMap = kClass.declaredMemberProperties.map {
         it.name to it
     }.toMap()
 
-    val resultMap = mutableMapOf<String, Any>()
+    val resultMap = mutableMapOf<String, Any?>()
 
     inputMap.forEach { entry ->
         val key = entry.key
         val value = entry.value
         val property = propertiesMap[key] ?: throw IOException("$key not found for class $kClass")
 
         when {
+            value == null -> resultMap[key] = null
             entry.value is Map<*, *> -> {
                 val element = ObjectMapper().configureForKDone().convertValue(entry.value, property.returnType.jvmErasure.java)
                 resultMap[key] = element
@@ -73,7 +74,7 @@ suspend inline fun <reified T: Any>ApplicationCall.receiveMap(): Map<String, Any
 suspend inline fun <reified T: Any>ApplicationCall.receiveMultipartMap(
     uploader: Uploader,
     addUnknown: List<String> = listOf(),
-    beforeUpload: (Map<String, Any>) -> Unit = {}): Map<String, Any> {
+    beforeUpload: (Map<String, Any>) -> Unit = {}): Map<String, Any?> {
 
     val parts = this@receiveMultipartMap.receiveMultipart().readAllParts()
 
@@ -152,13 +153,13 @@ suspend inline fun <reified T: Any>ApplicationCall.receiveMultipartMap(
     return resultMap
 }
 
-suspend fun <T: Any>ApplicationCall.receiveMap(kClass: KClass<T>): Map<String, Any> {
+suspend fun <T: Any>ApplicationCall.receiveMap(kClass: KClass<T>): Map<String, Any?> {
     val inputMap = this.receive<Map<String, Any>>()
     val propertiesMap = kClass.declaredMemberProperties.map {
         it.name to it
     }.toMap()
 
-    val resultMap = mutableMapOf<String, Any>()
+    val resultMap = mutableMapOf<String, Any?>()
 
     inputMap.forEach { entry ->
         val key = entry.key
@@ -167,6 +168,7 @@ suspend fun <T: Any>ApplicationCall.receiveMap(kClass: KClass<T>): Map<String, A
 
 
         when {
+            value == null -> resultMap[key] = null
             entry.value is Map<*, *> -> {
                 val element = ObjectMapper().configureForKDone().convertValue(entry.value, property.returnType.jvmErasure.java)
                 resultMap[key] = element

diff --git a/src/main/kotlin/com/dariopellegrini/kdone/extensions/MapExtensions.kt b/src/main/kotlin/com/dariopellegrini/kdone/extensions/MapExtensions.kt
@@ -4,7 +4,7 @@ import com.dariopellegrini.kdone.exceptions.MapCheckException
 import kotlin.reflect.full.memberProperties
 import kotlin.reflect.jvm.jvmErasure
 
-inline fun <reified T: Any> Map<String, Any>.checkWithType() {
+inline fun <reified T: Any> Map<String, Any?>.checkWithType() {
     val kClass = T::class
     val parametersMap = kClass.memberProperties.associateBy { it.name }
     this.forEach {
@@ -13,6 +13,6 @@ inline fun <reified T: Any> Map<String, Any>.checkWithType() {
         val value = entry.value
         val property = parametersMap[key] ?: throw MapCheckException("Parameter $key is not present $kClass")
 
-        if (property.returnType.jvmErasure != value::class) throw MapCheckException("Parameter $key is not compatible with $kClass")
+        if (value != null && property.returnType.jvmErasure != value::class) throw MapCheckException("Parameter $key is not compatible with $kClass")
     }
-}
+}
diff --git a/src/main/kotlin/com/dariopellegrini/kdone/routes/Module.kt b/src/main/kotlin/com/dariopellegrini/kdone/routes/Module.kt
@@ -398,7 +398,7 @@ inline fun <reified T : Any>Route.module(endpoint: String,
                 }
                 webSocketController?.update(updatedElement, call.userAuthOrNull)
             } catch (e: Exception) {
-                call.respondWithException(e)
+//                call.respondWithException(e)
                 configuration.exceptionHandler?.invoke(call, e)
             }
         }

diff --git a/src/main/kotlin/com/dariopellegrini/kdone/routes/RouteConfiguration.kt b/src/main/kotlin/com/dariopellegrini/kdone/routes/RouteConfiguration.kt
@@ -24,8 +24,8 @@ class RouteConfiguration<T: Any> {
     var beforeGet: (suspend (ApplicationCall, Map<String, Any>) -> Unit)? = null
     var afterGet: (suspend (ApplicationCall, Map<String, Any>, List<T>) -> Unit)? = null
 
-    var beforeUpdate: (suspend (ApplicationCall, Id<T>, Map<String, Any>) -> Unit)? = null
-    var afterUpdate: (suspend (ApplicationCall, Map<String, Any>, T) -> Unit)? = null
+    var beforeUpdate: (suspend (ApplicationCall, Id<T>, Map<String, Any?>) -> Unit)? = null
+    var afterUpdate: (suspend (ApplicationCall, Map<String, Any?>, T) -> Unit)? = null
 
     var beforeDelete: (suspend (ApplicationCall, Id<T>) -> Unit)? = null
     var afterDelete: (suspend (ApplicationCall, DeleteResult) -> Unit)? = null
@@ -76,11 +76,11 @@ class RouteConfiguration<T: Any> {
         afterGet = closure
     }
 
-    fun beforeUpdate(closure: suspend (ApplicationCall, Id<T>, Map<String, Any>) -> Unit) {
+    fun beforeUpdate(closure: suspend (ApplicationCall, Id<T>, Map<String, Any?>) -> Unit) {
         beforeUpdate = closure
     }
 
-    fun afterUpdate(closure: suspend (ApplicationCall, Map<String, Any>, T) -> Unit) {
+    fun afterUpdate(closure: suspend (ApplicationCall, Map<String, Any?>, T) -> Unit) {
         afterUpdate = closure
     }
 

diff --git a/src/main/kotlin/com/dariopellegrini/kdone/startup/Startup.kt b/src/main/kotlin/com/dariopellegrini/kdone/startup/Startup.kt
@@ -6,6 +6,7 @@ import com.mongodb.ConnectionString
 import com.mongodb.MongoClientSettings
 import com.mongodb.client.MongoDatabase
 import com.mongodb.connection.SslSettings
+import io.ktor.features.*
 import io.ktor.routing.Route
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.netty.Netty
@@ -37,12 +38,12 @@ fun startKDone(port: Int,
                jwtConfig: JWTConfig,
                closure: Route.() -> Unit) {
     embeddedServer(Netty, port) {
-        val settings = MongoClientSettings.builder()
-            .applyConnectionString(ConnectionString(mongoURL))
-            .applyToSslSettings {
-                    builder: SslSettings.Builder -> builder.enabled(true).invalidHostNameAllowed(true)
-            }
-            .build()
+//        val settings = MongoClientSettings.builder()
+//            .applyConnectionString(ConnectionString(mongoURL))
+//            .applyToSslSettings {
+//                    builder: SslSettings.Builder -> builder.enabled(true).invalidHostNameAllowed(true)
+//            }
+//            .build()
         val client = KMongo.createClient(mongoURL)
         installKDone(client.getDatabase(databaseName),
             jwtConfig,

diff --git a/src/main/kotlin/com/dariopellegrini/kdone/user/UserModule.kt b/src/main/kotlin/com/dariopellegrini/kdone/user/UserModule.kt
@@ -482,7 +482,7 @@ inline fun <reified T : KDoneUser>Route.userModule(endpoint: String = "users",
                 if (!configuration.authorization.checkOwner(update)) throw NotAuthorizedException()
                 call.checkToken(this@authenticate.database)
 
-                val patch: Map<String, Any> = if (call.request.isMultipart()) {
+                val patch: Map<String, Any?> = if (call.request.isMultipart()) {
                     val uploader = configuration.uploader ?: throw ServerException(500, "Uploader not configured")
                     call.receiveMultipartMap<T>(uploader) { map ->
                         ownerForbiddenAttributes.forEach {

diff --git a/src/main/kotlin/com/dariopellegrini/kdone/user/UserRouteConfiguration.kt b/src/main/kotlin/com/dariopellegrini/kdone/user/UserRouteConfiguration.kt
@@ -37,8 +37,8 @@ open class UserRouteConfiguration<T: KDoneUser> {
     var beforeGet: (suspend (ApplicationCall, Map<String, Any>) -> Unit)? = null
     var afterGet: (suspend (ApplicationCall, Map<String, Any>, List<T>) -> Unit)? = null
 
-    var beforeUpdate: (suspend (ApplicationCall, Id<T>, Map<String, Any>) -> Unit)? = null
-    var afterUpdate: (suspend (ApplicationCall, Map<String, Any>, T) -> Unit)? = null
+    var beforeUpdate: (suspend (ApplicationCall, Id<T>, Map<String, Any?>) -> Unit)? = null
+    var afterUpdate: (suspend (ApplicationCall, Map<String, Any?>, T) -> Unit)? = null
 
     var beforeDelete: (suspend (ApplicationCall, Id<T>) -> Unit)? = null
     var afterDelete: (suspend (ApplicationCall, DeleteResult) -> Unit)? = null
@@ -116,11 +116,11 @@ open class UserRouteConfiguration<T: KDoneUser> {
         afterGet = closure
     }
 
-    fun beforeUpdate(closure: suspend (ApplicationCall, Id<T>, Map<String, Any>) -> Unit) {
+    fun beforeUpdate(closure: suspend (ApplicationCall, Id<T>, Map<String, Any?>) -> Unit) {
         beforeUpdate = closure
     }
 
-    fun afterUpdate(closure: suspend (ApplicationCall, Map<String, Any>, T) -> Unit) {
+    fun afterUpdate(closure: suspend (ApplicationCall, Map<String, Any?>, T) -> Unit) {
         afterUpdate = closure
     }
 

diff --git a/src/main/kotlin/com/dariopellegrini/kdone/user/social/apple/AppleModule.kt b/src/main/kotlin/com/dariopellegrini/kdone/user/social/apple/AppleModule.kt
@@ -136,7 +136,8 @@ suspend fun checkAppleToken(appleToken: String, appleId: String, bundleId: Strin
 
         override fun getPublicKeyById(kid: String): RSAPublicKey {
             val provider = UrlJwkProvider("https://appleid.apple.com/auth/keys/")
-            val jwk = provider.all.first()
+            val list = provider.all
+            val jwk = list.first { it.id == kid }
             return jwk.publicKey as RSAPublicKey
         }
     }