@W-20161958: [MSDK 13.1][Android] Cannot login GUS using Welcome endpoint (loginActivityPendingServerObserver_switchesDefaultOrSalesforceWelcomeDiscoveryLogin_onChangeIntentDataTogglesWelcomeDiscoveryUrlPath)

Author: JohnsonEricAtSalesforce

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

@@ -1055,18 +1055,19 @@ open class LoginActivity : FragmentActivity() {
      * Salesforce Welcome Discovery mobile URL
      */
     private fun useSalesforceWelcomeDiscoveryMobileUrl(uri: Uri) {
-        // Alert the user if the Salesforce Welcome Discovery is disabled.
-        if (!SalesforceSDKManager.getInstance().supportsWelcomeDiscovery) {
-            runOnUiThread {
-                makeText(
-                    this,
-                    getString(salesforce_welcome_is_disabled),
-                    LENGTH_LONG
-                ).show()
+        if (isSalesforceWelcomeDiscoveryMobileUrl(uri)) {
+
+            // Alert the user if the Salesforce Welcome Discovery is disabled.
+            if (!SalesforceSDKManager.getInstance().supportsWelcomeDiscovery) {
+                runOnUiThread {
+                    makeText(
+                        this,
+                        getString(salesforce_welcome_is_disabled),
+                        LENGTH_LONG
+                    ).show()
+                }
             }
-        }
 
-        if (isSalesforceWelcomeDiscoveryMobileUrl(uri)) {
             viewModel.loginUrl.postValue(uri.toString())
         }
     }

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

@@ -368,18 +368,17 @@ class LoginActivityTest {
     @Test
     fun loginActivityPendingServerObserver_appliesPendingServer_onChange() {
 
-        val pendingServerWelcomeDiscovery = "https://welcome.example.com/discovery"
+        val pendingServer = "https://welcome.example.com/discovery"
         val activity = mockk<LoginActivity>(relaxed = true)
         every { activity.intent.data } returns null
         val observer = activity.PendingServerObserver(activity)
-        observer.onChanged(pendingServerWelcomeDiscovery)
-        verify(exactly = 1) { activity.applyPendingServer(pendingServerWelcomeDiscovery) }
+        observer.onChanged(pendingServer)
+        verify(exactly = 1) { activity.applyPendingServer(pendingServer) }
     }
 
     @Test
     fun loginActivityPendingServerObserver_returns_onChangeMatchingIntentData() {
 
-        // Pending server observer returns without action value matching intent data
         val pendingServer = "https://www.example.com" // IETF-Reserved Test Domain
         val activity = mockk<LoginActivity>(relaxed = true)
         every { activity.intent.data } returns pendingServer.toUri()
@@ -388,6 +387,17 @@ class LoginActivityTest {
         verify(exactly = 0) { activity.applyPendingServer(any()) }
     }
 
+    @Test
+    fun loginActivityPendingServerObserver_switchesDefaultOrSalesforceWelcomeDiscoveryLogin_onChangeIntentDataTogglesWelcomeDiscoveryUrlPath() {
+
+        val pendingServerWelcomeDiscoveryUrlPath = "https://welcome.example.com/discovery"
+        val activity = mockk<LoginActivity>(relaxed = true)
+        every { activity.switchDefaultOrSalesforceWelcomeDiscoveryLogin(any()) } returns true
+        val observer = activity.PendingServerObserver(activity)
+        observer.onChanged(pendingServerWelcomeDiscoveryUrlPath)
+        verify(exactly = 0) { activity.applyPendingServer(any()) }
+    }
+
     @Test
     fun loginActivity_startsCorrectActivity_onStartDefaultLoginWithHintAndHost() {