Merge pull request #2826 from brandonpage/master

Cherry-pick "Fix showLoginPage on token revoke." for 13.1.1 patch.

Author: brandonpage

libs/SalesforceSDK/src/com/salesforce/androidsdk/rest/ClientManager.java

@@ -433,7 +433,7 @@ public String getNewAuthToken() {
                         if (Looper.myLooper() == null) {
                             Looper.prepare();
                         }
-                        boolean showLoginPage = accounts.length > 1;
+                        boolean showLoginPage = accounts.length == 1;
                         // Note: As of writing (2024) this call will never succeed because revoke API is an
                         // authenticated endpoint.  However, there is no harm in attempting and the debug logs
                         // produced may help developers better understand the state of their app.

libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/rest/ClientManagerMockTest.kt

@@ -311,8 +311,6 @@ class ClientManagerMockTest {
                 }
             }
         }
-        val accountSlot = slot<Account>()
-        val reasonSlot = slot<OAuth2.LogoutReason>()
         val broadcastIntentSlot = slot<Intent>()
         val mockAccount = mockk<Account>(relaxed = true)
         val mockUser = mockk<UserAccount>(relaxed = true) {
@@ -340,11 +338,9 @@ class ClientManagerMockTest {
         }
         verify(exactly = 1) {
             clientManagerSpy.invalidateToken(OLD_ACCESS_TOKEN)
-            mockSDKManager.logout(capture(accountSlot), any(), any(), capture(reasonSlot))
+            mockSDKManager.logout(mockAccount, any(), true, OAuth2.LogoutReason.REFRESH_TOKEN_EXPIRED)
             mockAppContext.sendBroadcast(capture(broadcastIntentSlot))
         }
-        Assert.assertEquals(mockAccount, accountSlot.captured)
-        Assert.assertEquals(OAuth2.LogoutReason.REFRESH_TOKEN_EXPIRED, reasonSlot.captured)
         Assert.assertEquals(ClientManager.ACCESS_TOKEN_REVOKE_INTENT, broadcastIntentSlot.captured.action)
     }
 
@@ -413,8 +409,6 @@ class ClientManagerMockTest {
                 }
             }
         }
-        val accountSlot = slot<Account>()
-        val reasonSlot = slot<OAuth2.LogoutReason>()
         val broadcastIntentSlot = slot<Intent>()
         val user2Token = "user2-token"
         val mockAccount = mockk<Account>(relaxed = true)
@@ -429,9 +423,6 @@ class ClientManagerMockTest {
             every { refreshToken } returns "user2Refresh"
             every { loginServer } returns "https://login.salesforce.com"
         }
-        val mockClientManager = mockk<ClientManager>(relaxed = true) {
-            every { accounts } returns arrayOf(mockAccount, mockAccount2)
-        }
         // The account that we are not refreshing for is the current account.
         every { mockUserAccountManager.currentUser } returns mockUser2
         every { mockUserAccountManager.currentAccount } returns mockAccount2
@@ -441,7 +432,7 @@ class ClientManagerMockTest {
         every { mockUserAccountManager.updateAccount(mockAccount2, any()) } returns mockk()
         // Use the real clientManager instead of a full mock because revokedTokenShouldLogout is private.
         val clientManagerSpy = spyk(clientManager)
-        every { clientManagerSpy.accounts } returns arrayOf(mockAccount)
+        every { clientManagerSpy.accounts } returns arrayOf(mockAccount, mockAccount2)
         val authTokenProvider = ClientManager.AccMgrAuthTokenProvider(
             clientManagerSpy,
             "https://login.salesforce.com",
@@ -451,7 +442,7 @@ class ClientManagerMockTest {
 
         Assert.assertNull(authTokenProvider.getNewAuthToken())
         verify(exactly = 0) {
-            mockClientManager.invalidateToken(user2Token)
+            clientManagerSpy.invalidateToken(user2Token)
             mockUserAccountManager.updateAccount(any(), any())
             mockSDKManager.logout(mockAccount2, any(), any(), any())
             mockSDKManager.logout(null, any(), any(), any())
@@ -460,11 +451,9 @@ class ClientManagerMockTest {
 
         verify(exactly = 1) {
             clientManagerSpy.invalidateToken(OLD_ACCESS_TOKEN)
-            mockSDKManager.logout(capture(accountSlot), any(), any(), capture(reasonSlot))
+            mockSDKManager.logout(mockAccount, any(), false, OAuth2.LogoutReason.REFRESH_TOKEN_EXPIRED)
             mockAppContext.sendBroadcast(capture(broadcastIntentSlot))
         }
-        Assert.assertEquals(mockAccount, accountSlot.captured)
-        Assert.assertEquals(OAuth2.LogoutReason.REFRESH_TOKEN_EXPIRED, reasonSlot.captured)
         Assert.assertEquals(ClientManager.ACCESS_TOKEN_REVOKE_INTENT, broadcastIntentSlot.captured.action)
     }
 }