Applied logic for Push TFA.

Author: tal-mi

app/src/main/AndroidManifest.xml

@@ -34,6 +34,23 @@
 
         </activity>
 
+        <service
+            android:name=".cdc.AppMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
+        <receiver
+            android:name="com.sap.cdc.android.sdk.auth.notifications.CDCNotificationReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="approve" />
+                <action android:name="deny" />
+            </intent-filter>
+        </receiver>
+
         <activity
             android:name="com.sap.cdc.android.sdk.auth.provider.activity.WebLoginActivity"
             android:allowTaskReparenting="true"

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

@@ -3,9 +3,14 @@ package com.sap.cdc.bitsnbytes.cdc
 import android.content.Context
 import android.util.Log
 import androidx.activity.ComponentActivity
+import com.google.android.gms.tasks.OnCompleteListener
+import com.google.firebase.messaging.FirebaseMessaging
+import com.sap.cdc.android.sdk.CDCMessageEventBus
+import com.sap.cdc.android.sdk.MessageEvent
 import com.sap.cdc.android.sdk.auth.AuthenticationService
 import com.sap.cdc.android.sdk.auth.IAuthResponse
 import com.sap.cdc.android.sdk.auth.ResolvableContext
+import com.sap.cdc.android.sdk.auth.notifications.IFCMTokenRequest
 import com.sap.cdc.android.sdk.auth.provider.IAuthenticationProvider
 import com.sap.cdc.android.sdk.auth.provider.SSOAuthenticationProvider
 import com.sap.cdc.android.sdk.auth.provider.WebAuthenticationProvider
@@ -47,7 +52,21 @@ class IdentityServiceRepository private constructor(context: Context) {
     /**
      * Initialize authentication service.
      */
-    var authenticationService = AuthenticationService(siteConfig)
+    var authenticationService = AuthenticationService(siteConfig).registerForPushAuthentication(
+        object : IFCMTokenRequest {
+            override fun requestFCMToken() {
+                FirebaseMessaging.getInstance().token.addOnCompleteListener(OnCompleteListener { task ->
+                    if (!task.isSuccessful) {
+                        return@OnCompleteListener
+                    }
+
+                    // Get new FCM registration token
+                    val token = task.result
+                    CDCMessageEventBus.emitMessageEvent(MessageEvent.EventWithToken(token))
+                })
+            }
+        }
+    )
 
     /**
      * Authentication providers map.
@@ -56,7 +75,6 @@ class IdentityServiceRepository private constructor(context: Context) {
     private var authenticationProviderMap: MutableMap<String, IAuthenticationProvider> =
         mutableMapOf()
 
-
     init {
         // Using session migrator to try and migrate an existing session in an application using old versions
         // of the gigya-android-sdk library.
@@ -219,6 +237,14 @@ class IdentityServiceRepository private constructor(context: Context) {
         parameters: MutableMap<String, String>
     ): IAuthResponse = authenticationService.authenticate().otpSendCode(parameters)
 
+    //region PUSH
+
+    suspend fun optInForPushTFA(): IAuthResponse {
+        return authenticationService.tfa().optInForPushAuthentication()
+    }
+
+    //endregion
+
     //endregion
 
     //region RESOLVE INTERRUPTIONS

app/src/main/java/com/sap/cdc/bitsnbytes/ui/view/screens/LoginOptions.kt

@@ -1,5 +1,9 @@
+@file:OptIn(ExperimentalPermissionsApi::class)
+
 package com.sap.cdc.bitsnbytes.ui.view.screens
 
+import android.Manifest
+import android.annotation.SuppressLint
 import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG
 import androidx.biometric.BiometricPrompt
 import androidx.compose.foundation.background
@@ -16,7 +20,10 @@ import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -25,10 +32,15 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.rememberPermissionState
 import com.sap.cdc.bitsnbytes.ui.theme.AppTheme
 import com.sap.cdc.bitsnbytes.ui.view.composables.ActionOutlineButton
 import com.sap.cdc.bitsnbytes.ui.view.composables.ActionOutlineInverseButton
 import com.sap.cdc.bitsnbytes.ui.view.composables.LargeHorizontalSpacer
+import com.sap.cdc.bitsnbytes.ui.view.composables.LargeVerticalSpacer
+import com.sap.cdc.bitsnbytes.ui.view.composables.LoadingStateColumn
+import com.sap.cdc.bitsnbytes.ui.view.composables.SimpleErrorMessages
 import com.sap.cdc.bitsnbytes.ui.view.composables.SmallVerticalSpacer
 import com.sap.cdc.bitsnbytes.ui.viewmodel.ILoginOptionsViewModel
 import com.sap.cdc.bitsnbytes.ui.viewmodel.LoginOptionsViewModelPreview
@@ -39,19 +51,26 @@ import com.sap.cdc.bitsnbytes.ui.viewmodel.LoginOptionsViewModelPreview
  * Copyright: SAP LTD.
  */
 
+@SuppressLint("InlinedApi")
 @Composable
 fun LoginOptionsView(viewModel: ILoginOptionsViewModel) {
     val context = LocalContext.current
+    var loading by remember { mutableStateOf(false) }
     val executor = remember { ContextCompat.getMainExecutor(context) }
+    var optionsError by remember { mutableStateOf("") }
+
+    val notificationPermission = rememberPermissionState(
+        permission = Manifest.permission.POST_NOTIFICATIONS
+    )
 
     // UI elements.
 
-    Column(
+    LoadingStateColumn(
+        loading = loading,
         modifier = Modifier
             .background(Color.White)
             .fillMaxWidth()
             .fillMaxHeight(),
-        verticalArrangement = Arrangement.spacedBy(6.dp)
     ) {
         // Option cards
         OptionCard(
@@ -61,13 +80,30 @@ fun LoginOptionsView(viewModel: ILoginOptionsViewModel) {
             onClick = { /* Handle deactivation */ },
             inverse = false
         )
+        SmallVerticalSpacer()
         OptionCard(
             title = "Push 2-Factor Authentication",
-            status = "Deactivated",
+            status = "",
             actionLabel = "Activate",
-            onClick = { /* Handle activation */ },
+            onClick = {
+                if (!notificationPermission.hasPermission) {
+                    notificationPermission.launchPermissionRequest()
+                }
+                loading = true
+                viewModel.optInForPushTFA(
+                    success = {
+                        optionsError = ""
+                        loading = false
+                    },
+                    onFailedWith = { error ->
+                        optionsError = error?.errorDescription!!
+                        loading = false
+                    }
+                )
+            },
             inverse = false
         )
+        SmallVerticalSpacer()
         OptionCard(
             title = "Biometrics",
             status = when (viewModel.isBiometricActive()) {
@@ -140,6 +176,15 @@ fun LoginOptionsView(viewModel: ILoginOptionsViewModel) {
                 }
             )
         }
+
+        LargeVerticalSpacer()
+
+        // Error message
+        if (optionsError.isNotEmpty()) {
+            SimpleErrorMessages(
+                text = optionsError
+            )
+        }
     }
 }
 

app/src/main/java/com/sap/cdc/bitsnbytes/ui/viewmodel/LoginOptionsViewModel.kt

@@ -6,8 +6,12 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.viewModelScope
+import com.sap.cdc.android.sdk.auth.AuthState
 import com.sap.cdc.android.sdk.auth.biometric.BiometricAuth
 import com.sap.cdc.android.sdk.auth.session.SessionSecureLevel
+import com.sap.cdc.android.sdk.core.api.model.CDCError
+import kotlinx.coroutines.launch
 import java.util.concurrent.Executor
 
 interface ILoginOptionsViewModel {
@@ -44,6 +48,13 @@ interface ILoginOptionsViewModel {
         // Stub.
     }
 
+    fun optInForPushTFA(
+        success: () -> Unit,
+        onFailedWith: (CDCError?) -> Unit
+    ) {
+        //Stub.
+    }
+
 }
 
 // Mocked preview class for LoginOptionsViewModel
@@ -153,5 +164,24 @@ class LoginOptionsViewModel(context: Context) : BaseViewModel(context),
             }
         )
     }
