introduce JWT class for easier parsing of idToken

Author: angryziber

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.6.5
+* oauth: AppleOAuthClient updated and tested
+* oauth: JWT helper class introduced
+
 # 1.6.4
 * core: added common value types for Email, Phone, and Password, also StringValue base class
 * jdbc: introduced db.insertBatch()

oauth/src/JWT.kt

@@ -0,0 +1,10 @@
+package klite.oauth
+
+import klite.base64Decode
+
+data class JWT(val token: String) {
+  private val parts = token.split(".").map { it.base64Decode().decodeToString() }
+  val header get() = parts[0]
+  val payload get() = parts[1]
+  val signature get() = parts[2]
+}

oauth/src/OAuthClient.kt

@@ -112,10 +112,7 @@ class AppleOAuthClient(httpClient: HttpClient): OAuthClient(
   httpClient
 ) {
   override suspend fun profile(token: OAuthTokenResponse, exchange: HttpExchange): UserProfile {
-    val email = token.idToken!!.let {
-      val payload = it.split(".")[1]
-      http.json.parse<JsonNode>(payload.base64Decode().decodeToString()).getString("email")
-    }
+    val email = http.json.parse<JsonNode>(token.idToken!!.payload).getString("email")
     val user = exchange.bodyParams["user"]?.let { http.json.parse<AppleUserProfile>(it.toString()) }
     return UserProfile(provider, email, Email(email), user?.name?.firstName ?: email.substringBefore("@").capitalize(), user?.name?.lastName ?: "")
   }
@@ -124,5 +121,5 @@ class AppleOAuthClient(httpClient: HttpClient): OAuthClient(
   data class AppleUserName(val firstName: String, val lastName: String)
 }
 
-data class OAuthTokenResponse(val accessToken: String, val expiresIn: Int, val scope: String? = null, val tokenType: String? = null, val idToken: String? = null, val refreshToken: String? = null)
+data class OAuthTokenResponse(val accessToken: String, val expiresIn: Int, val scope: String? = null, val tokenType: String? = null, val idToken: JWT? = null, val refreshToken: String? = null)
 data class UserProfile(val provider: String, override val id: String, override val email: Email, override val firstName: String, override val lastName: String, val avatarUrl: URI? = null, val locale: Locale? = null): OAuthUser

oauth/src/OAuthRoutes.kt

@@ -30,7 +30,7 @@ open class OAuthRoutes(private val userProvider: OAuthUserProvider, registry: Re
 
     val client = client(provider)
     val token = client.authenticate(code, e.fullUrl(e.path))
-    var profile = client.profile(token)
+    var profile = client.profile(token, e)
     if (profile.locale == null) profile = profile.copy(locale = Locale.forLanguageTag(e.lang))
 
     val user = userProvider.provide(profile, token, e)

oauth/test/OAuthRoutesTest.kt

@@ -24,7 +24,7 @@ class OAuthRoutesTest {
   val oauthClient = mockk<OAuthClient> {
     every { provider } returns user.provider
     coEvery { authenticate("code", any()) } returns token
-    coEvery { profile(token) } returns user
+    coEvery { profile(token, exchange) } returns user
   }
   val userProvder = mockk<OAuthUserProvider>()
   val registry = mockk<Registry> {