Refactor sample app

oidc-appsupport/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/CodeAuthFlowFactory.kt

@@ -4,7 +4,6 @@ import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.flows.CodeAuthFlow
 import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
 import kotlin.experimental.ExperimentalObjCRefinement
-import kotlin.native.HiddenFromObjC
 
 @OptIn(ExperimentalObjCRefinement::class)
 interface CodeAuthFlowFactory {

oidc-appsupport/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.kt

@@ -1,15 +1,12 @@
 package org.publicvalue.multiplatform.oidc.appsupport
 
-import io.ktor.http.Url
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.OpenIdConnectException
 import org.publicvalue.multiplatform.oidc.flows.CodeAuthFlow
 import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
 import org.publicvalue.multiplatform.oidc.preferences.Preferences
 import org.publicvalue.multiplatform.oidc.types.AuthCodeRequest
 import org.publicvalue.multiplatform.oidc.types.EndSessionRequest
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.contract
 
 expect class PlatformCodeAuthFlow: CodeAuthFlow, EndSessionFlow {
     override suspend fun startLoginFlow(request: AuthCodeRequest)
@@ -18,26 +15,6 @@ expect class PlatformCodeAuthFlow: CodeAuthFlow, EndSessionFlow {
     override val preferences: Preferences
 }
 
-@OptIn(ExperimentalContracts::class)
-internal fun <T> getErrorResult(responseUri: Url?): Result<T>? {
-    contract { returns(null) implies (responseUri != null) }
-    if (responseUri != null) {
-        if (responseUri.parameters.contains("error")) {
-            // error
-            return Result.failure(
-                OpenIdConnectException.AuthenticationFailure(
-                    message = responseUri.parameters.get(
-                        "error"
-                    ) ?: ""
-                )
-            )
-        }
-    } else {
-        return Result.failure(OpenIdConnectException.AuthenticationFailure(message = "No Uri in callback from browser (was ${responseUri})."))
-    }
-    return null
-}
-
 internal fun throwAuthenticationIfCancelled(result: WebAuthenticationFlowResult) {
     if (result is WebAuthenticationFlowResult.Cancelled) {
         throw OpenIdConnectException.AuthenticationCancelled()

oidc-appsupport/src/iosMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.ios.kt

@@ -2,10 +2,8 @@ package org.publicvalue.multiplatform.oidc.appsupport
 
 import kotlinx.coroutines.CancellableContinuation
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
-import org.publicvalue.multiplatform.oidc.OpenIdConnectException
 import org.publicvalue.multiplatform.oidc.flows.CodeAuthFlow
 import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
-import org.publicvalue.multiplatform.oidc.flows.EndSessionResponse
 import org.publicvalue.multiplatform.oidc.preferences.Preferences
 import org.publicvalue.multiplatform.oidc.types.AuthCodeRequest
 import org.publicvalue.multiplatform.oidc.types.EndSessionRequest

oidc-appsupport/src/jvmMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.jvm.kt

@@ -1,12 +1,12 @@
 package org.publicvalue.multiplatform.oidc.appsupport
 
-import io.ktor.http.*
+import io.ktor.http.Url
+import io.ktor.http.toURI
 import org.publicvalue.multiplatform.oidc.ExperimentalOpenIdConnect
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.OpenIdConnectException
 import org.publicvalue.multiplatform.oidc.flows.CodeAuthFlow
 import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
-import org.publicvalue.multiplatform.oidc.flows.EndSessionResponse
 import org.publicvalue.multiplatform.oidc.preferences.Preferences
 import org.publicvalue.multiplatform.oidc.types.AuthCodeRequest
 import org.publicvalue.multiplatform.oidc.types.EndSessionRequest

oidc-appsupport/src/wasmJsMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.wasmJs.kt

@@ -4,7 +4,6 @@ import org.publicvalue.multiplatform.oidc.ExperimentalOpenIdConnect
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.flows.CodeAuthFlow
 import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
-import org.publicvalue.multiplatform.oidc.flows.EndSessionResponse
 import org.publicvalue.multiplatform.oidc.preferences.Preferences
 import org.publicvalue.multiplatform.oidc.types.AuthCodeRequest
 import org.publicvalue.multiplatform.oidc.types.EndSessionRequest

oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/OpenIdConnectException.kt

@@ -15,7 +15,7 @@ sealed class OpenIdConnectException(
 
     data class InvalidUrl(val url: String?, override val cause: Throwable? = null): OpenIdConnectException(message = "Invalid URL: $url", cause = cause)
     data class AuthenticationFailure(override val message: String, override val cause: Throwable? = null): OpenIdConnectException(message = "Authentication failed. $message", cause = cause)
-    data class AuthenticationCancelled(override val message: String = "Authentication cancelled"): OpenIdConnectException(message = "Authentication cancelled", cause = null)
+    data class AuthenticationCancelled(override val message: String = "Authentication cancelled"): OpenIdConnectException(message = message, cause = null)
     data class UnsuccessfulTokenRequest(
         override val message: String,
         val statusCode: HttpStatusCode,

oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/flows/AuthCodeResult.kt

@@ -8,7 +8,6 @@ import kotlin.experimental.ExperimentalObjCName
 import kotlin.native.ObjCName
 
 typealias AuthCodeResponse = Result<AuthCodeResult>
-typealias EndSessionResponse = Result<Unit>
 
 /**
  * Result of an Auth Code Request

oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/flows/CodeAuthFlow.kt

@@ -5,7 +5,6 @@ import io.ktor.http.URLBuilder
 import io.ktor.http.Url
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.OpenIdConnectException
-import org.publicvalue.multiplatform.oidc.getError
 import org.publicvalue.multiplatform.oidc.preferences.Preferences
 import org.publicvalue.multiplatform.oidc.preferences.clearOidcPreferences
 import org.publicvalue.multiplatform.oidc.preferences.getAuthRequest
@@ -61,6 +60,7 @@ interface CodeAuthFlow {
      * Should return the Authorization Code.
      */
     @Throws(CancellationException::class, OpenIdConnectException::class)
+    @Suppress("unused")
     suspend fun getAuthorizationCode(request: AuthCodeRequest): AuthCodeResponse {
         return try {
             preferences.setAuthRequest(request)

oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/preferences/Preferences.kt

@@ -44,12 +44,12 @@ suspend fun Preferences.clearOidcPreferences() {
 }
 
 inline fun <reified T> Json.decodeFromStringOrNull(string: String): T? {
-    try {
-        return Json.decodeFromString<T>(string)
+    return try {
+        Json.decodeFromString<T>(string)
     } catch (e: Exception) {
         when (e) {
             is SerializationException, is IllegalArgumentException -> {
-                return null
+                null
             }
             else -> throw e
         }

oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/types/remote/AccessTokenResponse.kt

@@ -15,7 +15,7 @@ import kotlin.time.ExperimentalTime
 @OptIn(ExperimentalObjCName::class, ExperimentalTime::class)
 @Serializable
 @ObjCName(swiftName = "AccessTokenResponse", name = "AccessTokenResponse", exact = true)
-data class AccessTokenResponse  constructor(
+data class AccessTokenResponse (
     /**
      * **Required**
      *

sample-app/android-app/build.gradle.kts

@@ -9,8 +9,7 @@ kotlin {
     sourceSets {
         val androidMain by getting {
             dependencies {
-                implementation(projects.shared)
-
+                implementation(projects.sampleApp.shared)
             }
         }
     }

sample-app/desktop-app/build.gradle.kts

@@ -12,7 +12,7 @@ kotlin {
         val jvmMain by getting  {
             dependencies {
                 implementation(compose.desktop.currentOs)
-                implementation(projects.shared)
+                implementation(projects.sampleApp.shared)
             }
         }
     }