Added scopes to config.

.github/workflows/pull_request.yml

@@ -2,7 +2,7 @@ name: Pull Request
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

gradle.properties

@@ -2,12 +2,12 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 kotlin.code.style=official
 
-POM_DEVELOPER_ID=Gitlive
+POM_DEVELOPER_ID=GitLiveApp
 POM_DEVELOPER_NAME=Andrew Reed
 [email protected]
 
 kotlin.native.binary.memoryModel=experimental
-kotlin.native.cacheKind.iosArm64=none
+kotlin.native.cacheKind=none
 
 kotlin.js.compiler=ir
 kotlin.mpp.enableCInteropCommonization=true

src/androidMain/kotlin/dev/gitlive/appauth/androidMain.kt

@@ -1,6 +1,6 @@
 package dev.gitlive.appauth
 
-import android.content.Context
+import android.content.ContextWrapper
 import android.content.Intent
 import android.net.Uri
 import androidx.activity.result.ActivityResultCaller
@@ -20,8 +20,10 @@ private fun AuthorizationException.wrapIfNecessary() =
     takeUnless { it == AuthorizationException.GeneralErrors.NETWORK_ERROR }
         ?: IOException(message, this)
 
+actual typealias AuthorizationServiceContext = ContextWrapper
+
 actual class AuthorizationService private constructor(private val android: net.openid.appauth.AuthorizationService) {
-    constructor(context: Context) : this(net.openid.appauth.AuthorizationService(context))
+    actual constructor(context: () -> AuthorizationServiceContext) : this(net.openid.appauth.AuthorizationService(context()))
 
     fun bind(activityOrFragment: ActivityResultCaller) {
         launcher = activityOrFragment
@@ -103,6 +105,7 @@ actual class AuthorizationRequest private constructor(internal val android: net.
     actual constructor(
         config: AuthorizationServiceConfiguration,
         clientId: String,
+        scopes: List<String>,
         responseType: String,
         redirectUri: String
     ) : this(
@@ -111,14 +114,17 @@ actual class AuthorizationRequest private constructor(internal val android: net.
             clientId,
             responseType,
             Uri.parse(redirectUri)
-        ).build()
+        )
+        .setScopes(scopes)
+        .build()
     )
 }
 
 actual class AuthorizationResponse internal constructor(private val android: net.openid.appauth.AuthorizationResponse) {
     actual fun createTokenExchangeRequest() = TokenRequest(android.createTokenExchangeRequest())
-    actual val idToken = android.idToken
-    actual val authorizationCode = android.authorizationCode
+    actual val idToken get() = android.idToken
+    actual val scope get() = android.scope
+    actual val authorizationCode get() = android.authorizationCode
 }
 
 actual class TokenRequest internal constructor(internal val android: net.openid.appauth.TokenRequest) {

src/commonMain/kotlin/dev/gitlive/appauth/commonMain.kt

@@ -2,7 +2,9 @@ package dev.gitlive.appauth
 
 expect class AuthorizationException : Exception
 
-expect class AuthorizationService {
+expect class AuthorizationServiceContext
+
+expect class AuthorizationService(context: () -> AuthorizationServiceContext) {
     suspend fun performAuthorizationRequest(request: AuthorizationRequest): AuthorizationResponse
     suspend fun performEndSessionRequest(request: EndSessionRequest): EndSessionResponse
     suspend fun performTokenRequest(request: TokenRequest): TokenResponse
@@ -27,13 +29,15 @@ expect class AuthorizationServiceConfiguration(
 expect class AuthorizationRequest(
     config: AuthorizationServiceConfiguration,
     clientId: String,
+    scopes: List<String>,
     responseType: String,
     redirectUri: String
 )
 
 expect class AuthorizationResponse {
     val idToken: String?
     val authorizationCode: String?
+    val scope: String?
     fun createTokenExchangeRequest(): TokenRequest
 }
 

src/commonTest/kotlin/dev/gitlive/appauth/commonTest.kt

@@ -36,6 +36,7 @@ class AuthorizationServiceTest {
         val request = AuthorizationRequest(
             config,
             "MyClient",
+            listOf("profile"),
             "code",
             "myapp://oauth2redirect"
         )
@@ -55,6 +56,7 @@ class AuthorizationServiceTest {
         val request = AuthorizationRequest(
             config,
             "MyClient",
+            listOf("profile"),
             "code",
             "myapp://oauth2redirect"
         )

src/iosMain/kotlin/dev/gitlive/appauth/iosMain.kt

@@ -1,17 +1,17 @@
 package dev.gitlive.appauth
 
+import cocoapods.AppAuth.OIDGeneralErrorDomain
+import cocoapods.AppAuth.OIDErrorCodeNetworkError
+import cocoapods.AppAuth.OIDServiceConfiguration
+import cocoapods.AppAuth.OIDAuthorizationService
 import cocoapods.AppAuth.OIDAuthorizationRequest
+import cocoapods.AppAuth.OIDTokenRequest
 import cocoapods.AppAuth.OIDAuthorizationResponse
-import cocoapods.AppAuth.OIDAuthorizationService
 import cocoapods.AppAuth.OIDEndSessionRequest
+import cocoapods.AppAuth.OIDTokenResponse
 import cocoapods.AppAuth.OIDEndSessionResponse
-import cocoapods.AppAuth.OIDErrorCodeNetworkError
-import cocoapods.AppAuth.OIDExternalUserAgentIOS
 import cocoapods.AppAuth.OIDExternalUserAgentSessionProtocol
-import cocoapods.AppAuth.OIDGeneralErrorDomain
-import cocoapods.AppAuth.OIDServiceConfiguration
-import cocoapods.AppAuth.OIDTokenRequest
-import cocoapods.AppAuth.OIDTokenResponse
+import cocoapods.AppAuth.OIDExternalUserAgentIOS
 import io.ktor.utils.io.errors.IOException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -70,13 +70,14 @@ actual class AuthorizationRequest private constructor(internal val ios: OIDAutho
     actual constructor(
         config: AuthorizationServiceConfiguration,
         clientId: String,
+        scopes: List<String>,
         responseType: String,
         redirectUri: String
     ) : this(
         OIDAuthorizationRequest(
             configuration = config.ios,
             clientId = clientId,
-            scopes = null,
+            scopes = scopes,
             redirectURL = NSURL.URLWithString(redirectUri)!!,
             responseType = responseType,
             additionalParameters = null
@@ -109,6 +110,7 @@ actual class TokenRequest internal constructor(internal val ios: OIDTokenRequest
 actual class AuthorizationResponse internal constructor(internal val ios: OIDAuthorizationResponse) {
     actual val authorizationCode: String? get() = ios.authorizationCode
     actual val idToken: String? get() = ios.idToken
+    actual val scope get() = ios.scope
     actual fun createTokenExchangeRequest() = TokenRequest(ios.tokenExchangeRequest()!!)
 }
 
@@ -135,7 +137,9 @@ actual class TokenResponse internal constructor(internal val ios: OIDTokenRespon
 
 actual typealias EndSessionResponse = OIDEndSessionResponse
 
-actual class AuthorizationService constructor(private val presentingViewController: () -> UIViewController) {
+actual typealias AuthorizationServiceContext = UIViewController
+
+actual class AuthorizationService actual constructor(private val context: () -> AuthorizationServiceContext) {
 
     private var session: OIDExternalUserAgentSessionProtocol? = null
 
@@ -147,7 +151,7 @@ actual class AuthorizationService constructor(private val presentingViewControll
             suspendCoroutine { cont ->
                 session = OIDAuthorizationService.presentAuthorizationRequest(
                     request.ios,
-                    OIDExternalUserAgentIOS(presentingViewController())
+                    OIDExternalUserAgentIOS(context())
                 ) { response, error ->
                     session = null
                     response?.let { cont.resume(AuthorizationResponse(it)) }
@@ -161,7 +165,7 @@ actual class AuthorizationService constructor(private val presentingViewControll
             suspendCoroutine { cont ->
                 session = OIDAuthorizationService.presentEndSessionRequest(
                     request.ios,
-                    OIDExternalUserAgentIOS(presentingViewController())
+                    OIDExternalUserAgentIOS(context())
                 ) { response, error ->
                     session = null
                     response?.let { cont.resume(it) }

src/jsMain/kotlin/dev/gitlive/appauth/jsMain.kt

@@ -1,5 +1,6 @@
 package dev.gitlive.appauth
 
+actual class AuthorizationServiceContext
 actual class AuthorizationServiceConfiguration actual constructor(
     authorizationEndpoint: String,
     tokenEndpoint: String,
@@ -27,6 +28,7 @@ actual class AuthorizationException : Exception()
 actual class AuthorizationRequest actual constructor(
     config: AuthorizationServiceConfiguration,
     clientId: String,
+    scopes: List<String>,
     responseType: String,
     redirectUri: String
 )
@@ -40,6 +42,8 @@ actual class AuthorizationResponse {
         get() = TODO("Not yet implemented")
     actual val idToken: String?
         get() = TODO("Not yet implemented")
+    actual val scope: String?
+        get() = TODO("Not yet implemented")
 }
 
 actual class TokenRequest actual constructor(
@@ -58,7 +62,7 @@ actual class TokenResponse {
         get() = TODO("Not yet implemented")
 }
 
-actual class AuthorizationService {
+actual class AuthorizationService actual constructor(context: () -> AuthorizationServiceContext) {
     actual suspend fun performAuthorizationRequest(request: AuthorizationRequest): AuthorizationResponse {
         TODO("Not yet implemented")
     }