Kotlin DSL flow revamp continued

Emphasis of account & profile interactions

Author: tal-mi

app/src/main/java/com/sap/cdc/bitsnbytes/extensions/JsonEncode.kt

@@ -1,8 +1,13 @@
 package com.sap.cdc.bitsnbytes.extensions
 
+import com.sap.cdc.android.sdk.feature.auth.flow.RegistrationContext
 import com.sap.cdc.android.sdk.feature.auth.flow.TwoFactorContext
 import kotlinx.serialization.json.Json
 
 fun TwoFactorContext.toJson(): String {
     return Json.encodeToString(this)
+}
+
+fun RegistrationContext.toJson(): String {
+    return Json.encodeToString(this)
 }

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

@@ -11,9 +11,12 @@ import com.sap.cdc.android.sdk.feature.auth.model.Credentials
 import com.sap.cdc.android.sdk.feature.auth.session.Session
 import com.sap.cdc.android.sdk.feature.notifications.IFCMTokenRequest
 import com.sap.cdc.bitsnbytes.feature.auth.model.AccountEntity
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.serialization.json.Json
 
 /**
  * Complete authentication state solution for ViewModels.
@@ -61,6 +64,12 @@ class AuthenticationFlowDelegate(context: Context) {
     private val _userAccount = MutableStateFlow<AccountEntity?>(null)
     val userAccount: StateFlow<AccountEntity?> = _userAccount.asStateFlow()
 
+    // JSON serializer for parsing account data
+    private val json = Json { ignoreUnknownKeys = true }
+
+    // Coroutine scope for async operations
+    private val scope = CoroutineScope(Dispatchers.Main)
+
     init {
         // Initialize state based on existing CDC session
         syncWithCDCSession()
@@ -111,6 +120,37 @@ class AuthenticationFlowDelegate(context: Context) {
     fun refreshAuthenticationState() {
         syncWithCDCSession()
     }
+
+    /**
+     * Get account information with state management.
+     * This method intercepts the response and updates the userAccount StateFlow.
+     */
+    suspend fun getAccountInfo(
+        parameters: MutableMap<String, String>? = mutableMapOf(),
+        authCallbacks: AuthCallbacks.() -> Unit
+    ) {
+        cdc.getAccountInfo(parameters) {
+            // Register original callbacks first
+            authCallbacks()
+            
+            // Add state management side-effect
+            doOnSuccess { authSuccess ->
+                try {
+                    // Parse and update the state
+                    val accountData = json.decodeFromString<AccountEntity>(authSuccess.jsonData)
+                    _userAccount.value = accountData
+                } catch (e: Exception) {
+                    // Handle parsing errors silently - don't break the callback chain
+                    // Could add logging here if needed
+                }
+            }
+            
+            doOnError { error ->
+                // Optionally clear account state on error
+                // _userAccount.value = null
+            }
+        }
+    }
 }
 
 class AuthenticationFlowCDCDelegate(val service: AuthenticationService) {
@@ -126,11 +166,36 @@ class AuthenticationFlowCDCDelegate(val service: AuthenticationService) {
         parameters: MutableMap<String, String> = mutableMapOf()
     ) {
         service.authenticate().register().credentials(
-            credentials = credentials,
-            configure = authCallbacks,
+            credentials = credentials, configure = authCallbacks,
             parameters = parameters
         )
     }
+
+    suspend fun logOut(authCallbacks: AuthCallbacks.() -> Unit) {
+        service.authenticate().logout(authCallbacks = authCallbacks)
+    }
+
+    suspend fun getAccountInfo(
+        parameters: MutableMap<String, String>? = mutableMapOf(), authCallbacks: AuthCallbacks.() -> Unit
+    ) {
+        service.account().get(
+            parameters = parameters!!,
+            configure = authCallbacks
+        )
+    }
+
+    suspend fun resolvePendingRegistration(
+        missingFieldsSerialized: MutableMap<String, String>,
+        regToken: String,
+        authCallbacks: AuthCallbacks.() -> Unit
+    ) {
+        service.authenticate().register().resolve().pendingRegistrationWith(
+            missingFields = missingFieldsSerialized,
+            regToken = regToken,
+            configure = authCallbacks
+        )
+    }
+
 }
 
 /**
@@ -139,4 +204,3 @@ class AuthenticationFlowCDCDelegate(val service: AuthenticationService) {
 fun AuthenticationFlowDelegate.isUserLoggedIn(): Boolean = isAuthenticated.value
 
 fun AuthenticationFlowDelegate.getCurrentUser(): AccountEntity? = userAccount.value
-

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

@@ -158,27 +158,6 @@ class IdentityServiceRepository private constructor(context: Context) {
 
     //region AUTHENTICATION FLOWS
 
-    /**
-     * Request cdc SDK latest account information.
-     */
-    suspend fun getAccountInfo(parameters: MutableMap<String, String>? = mutableMapOf()): IAuthResponse {
-        return authenticationService.account().get(parameters!!)
-    }
-
-    /**
-     * Update cdc SDK account information.
-     */
-    suspend fun setAccountInfo(parameters: MutableMap<String, String>): IAuthResponse {
-        return authenticationService.account().set(parameters)
-    }
-
-    /**
-     * Logout from current CDC session.
-     */
-    suspend fun logout(): IAuthResponse {
-        return authenticationService.authenticate().logout()
-    }
-
     /**
      * Initiate cdc SDK native social provider login flow.
      */
@@ -273,23 +252,6 @@ class IdentityServiceRepository private constructor(context: Context) {
 
     //region RESOLVE INTERRUPTIONS
 
-    /**
-     * Attempt to resolve "Account Pending Registration" interruption by providing the necessary
-     * missing fields.
-     * Note: regToken is required for authenticating the request.
-     */
-    suspend fun resolvePendingRegistrationWithMissingFields(
-        key: String,
-        serializedJsonValue: String,
-        regToken: String,
-    ): IAuthResponse {
-        val params = mutableMapOf(key to serializedJsonValue)
-        return authenticationService
-            .authenticate()
-            .register()
-            .resolve()
-            .pendingRegistrationWith(regToken, params)
-    }
 
     /**
      * Attempt to resolve account linking interruption to an existing site account.

app/src/main/java/com/sap/cdc/bitsnbytes/navigation/AppStateManager.kt

@@ -28,6 +28,9 @@ class AppStateManager : ViewModel() {
     private val _canNavigateBack = MutableStateFlow(false)
     val canNavigateBack: StateFlow<Boolean> = _canNavigateBack.asStateFlow()
 
+    private val _hasProfileBackStack = MutableStateFlow(false)
+    val hasProfileBackStack: StateFlow<Boolean> = _hasProfileBackStack.asStateFlow()
+    
     // NAVIGATION CONTROLLER MANAGEMENT
     private var currentNavController: NavController? = null
 
@@ -47,6 +50,10 @@ class AppStateManager : ViewModel() {
         _canNavigateBack.value = canGoBack
     }
 
+    fun setHasProfileBackStack(hasBackStack: Boolean) {
+        _hasProfileBackStack.value = hasBackStack
+    }
+    
     // NAVIGATION CONTROLLER METHODS
     fun setNavController(navController: NavController) {
         currentNavController = navController