refactor: Provider authentication fixes for authenticator flows

Author: tal-mi

app/build.gradle.kts

@@ -14,8 +14,8 @@ android {
         minSdk = 26
         //noinspection EditedTargetSdkVersion,OldTargetApi
         targetSdk = 35
-        versionCode = 3
-        versionName = "0.3"
+        versionCode = 5
+        versionName = "1.0.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/java/com/sap/cdc/bitsnbytes/feature/auth/AuthenticationFlowDelegate.kt

@@ -77,7 +77,7 @@ class AuthenticationFlowDelegate(context: Context) {
     /**
      * Creates and configures a new AuthenticationService instance.
      * Centralizes service initialization to avoid duplication.
-     * 
+     *
      * @param config The SiteConfig to initialize the service with
      * @return Configured AuthenticationService instance
      */
@@ -107,33 +107,33 @@ class AuthenticationFlowDelegate(context: Context) {
 
     /**
      * Re-initializes the entire authentication system with a new SiteConfig.
-     * 
+     *
      * This method performs a complete reinitialization when configuration changes:
      * 1. Clears existing authentication state and session data
      * 2. Creates new AuthenticationService with fresh CoreClient and SessionService
      * 3. Re-registers all authentication providers with new config
      * 4. Resets biometric authentication (will reinitialize on next use)
-     * 
+     *
      * **Important:** Sessions are API-key specific, so changing configuration
      * requires clearing the old session and starting fresh.
-     * 
+     *
      * @param newSiteConfig The new site configuration to use
      */
     fun reinitializeWithNewConfig(newSiteConfig: SiteConfig) {
         // 1. Clear existing state
         clearAuthenticationState()
         clearCDCSession()
         clearAuthOptionsState()
-        
+
         // 2. Update siteConfig reference
         this.siteConfig = newSiteConfig
-        
+
         // 3. Create NEW AuthenticationService (includes fresh CoreClient + SessionService)
         authenticationService = createAuthenticationService(newSiteConfig)
-        
+
         // 4. Re-register authentication providers
         initializeProviders()
-        
+
         // Note: biometricAuth is lazy - will reinitialize with new sessionService on next access
     }
 
@@ -156,21 +156,23 @@ class AuthenticationFlowDelegate(context: Context) {
      */
     private fun initializeProviders() {
         authenticationProviderMap.clear()
-        
+
         // Register application specific authentication providers
         registerAuthenticationProvider("facebook", FacebookAuthenticationProvider())
-        
+
         // Register Google with both modern and legacy names (google + googleplus)
         // This supports legacy server configurations that use "googleplus" without duplicating instances
         registerAuthenticationProvider(
             aliases = listOf("google", "googleplus"),
             provider = GoogleAuthenticationProvider()
         )
 
-        registerAuthenticationProvider("linkedIn", WebAuthenticationProvider(
-            "linked",
-            siteConfig = authenticationService.siteConfig,
-        ))
+        registerAuthenticationProvider(
+            "linkedIn", WebAuthenticationProvider(
+                "linked",
+                siteConfig = authenticationService.siteConfig,
+            )
+        )
     }
 
     init {
@@ -244,6 +246,7 @@ class AuthenticationFlowDelegate(context: Context) {
     fun handleSessionExpired() {
         clearCDCSession()
         clearAuthenticationState()
+        biometricAuth.invalidateBiometricAuthenticationState()
     }
 
     //region LOGIN / LOGOUT / REGISTER METHODS
@@ -648,30 +651,30 @@ class AuthenticationFlowDelegate(context: Context) {
 
     /**
      * Register authentication provider with multiple aliases.
-     * 
+     *
      * This method allows registering the same provider instance under multiple names,
      * which is useful for supporting legacy provider names without duplicating instances.
-     * 
+     *
      * ## Use Case: Legacy Provider Names
-     * 
+     *
      * Some servers may use legacy provider names (e.g., "googleplus") while the client
      * uses modern names (e.g., "google"). Rather than creating duplicate provider instances,
      * this method allows mapping multiple names to a single provider.
-     * 
+     *
      * ## Example
-     * 
+     *
      * ```
      * // Google provider can be accessed via "google" OR "googleplus"
      * registerAuthenticationProvider(
      *     aliases = listOf("google", "googleplus"),
      *     provider = GoogleAuthenticationProvider()
      * )
-     * 
+     *
      * // Both work and return the same instance:
      * getAuthenticationProvider("google")      // Same instance
      * getAuthenticationProvider("googleplus")  // Same instance
      * ```
-     * 
+     *
      * @param aliases List of names (including primary and legacy names) that map to this provider
      * @param provider The authentication provider instance to register
      */
@@ -684,7 +687,7 @@ class AuthenticationFlowDelegate(context: Context) {
     /**
      * Register authentication provider with a single name.
      * Convenience method for providers without legacy names.
-     * 
+     *
      * @param name The provider name
      * @param provider The authentication provider instance
      */

app/src/main/java/com/sap/cdc/bitsnbytes/feature/provider/FacebookAuthenticationProvider.kt

@@ -12,8 +12,6 @@ import com.sap.cdc.android.sdk.feature.provider.IAuthenticationProvider
 import com.sap.cdc.android.sdk.feature.provider.ProviderException
 import com.sap.cdc.android.sdk.feature.provider.ProviderExceptionType
 import com.sap.cdc.android.sdk.feature.provider.ProviderType
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
@@ -65,24 +63,13 @@ class FacebookAuthenticationProvider : IAuthenticationProvider {
                 override fun onSuccess(result: LoginResult) {
                     val accessToken = result.accessToken
 
-                    // Generate the relevant providerSession object required for CDC servers to validate the token.
-                    val data = JsonObject(
-                        mapOf(
-                            "facebook" to JsonObject(
-                                mapOf(
-                                    "authToken" to JsonPrimitive(accessToken.token),
-                                    "tokenExpiration" to JsonPrimitive(accessToken.expires.time / 1000)
-                                )
-                            )
-                        )
-                    )
-
-                    val providerSession = data.toString()
-
                     val authenticatorProviderResult = AuthenticatorProviderResult(
                         provider = getProvider(),
                         type = ProviderType.NATIVE,
-                        providerSessions = providerSession,
+                        providerSessionData = mapOf(
+                            "authToken" to accessToken.token,
+                            "tokenExpiration" to (accessToken.expires.time / 1000).toString()
+                        ),
                     )
                     continuation.resume(authenticatorProviderResult)
                 }

app/src/main/java/com/sap/cdc/bitsnbytes/feature/provider/GoogleAuthenticationProvider.kt

@@ -18,8 +18,6 @@ import com.sap.cdc.android.sdk.feature.provider.ProviderExceptionType
 import com.sap.cdc.android.sdk.feature.provider.ProviderType
 import com.sap.cdc.bitsnbytes.R
 import io.ktor.util.generateNonce
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
 
 /**
  * Created by Tal Mirmelshtein on 10/06/2024
@@ -66,22 +64,12 @@ class GoogleAuthenticationProvider : IAuthenticationProvider {
         val googleIdTokenCredential = GoogleIdTokenCredential
             .createFrom(credential.data)
 
-        // Generate the relevant providerSession object required for CDC servers to validate the token.
-        val data = JsonObject(
-            mapOf(
-                "google" to JsonObject(
-                    mapOf(
-                        "idToken" to JsonPrimitive(googleIdTokenCredential.idToken),
-                    )
-                )
-            )
-        )
-        val providerSession = data.toString()
-
         val authenticatorProviderResult = AuthenticatorProviderResult(
             provider = getProvider(),
             type = ProviderType.NATIVE,
-            providerSessions = providerSession
+            providerSessionData = mapOf(
+                "idToken" to googleIdTokenCredential.idToken,
+            )
         )
         return authenticatorProviderResult
     }

app/src/main/java/com/sap/cdc/bitsnbytes/feature/provider/LineAuthenticationProvider.kt

@@ -1,5 +1,6 @@
 package com.sap.cdc.bitsnbytes.feature.provider
 
+import android.R.attr.data
 import android.content.Context
 import android.content.Intent
 import android.util.Log
@@ -19,8 +20,6 @@ import com.sap.cdc.android.sdk.feature.provider.ProviderException
 import com.sap.cdc.android.sdk.feature.provider.ProviderExceptionType
 import com.sap.cdc.android.sdk.feature.provider.ProviderType
 import com.sap.cdc.bitsnbytes.R
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
@@ -33,6 +32,11 @@ import kotlin.coroutines.suspendCoroutine
 
 class LineAuthenticationProvider() : IAuthenticationProvider {
 
+    companion object {
+
+        const val LOG_TAG = "LineAuthenticationProvider"
+    }
+
     private var launcher: ActivityResultLauncher<Intent>? = null
 
     override fun getProvider(): String = "line"
@@ -55,7 +59,7 @@ class LineAuthenticationProvider() : IAuthenticationProvider {
                 hostActivity,
                 channelId,
                 LineAuthenticationParams.Builder()
-                    .scopes(listOf(Scope.PROFILE))
+                    .scopes(listOf(Scope.PROFILE, Scope.OC_EMAIL, Scope.OPENID_CONNECT))
                     .build()
             )
 
@@ -77,34 +81,27 @@ class LineAuthenticationProvider() : IAuthenticationProvider {
                 val lineResult = LineLoginApi.getLoginResultFromIntent(resultData)
                 when (lineResult.responseCode) {
                     LineApiResponseCode.SUCCESS -> {
-                        Log.d("LineAuthenticationProvider", "SUCCESS")
+                        Log.d(LOG_TAG, "SUCCESS")
                         val token = lineResult.lineCredential?.accessToken?.tokenString
-
-                        // Generate the relevant providerSession object required for CDC servers to validate the token.
-                        val data = JsonObject(
-                            mapOf(
-                                "line" to JsonObject(
-                                    mapOf(
-                                        "authToken" to JsonPrimitive(token),
-                                    )
-                                )
-                            )
-                        )
+                        val idToken = lineResult.lineIdToken?.rawString
 
                         val providerSession = data.toString()
 
                         val authenticatorProviderResult = AuthenticatorProviderResult(
                             provider = getProvider(),
                             type = ProviderType.NATIVE,
-                            providerSessions = providerSession
+                            providerSessionData = mapOf(
+                                "authToken" to token,
+                                "idToken" to idToken
+                            )
                         )
 
                         dispose()
                         continuation.resume(authenticatorProviderResult)
                     }
 
                     LineApiResponseCode.CANCEL -> {
-                        Log.d("LineAuthenticationProvider", "CANCEL")
+                        Log.d(LOG_TAG, "CANCEL")
 
                         dispose()
                         continuation.resumeWithException(
@@ -116,8 +113,8 @@ class LineAuthenticationProvider() : IAuthenticationProvider {
                     }
 
                     else -> {
-                        Log.d("LineAuthenticationProvider", "ERROR")
-                        Log.d("LineAuthenticationProvider", lineResult.errorData.toString())
+                        Log.d(LOG_TAG, "ERROR")
+                        Log.d(LOG_TAG, lineResult.errorData.toString())
 
                         val providerException =
                             ProviderException(

app/src/main/java/com/sap/cdc/bitsnbytes/feature/provider/WeChatAuthenticationProvider.kt

@@ -21,8 +21,6 @@ import com.sap.cdc.bitsnbytes.wxapi.WXEntryActivity
 import com.tencent.mm.opensdk.modelmsg.SendAuth
 import com.tencent.mm.opensdk.openapi.IWXAPI
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
@@ -112,23 +110,13 @@ class WeChatAuthenticationProvider : IAuthenticationProvider {
                         val code = resultData.getStringExtra("code")
                         if (code != null) {
 
-                            // Generate the relevant providerSession object required for CDC servers to validate the token.
-                            val data = JsonObject(
-                                mapOf(
-                                    "wechat" to JsonObject(
-                                        mapOf(
-                                            "authToken" to JsonPrimitive(code),
-                                            "providerID" to JsonPrimitive(WXEntryActivity.API_ID)
-                                        )
-                                    )
-                                )
-                            )
-                            val providerSession = data.toString()
-
                             val authenticatorProviderResult = AuthenticatorProviderResult(
                                 provider = getProvider(),
                                 type = ProviderType.NATIVE,
-                                providerSessions = providerSession
+                                providerSessionData = mapOf(
+                                    "authToken" to code,
+                                    "providerID" to WXEntryActivity.API_ID
+                                )
                             )
                             dispose()
                             continuation.resume(authenticatorProviderResult)

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-android = "8.13.0"
+android = "8.13.1"
 browser = "1.9.0"
 accompanistPermissions = "0.37.3"
 firebaseBom = "34.6.0"
@@ -10,20 +10,20 @@ dokka = "2.1.0"
 jreleaser = "1.21.0"
 ktorClientMock = "3.3.3"
 ktx = "1.17.0"
-activityCompose = "1.12.0"
+activityCompose = "1.12.1"
 ktor = "3.3.3"
 appcompat = "1.7.1"
 biometric = "1.1.0"
 credentials = "1.5.0"
 coilCompose = "2.7.0"
-composeBom = "2025.11.01"
+composeBom = "2025.12.00"
 coreSplashscreen = "1.2.0"
 lifecycleRuntimeKtx = "2.10.0"
 material = "1.13.0"
 material3Version = "1.4.0"
 materialIconsExtended = "1.7.8"
 navigationCompose = "2.9.6"
-runtimeLivedata = "1.9.5"
+runtimeLivedata = "1.10.0"
 workRuntimeKtx = "2.11.0"
 material3 = "1.4.0"
 
@@ -39,7 +39,7 @@ junitVersion = "1.3.0"
 mockitoCore = "5.20.0"
 mockitoInline = "5.2.0"
 mockitoKotlin = "6.1.0"
-foundation = "1.9.5"
+foundation = "1.10.0"
 
 [libraries]
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanistPermissions" }

library/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.sap.oss.cdc-android-sdk"
-version = "0.3.0"
+version = "1.0.0"
 
 ext["name"] = "SAP Customer Data Cloud SDK for Android"
 ext["artifactId"] = "cdc-android-sdk"