@W-20935841: Bug - P2 - [Android] Login Server Switching Misbehaving (#2822)

Author: JohnsonEricAtSalesforce

libs/SalesforceSDK/res/values/strings.xml

@@ -8,7 +8,6 @@
     <string name="account_type">com.salesforce.androidsdk</string>
     <string name="app_package">com.salesforce.androidsdk</string>
     <string name="cannot_use_another_apps_login_qr_code">Cannot use another app\'s login QR Code.  Please log in to this app.</string>
-    <string name="salesforce_welcome_is_disabled">This app doesn\'t support welcome.salesforce.com. Use another server.</string>
 
     <!-- If you're only supporting recent versions of Android (e.g. 3.x and up), you can override this to be touch and get a better looking login UI  -->
     <string name="oauth_display_type">touch</string>

libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt

@@ -372,13 +372,6 @@ open class SalesforceSDKManager protected constructor(
     @set:Synchronized
     var useWebServerAuthentication = true
 
-
-    /**
-     * Whether or not the app supports welcome discovery.  This should only be
-     * enabled if the connected app is supported.
-     */
-    var supportsWelcomeDiscovery = false
-
     /**
      * Optionally, enables the hybrid authentication flow.  Defaults to true
      */

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

@@ -111,7 +111,6 @@ import com.salesforce.androidsdk.R.color.sf__background_dark
 import com.salesforce.androidsdk.R.color.sf__primary_color
 import com.salesforce.androidsdk.R.drawable.sf__action_back
 import com.salesforce.androidsdk.R.string.cannot_use_another_apps_login_qr_code
-import com.salesforce.androidsdk.R.string.salesforce_welcome_is_disabled
 import com.salesforce.androidsdk.R.string.sf__biometric_opt_in_title
 import com.salesforce.androidsdk.R.string.sf__generic_authentication_error_title
 import com.salesforce.androidsdk.R.string.sf__jwt_authentication_error
@@ -913,26 +912,6 @@ open class LoginActivity : FragmentActivity() {
         }
     }
 
-    /**
-     * Alerts the user if Salesforce Welcome Discovery is disabled.
-     * @param supportsWelcomeDiscovery Indicates if Salesforce Welcome Discovery
-     * is supported.
-     * @return Boolean true if the alert was displayed, false otherwise
-     */
-    @VisibleForTesting
-    internal fun displayWelcomeUnsupportedToastIfNeeded(
-        supportsWelcomeDiscovery: Boolean
-    ) = if (!supportsWelcomeDiscovery) {
-        runOnUiThread {
-            makeText(
-                this,
-                getString(salesforce_welcome_is_disabled),
-                LENGTH_LONG
-            ).show()
-        }
-        true
-    } else false
-
     /**
      * Creates a Salesforce Welcome Discovery mobile URL using the provided
      * Salesforce Welcome Discovery host and path URL.
@@ -1028,7 +1007,6 @@ open class LoginActivity : FragmentActivity() {
      */
     private fun useSalesforceWelcomeDiscoveryMobileUrl(uri: Uri) {
         if (isSalesforceWelcomeDiscoveryMobileUrl(uri)) {
-            displayWelcomeUnsupportedToastIfNeeded(SalesforceSDKManager.getInstance().supportsWelcomeDiscovery)
             viewModel.loginUrl.postValue(uri.toString())
         }
     }
@@ -1470,11 +1448,6 @@ open class LoginActivity : FragmentActivity() {
             if (!uri.isHierarchical) return false
 
             val isDiscovery = isSalesforceWelcomeDiscoveryUrlPath(uri)
-            val discoveryEnabled = SalesforceSDKManager.getInstance().supportsWelcomeDiscovery
-
-            if (isDiscovery && !discoveryEnabled) {
-                w(TAG, "'${uri}' is a discovery domain, but welcome discovery isn't enabled.")
-            }
 
             return isDiscovery && uri.queryParameterNames.contains(
                 SALESFORCE_WELCOME_DISCOVERY_MOBILE_URL_QUERY_PARAMETER_KEY_CLIENT_ID
@@ -1601,7 +1574,7 @@ open class LoginActivity : FragmentActivity() {
         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.getStringExtra(EXTRA_KEY_LOGIN_HOST) == pendingServerUri.host) {
+            if ((activity.intent.data?.host == pendingServerUri.host && activity.intent.data?.path == pendingServerUri.path) || activity.intent.getStringExtra(EXTRA_KEY_LOGIN_HOST) == pendingServerUri.host) {
                 activity.viewModel.previousPendingServer = value
                 return
             }

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

@@ -516,7 +516,9 @@ open class LoginViewModel(val bootConfig: BootConfig) : ViewModel() {
     ) : Observer<String?> {
         override fun onChanged(value: String?) {
             if (!sdkManager.isBrowserLoginEnabled && !viewModel.isUsingFrontDoorBridge && value != null) {
-                val isNewServer = viewModel.loginUrl.value?.startsWith(value) != true
+                val valueUrl = value.toUri()
+                val loginUrl = viewModel.loginUrl.value?.toUri()
+                val isNewServer = loginUrl?.host != valueUrl.host || loginUrl?.path != valueUrl.path
                 if (isNewServer) {
                     scope.launch {
                         viewModel.loginUrl.value = viewModel.getAuthorizationUrl(value)

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

@@ -195,15 +195,8 @@ class LoginActivityTest {
 
     @Test
     fun testIsWelcomeDiscoveryUri() {
-        val supportWelcomeDiscovery = SalesforceSDKManager.getInstance().supportsWelcomeDiscovery
-        SalesforceSDKManager.getInstance().supportsWelcomeDiscovery = false
-
         val validUrl = "https://welcome.salesforce.com$SALESFORCE_WELCOME_DISCOVERY_URL_PATH?$SALESFORCE_WELCOME_DISCOVERY_MOBILE_URL_QUERY_PARAMETER_KEY_CLIENT_ID=X&$SALESFORCE_WELCOME_DISCOVERY_MOBILE_URL_QUERY_PARAMETER_KEY_CLIENT_VERSION=Y&$SALESFORCE_WELCOME_DISCOVERY_MOBILE_URL_QUERY_PARAMETER_KEY_CALLBACK_URL=Z"
 
-        assertTrue(isSalesforceWelcomeDiscoveryMobileUrl(validUrl.toUri()))
-
-        SalesforceSDKManager.getInstance().supportsWelcomeDiscovery = true
-
         val nonHierarchicalUri = "mailto:test@example.com"
 
         val incorrectPathUrl = "https://welcome.salesforce.com/other/path?$SALESFORCE_WELCOME_DISCOVERY_MOBILE_URL_QUERY_PARAMETER_KEY_CLIENT_ID=X&$SALESFORCE_WELCOME_DISCOVERY_MOBILE_URL_QUERY_PARAMETER_KEY_CLIENT_VERSION=Y&$SALESFORCE_WELCOME_DISCOVERY_MOBILE_URL_QUERY_PARAMETER_KEY_CALLBACK_URL=Z"
@@ -231,7 +224,5 @@ class LoginActivityTest {
         assertFalse("Missing callback URL parameter should return false", isSalesforceWelcomeDiscoveryMobileUrl(missingCallbackUrl.toUri()))
 
         assertFalse("Non-welcome URL should return false", isSalesforceWelcomeDiscoveryMobileUrl(otherUrl.toUri()))
-
-        SalesforceSDKManager.getInstance().supportsWelcomeDiscovery = supportWelcomeDiscovery
     }
 }