@W-20978376: [Android] Remove supportWelcomeDiscovery flag in dev (CodeCov Testing Finalized)

Author: JohnsonEricAtSalesforce

.github/workflows/pr.yaml

@@ -1,7 +1,7 @@
 name: Pull Request
 
 on:
-  # Dangerious without Member Check setup!
+  # Dangerous without Member Check setup!
   pull_request_target:
     branches: [dev, master]
 

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt

@@ -1594,9 +1594,16 @@ open class LoginActivity : FragmentActivity() {
         private val activity: LoginActivity = this@LoginActivity
     ) : Observer<String> {
         override fun onChanged(value: String) {
-            // Guard against observing a pending login server already provided by the intent data, such as a Salesforce Welcome Discovery mobile URL.
             val pendingServerUri = value.toUri()
-            if ((activity.intent.data?.host == pendingServerUri.host && activity.intent.data?.path == pendingServerUri.path) || activity.intent.getStringExtra(EXTRA_KEY_LOGIN_HOST) == pendingServerUri.host) {
+            val intent = activity.intent
+            val data = intent.data
+
+            // Guard against observing a pending login server already provided by the intent data, such as a Salesforce Welcome Discovery mobile URL.
+            val dataHostMatches = data?.host == pendingServerUri.host
+            val dataPathMatches = data?.path == pendingServerUri.path
+            val uriMatches = dataHostMatches && dataPathMatches
+            val extraMatches = intent.getStringExtra(EXTRA_KEY_LOGIN_HOST) == pendingServerUri.host
+            if (uriMatches || extraMatches) {
                 activity.viewModel.previousPendingServer = value
                 return
             }

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginViewModel.kt

@@ -574,7 +574,8 @@ open class LoginViewModel(val bootConfig: BootConfig) : ViewModel() {
             if (!sdkManager.isBrowserLoginEnabled && !viewModel.isUsingFrontDoorBridge && value != null) {
                 val valueUrl = value.toUri()
                 val loginUrl = viewModel.loginUrl.value?.toUri()
-                val isNewServer = loginUrl?.host != valueUrl.host || loginUrl?.path != valueUrl.path
+
+                val isNewServer = (loginUrl?.host?.equals(valueUrl.host) == false).or(!loginUrl?.path.equals(valueUrl.path))
                 if (isNewServer) {
                     scope.launch {
                         viewModel.loginUrl.value = viewModel.getAuthorizationUrl(value)

libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/ui/LoginActivityTest.kt

@@ -36,7 +36,6 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.core.net.toUri
 import androidx.lifecycle.MediatorLiveData
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.salesforce.androidsdk.app.SalesforceSDKManager
 import com.salesforce.androidsdk.ui.LoginActivity.Companion.ABOUT_BLANK
 import com.salesforce.androidsdk.ui.LoginActivity.Companion.EXTRA_KEY_LOGIN_HINT
 import com.salesforce.androidsdk.ui.LoginActivity.Companion.EXTRA_KEY_LOGIN_HOST
@@ -221,6 +220,56 @@ class LoginActivityTest {
         verify(exactly = 0) { viewModel.applyPendingServer(pendingLoginServer = any()) }
     }
 
+    @Test
+    fun loginActivityPendingServerObserver_switchesDefaultOrSalesforceWelcomeDiscoveryLogin_onChangeIntentDataPathOnlyTogglesWelcomeDiscoveryUrlPath() {
+
+        val pendingServerWelcomeDiscoveryUrlPath = "https://welcome.example.com/discovery"
+        val intent = mockk<Intent>(relaxed = true)
+        every { intent.data } returns "https://welcome.example.com/other".toUri()
+        val viewModel = mockk<LoginViewModel>(relaxed = true)
+        val activity = mockk<LoginActivity>(relaxed = true)
+        every { activity.intent } returns intent
+        every { activity.viewModel } returns viewModel
+        every { activity.switchDefaultOrSalesforceWelcomeDiscoveryLogin(any()) } returns true
+        val observer = activity.PendingServerObserver(activity)
+        observer.onChanged(pendingServerWelcomeDiscoveryUrlPath)
+        verify(exactly = 0) { viewModel.applyPendingServer(pendingLoginServer = any()) }
+    }
+
+    @Test
+    fun loginActivityPendingServerObserver_switchesDefaultOrSalesforceWelcomeDiscoveryLogin_onChangeIntentDataHostOnlyTogglesWelcomeDiscoveryUrlPath() {
+
+        val pendingServerWelcomeDiscoveryUrlPath = "https://welcome.example.com/discovery"
+        val intent = mockk<Intent>(relaxed = true)
+        every { intent.data } returns "https://other.example.com/discovery".toUri()
+        val viewModel = mockk<LoginViewModel>(relaxed = true)
+        val activity = mockk<LoginActivity>(relaxed = true)
+        every { activity.intent } returns intent
+        every { activity.viewModel } returns viewModel
+        every { activity.switchDefaultOrSalesforceWelcomeDiscoveryLogin(any()) } returns true
+        val observer = activity.PendingServerObserver(activity)
+        observer.onChanged(pendingServerWelcomeDiscoveryUrlPath)
+        verify(exactly = 0) { viewModel.applyPendingServer(pendingLoginServer = any()) }
+    }
+
+    @Test
+    fun loginActivityPendingServerObserver_switchesDefaultOrSalesforceWelcomeDiscoveryLogin_onChangeIntentDataHostPlusLoginHintExtras() {
+
+        val pendingServerWelcomeDiscoveryUrlPath = "https://welcome.example.com/discovery"
+        val intent = mockk<Intent>(relaxed = true)
+        every { intent.getStringExtra(EXTRA_KEY_LOGIN_HINT) } returns "[email protected]"
+        every { intent.getStringExtra(EXTRA_KEY_LOGIN_HOST) } returns "welcome.example.com"
+        every { intent.data } returns "https://welcome.example.com/discovery".toUri()
+        val viewModel = mockk<LoginViewModel>(relaxed = true)
+        val activity = mockk<LoginActivity>(relaxed = true)
+        every { activity.intent } returns intent
+        every { activity.viewModel } returns viewModel
+        every { activity.switchDefaultOrSalesforceWelcomeDiscoveryLogin(any()) } returns true
+        val observer = activity.PendingServerObserver(activity)
+        observer.onChanged(pendingServerWelcomeDiscoveryUrlPath)
+        verify(exactly = 0) { viewModel.applyPendingServer(pendingLoginServer = any()) }
+    }
+
     @Test
     fun loginActivity_startsCorrectActivity_onStartDefaultLoginWithHintAndHost() {