@W-20161958: [MSDK 13.1][Android] Cannot login GUS using Welcome endpoint (Adjust covered logic in LoginViewModel)

Author: JohnsonEricAtSalesforce

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

@@ -28,6 +28,7 @@ package com.salesforce.androidsdk.ui
 
 import android.annotation.SuppressLint
 import android.net.Uri
+import android.util.Log
 import android.webkit.CookieManager
 import android.webkit.URLUtil
 import android.webkit.WebView
@@ -65,7 +66,6 @@ import com.salesforce.androidsdk.config.OAuthConfig
 import com.salesforce.androidsdk.security.SalesforceKeyGenerator.getRandom128ByteKey
 import com.salesforce.androidsdk.security.SalesforceKeyGenerator.getSHA256Hash
 import com.salesforce.androidsdk.ui.LoginActivity.Companion.ABOUT_BLANK
-import com.salesforce.androidsdk.ui.LoginActivity.Companion.isSalesforceWelcomeDiscoveryMobileUrl
 import com.salesforce.androidsdk.ui.LoginActivity.Companion.isSalesforceWelcomeDiscoveryUrlPath
 import com.salesforce.androidsdk.util.SalesforceSDKLogger.e
 import kotlinx.coroutines.CoroutineScope
@@ -271,6 +271,7 @@ open class LoginViewModel(val bootConfig: BootConfig) : ViewModel() {
         // Update the web view URL to match the OAuth authorization URL when the web view is applicable
         webViewUrl.addSource(loginUrl) { newLoginUrl ->
             // Note the web view does not reload when browser-based authentication or a UI Bridge API front door bridge URL are active.
+            /* Coverage needed */
             if ((!SalesforceSDKManager.getInstance().isBrowserLoginEnabled && !isUsingFrontDoorBridge) || newLoginUrl == "about:blank" /* Blank is used during reset states such as when returning to the web view from a custom tab, so it's always eligible */) {
                 webViewUrl.value = newLoginUrl
             }
@@ -436,8 +437,9 @@ open class LoginViewModel(val bootConfig: BootConfig) : ViewModel() {
 
         with(SalesforceSDKManager.getInstance()) {
             // Check if the OAuth Config has been manually set by dev support LoginOptionsActivity.
+            val debugOverrideAppConfig = debugOverrideAppConfig
             oAuthConfig = if (isDebugBuild && debugOverrideAppConfig != null) {
-                debugOverrideAppConfig!!
+                debugOverrideAppConfig
             } else {
                 appConfigForLoginHost(server) ?: OAuthConfig(bootConfig)
             }
@@ -514,9 +516,23 @@ open class LoginViewModel(val bootConfig: BootConfig) : ViewModel() {
      * */
     internal fun isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin(
         pendingLoginServerUri: Uri
-    ) = previousPendingLoginServer?.toUri()?.let { previousPendingLoginServerUri ->
-        isSalesforceWelcomeDiscoveryUrlPath(previousPendingLoginServerUri) && !(isSalesforceWelcomeDiscoveryMobileUrl(pendingLoginServerUri))
-    } ?: false
+    ): Boolean {
+        val previousPendingLoginServerUri = previousPendingLoginServer?.toUri() ?: return false
+        val a = isSalesforceWelcomeDiscoveryUrlPath(previousPendingLoginServerUri)
+        val b = !isSalesforceWelcomeDiscoveryUrlPath(pendingLoginServerUri)
+
+        if (!a && !b) {
+            Log.i("WSC", "1")
+        } else if (a && !b) {
+            Log.i("WSC", "2")
+        } else if (!a && b) {
+            Log.i("WSC", "3")
+        } else if (a && b) {
+            Log.i("WSC", "4")
+        }
+
+        return a && b
+    }
 
     // endregion
 

libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/auth/LoginViewModelTest.kt

@@ -657,7 +657,7 @@ class LoginViewModelTest {
     }
 
     @Test
-    fun loginViewModel_isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin_returnsNullOnNullPreviousPendingLoginServer() {
+    fun loginViewModel_isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin_returnsFalseOnNullPreviousPendingLoginServer() {
 
         val exampleUrl = "https://www.example.com" // IETF-Reserved Test Domain
 
@@ -666,7 +666,7 @@ class LoginViewModelTest {
     }
 
     @Test
-    fun loginViewModel_isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin_returnsNullOnUnparsablePreviousPendingLoginServer() {
+    fun loginViewModel_isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin_returnsFalseOnUnparsablePreviousPendingLoginServer() {
 
         val exampleUrl = "https://www.example.com" // IETF-Reserved Test Domain
 
@@ -675,7 +675,7 @@ class LoginViewModelTest {
     }
 
     @Test
-    fun loginViewModel_isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin_returnsTrueOnSwitch() {
+    fun loginViewModel_isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin_returnsTrueOnSwitchToDefault() {
 
         val exampleUrl = "https://www.example.com" // IETF-Reserved Test Domain
 
@@ -684,14 +684,30 @@ class LoginViewModelTest {
     }
 
     @Test
-    fun loginViewModel_isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin_returnsFalseOtherPreviousPendingLoginServer() {
+    fun loginViewModel_isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin_returnsFalseOnSwitchToWelcome() {
+
+        val exampleUrl = "https://www.example.com" // IETF-Reserved Test Domain
+
+        viewModel.previousPendingLoginServer = exampleUrl
+        assertFalse(viewModel.isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin(WELCOME_LOGIN_URL.toUri()))
+    }
+
+    @Test
+    fun loginViewModel_isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin_returnsFalseSwitchBetweenDefaultLoginUrls() {
 
         val exampleUrl = "https://www.example.com" // IETF-Reserved Test Domain
 
         viewModel.previousPendingLoginServer = "https://other.example.com" // IETF-Reserved Test Domain
         assertFalse(viewModel.isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin(exampleUrl.toUri()))
     }
 
+    @Test
+    fun loginViewModel_isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin_returnsFalseSwitchBetweenWelcomeLoginUrls() {
+
+        viewModel.previousPendingLoginServer = WELCOME_LOGIN_URL
+        assertFalse(viewModel.isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin(WELCOME_LOGIN_URL.toUri()))
+    }
+
     private fun generateExpectedAuthorizationUrl(
         server: String,
         codeChallenge: String,