+
+    override fun optInForPushTFA(
+        success: () -> Unit,
+        onFailedWith: (CDCError?) -> Unit
+    ) {
+        viewModelScope.launch {
+            val response = identityService.optInForPushTFA()
+            when (response.state()) {
+                AuthState.SUCCESS -> {
+                    // Success.
+                    success()
+                }
+
+                else -> {
+                    onFailedWith(response.toDisplayError())
+                }
+            }
+        }
+    }
 }
 

library/src/main/java/com/sap/cdc/android/sdk/auth/AuthenticationService.kt

@@ -7,6 +7,7 @@ import com.sap.cdc.android.sdk.auth.session.SessionService
 import com.sap.cdc.android.sdk.core.CoreClient
 import com.sap.cdc.android.sdk.core.SiteConfig
 import com.sap.cdc.android.sdk.extensions.getEncryptedPreferences
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 /**
@@ -59,7 +60,8 @@ class AuthenticationService(
         val json = Json {
             encodeDefaults = true
         }
-        esp.edit().putString(CDC_DEVICE_INFO, json.encodeToString(deviceInfo)).apply()
+        val deviceInfoJson = json.encodeToString(deviceInfo)
+        esp.edit().putString(CDC_DEVICE_INFO, deviceInfoJson).apply()
     }
 
     /**

library/src/main/java/com/sap/cdc/android/sdk/auth/notifications/NotificationsManager.kt

@@ -235,6 +235,7 @@ class CDCNotificationManager(
      * @param data: The data fields of the notification.
      */
     private fun notifyActionable(mode: String, data: Map<String, String>) {
+        CDCDebuggable.log(LOG_TAG, "notifyActionable: mode: $mode, data: $data")
 
         // Parse data fields from cdc push.
         val title = data["title"]
@@ -333,8 +334,13 @@ class CDCNotificationManager(
                 approvePendingIntent
             )
 
+
         // Notify.
         if (notificationManager.areNotificationsEnabled()) {
+            CDCDebuggable.log(
+                LOG_TAG,
+                "Notify actionable notification with id = $notificationId"
+            )
             notificationManager.notify(notificationId, builder.build())
         } else {
             CDCDebuggable.log(LOG_TAG, "Notifications permissions not enabled.")