CMM-2297: Send support login straight to WordPress.com OAuth (#23221)

* CMM-2297: Send support login straight to WordPress.com OAuth

The Jetpack support flow launched the login prologue, whose "Enter your
existing site address" option uses application-password auth that does not
grant the WordPress.com token support chat (Odie) needs — a dead-end. Go
directly to the WP.com OAuth screen instead, matching the WordPress flow.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* CMM-2297: Return to the Support screen after WordPress.com login

Use a dedicated SUPPORT login flow (WP.com OAuth, finish-back-to-caller) so
that after authenticating the user lands back on the Support screen with
support chat ready, instead of being dropped on the main activity.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

Author: adalpari

WordPress/src/main/java/org/wordpress/android/support/main/ui/SupportActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.collectAsState
@@ -16,7 +17,6 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.chuckerteam.chucker.api.Chucker
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
-import org.wordpress.android.BuildConfig
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
@@ -38,6 +38,14 @@ class SupportActivity : AppCompatActivity() {
 
     private lateinit var composeView: ComposeView
 
+    private val loginLauncher = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+        if (result.resultCode == RESULT_OK) {
+            viewModel.refreshLoginState()
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         viewModel.init()
@@ -132,11 +140,12 @@ private fun getRetentionPeriodStringRes(period: NetworkRequestsRetentionPeriod):
     }
 
     private fun navigateToLogin() {
-        if (BuildConfig.IS_JETPACK_APP) {
-            ActivityLauncher.showSignInForResultJetpackOnly(this)
-        } else {
-            ActivityLauncher.showSignInForResultWpComOnly(this)
-        }
+        // Support chat (Odie) requires WordPress.com authentication. Go straight to the WP.com
+        // OAuth screen instead of the login prologue: the prologue's "Enter your existing site
+        // address" option authenticates via application password, which does not grant the WP.com
+        // token support needs, so it's a dead-end here. The login finishes back to this screen so
+        // the user can carry on to support chat once authenticated. See CMM-2297.
+        loginLauncher.launch(ActivityLauncher.createWpComSignInForSupportIntent(this))
     }
 
     private fun navigateToHelpCenter() {

WordPress/src/main/java/org/wordpress/android/support/main/ui/SupportViewModel.kt

@@ -73,6 +73,15 @@ class SupportViewModel @Inject constructor(
     val networkTrackingState: StateFlow<NetworkTrackingState> = _networkTrackingState.asStateFlow()
 
     fun init() {
+        refreshLoginState()
+        initNetworkTrackingState()
+    }
+
+    /**
+     * Re-reads the account state so the screen reflects a login that happened after it was created
+     * (e.g. the user returning from the support login flow). See CMM-2297.
+     */
+    fun refreshLoginState() {
         val hasAccessToken = accountStore.hasAccessToken()
         _isLoggedIn.value = hasAccessToken
 
@@ -86,8 +95,6 @@ class SupportViewModel @Inject constructor(
         _optionsVisibility.value = SupportOptionsVisibility(
             showUnifiedSupport = hasAccessToken && BuildConfig.IS_JETPACK_APP,
         )
-
-        initNetworkTrackingState()
     }
 
     private fun initNetworkTrackingState() {

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

@@ -155,6 +155,7 @@
 import static org.wordpress.android.imageeditor.preview.PreviewImageFragment.ARG_EDIT_IMAGE_DATA;
 import static org.wordpress.android.ui.accounts.LoginFlow.PROLOGUE;
 import static org.wordpress.android.ui.accounts.LoginFlow.JETPACK_REST_CONNECT;
+import static org.wordpress.android.ui.accounts.LoginFlow.SUPPORT;
 import static org.wordpress.android.ui.accounts.LoginFlow.WPCOM_LOGIN;
 import static org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE;
 import static org.wordpress.android.ui.WPWebViewActivity.ENCODING_UTF8;
@@ -1500,6 +1501,17 @@ public static void showSignInForResultWpComOnly(Activity activity) {
         activity.startActivityForResult(intent, RequestCodes.ADD_ACCOUNT);
     }
 
+    /**
+     * Builds the intent for the WordPress.com login required to access support chat (Odie).
+     * Goes straight to WP.com OAuth and, once done, finishes back to the caller (the Support
+     * screen) instead of navigating to the main activity.
+     */
+    public static Intent createWpComSignInForSupportIntent(@NonNull Context context) {
+        Intent intent = new Intent(context, LoginActivity.class);
+        SUPPORT.putInto(intent);
+        return intent;
+    }
+
     /**
      * Sign in to WordPress.com from the Jetpack REST connection flow.
      * This method is specifically for the Jetpack connection process where

WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginFlow.kt

@@ -56,6 +56,13 @@ enum class LoginFlow(
         completionBehavior = CompletionBehavior.FINISH
     ),
 
+    /** WP.com login required for support chat (Odie); returns to the Support screen when done */
+    SUPPORT(
+        analyticsSource = "support",
+        initialScreen = InitialScreen.WPCOM_OAUTH,
+        completionBehavior = CompletionBehavior.FINISH
+    ),
+
     /** Re-authentication after token expiry */
     WPCOM_REAUTHENTICATE(
         analyticsSource = "reauthentication",