refactor: handle auth exceptions better, with an InvalidCredentialsException

Author: jwilkinson87

src/main/kotlin/com/ctrlhub/core/Api.kt

@@ -1,7 +1,7 @@
 package com.ctrlhub.core
 
 import com.ctrlhub.core.api.KtorApiClient
-import com.ctrlhub.core.router.AuthRouter
+import com.ctrlhub.core.auth.AuthRouter
 
 class Api private constructor(apiClient: KtorApiClient) {
     val auth: AuthRouter = AuthRouter(apiClient)

src/main/kotlin/com/ctrlhub/core/api/KtorApiClient.kt

@@ -57,7 +57,10 @@ class KtorApiClient private constructor(val httpClient: HttpClient) {
     ): HttpResponse {
         return httpClient.post(url) {
             headers?.forEach { (key, value) -> header(key, value) }
-            body?.let { setBody(Json.encodeToString<T>(it)) }
+            body?.let {
+                val jsonBody = Json.encodeToString<T>(it)
+                setBody(jsonBody)
+            }
         }
     }
 

src/main/kotlin/com/ctrlhub/core/router/AuthRouter.kt renamed to src/main/kotlin/com/ctrlhub/core/auth/AuthRouter.kt

@@ -1,14 +1,16 @@
-package com.ctrlhub.core.router
+package com.ctrlhub.core.auth
 
 import com.ctrlhub.core.Config
 import com.ctrlhub.core.api.ApiClientException
 import com.ctrlhub.core.api.ApiException
 import com.ctrlhub.core.api.KtorApiClient
-import com.ctrlhub.core.api.payload.auth.LoginPayload
-import com.ctrlhub.core.api.response.auth.AuthFlowResponse
-import com.ctrlhub.core.api.response.auth.CompleteResponse
-import io.ktor.client.call.*
+import com.ctrlhub.core.auth.payload.LoginPayload
+import com.ctrlhub.core.auth.response.AuthFlowResponse
+import com.ctrlhub.core.auth.response.CompleteResponse
+import com.ctrlhub.core.router.Router
+import io.ktor.client.call.body
 import io.ktor.client.plugins.ClientRequestException
+import io.ktor.http.HttpStatusCode
 
 class AuthRouter(apiClient: KtorApiClient) : Router(apiClient = apiClient) {
     suspend fun initiate(): AuthFlowResponse {
@@ -25,6 +27,13 @@ class AuthRouter(apiClient: KtorApiClient) : Router(apiClient = apiClient) {
         return try {
             apiClient.post(url = "${Config.authBaseUrl}/self-service/login?flow=$flowId", body = payload).body()
         } catch (e: ClientRequestException) {
+            if (e.response.status == HttpStatusCode.BadRequest) {
+                val bodyAsString: String = e.response.body()
+                if (bodyAsString.contains("credentials are invalid")) {
+                    throw InvalidCredentialsException()
+                }
+            }
+
             throw ApiClientException("Failed to complete auth", e.response, e)
         } catch (e: Exception) {
             throw ApiException("Failed to complete auth", e)

src/main/kotlin/com/ctrlhub/core/auth/InvalidCredentialsException.kt

@@ -0,0 +1,3 @@
+package com.ctrlhub.core.auth
+
+class InvalidCredentialsException: Exception()

src/main/kotlin/com/ctrlhub/core/api/payload/auth/AuthPayloads.kt renamed to src/main/kotlin/com/ctrlhub/core/auth/payload/AuthPayloads.kt

@@ -1,4 +1,4 @@
-package com.ctrlhub.core.api.payload.auth
+package com.ctrlhub.core.auth.payload
 
 import kotlinx.serialization.Serializable
 

src/main/kotlin/com/ctrlhub/core/api/response/auth/AuthResponses.kt renamed to src/main/kotlin/com/ctrlhub/core/auth/response/AuthResponses.kt

@@ -1,4 +1,4 @@
-package com.ctrlhub.core.api.response.auth
+package com.ctrlhub.core.auth.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

src/test/kotlin/com/ctrlhub/core/router/AuthRouterTest.kt

@@ -2,7 +2,8 @@ package com.ctrlhub.core.router
 
 import com.ctrlhub.core.api.ApiException
 import com.ctrlhub.core.api.KtorApiClient
-import com.ctrlhub.core.api.payload.auth.LoginPayload
+import com.ctrlhub.core.auth.payload.LoginPayload
+import com.ctrlhub.core.auth.AuthRouter
 import io.ktor.client.*
 import io.ktor.client.engine.mock.*
 import io.ktor.http.*