@W-20026518: [MSDK Android] Null OAuth Refresh Token Parameters During User App Upgrade From MSDK 12.0.1 To 13.0.2 Cause Unexpected Logout (#2794)

Author: JohnsonEricAtSalesforce

libs/SalesforceSDK/src/com/salesforce/androidsdk/accounts/UserAccountManager.java

@@ -504,6 +504,8 @@ public Bundle updateAccount(Account account, UserAccount userAccount) {
 
 		final String encryptionKey = SalesforceSDKManager.getEncryptionKey();
 		final String accountName = accountManager.getUserData(account, AccountManager.KEY_ACCOUNT_NAME);
+
+		// Maintenance Note: All account values are nullable by default.  If a value requires a default value when user's of older versions experience access token refresh, provide that here.
 		final String refreshToken = SalesforceSDKManager.decrypt(accountManager.getPassword(account), encryptionKey);
 		final String authToken = decryptUserData(account, AccountManager.KEY_AUTHTOKEN, encryptionKey);
 		final String loginServer = decryptUserData(account, AuthenticatorService.KEY_LOGIN_URL, encryptionKey);
@@ -535,6 +537,7 @@ public Bundle updateAccount(Account account, UserAccount userAccount) {
 		final String cookieSidClient = decryptUserData(account, AuthenticatorService.KEY_COOKIE_SID_CLIENT, encryptionKey);
 		final String sidCookieName = decryptUserData(account, AuthenticatorService.KEY_SID_COOKIE_NAME, encryptionKey);
 		final String clientId = decryptUserData(account, AuthenticatorService.KEY_CLIENT_ID, encryptionKey);
+
 		final String parentSid = decryptUserData(account, AuthenticatorService.KEY_PARENT_SID, encryptionKey);
 		final String tokenFormat = decryptUserData(account, AuthenticatorService.KEY_TOKEN_FORMAT, encryptionKey);
 		final String beaconChildConsumerKey = decryptUserData(account, AuthenticatorService.KEY_BEACON_CHILD_CONSUMER_KEY, encryptionKey);

libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/AuthenticatorService.java

@@ -159,7 +159,7 @@ public Bundle getAuthToken(AccountAuthenticatorResponse response, Account accoun
                 return resBundle;
 
             } catch (Exception e) {
-                SalesforceSDKLogger.w(TAG, "Exception thrown while getting new auth token", e);
+                SalesforceSDKLogger.e(TAG, "Exception thrown while getting new auth token", e);
                 throw new NetworkErrorException(e);
             }
         }

libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/OAuth2.java

@@ -46,15 +46,12 @@
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 import java.util.TimeZone;
-import java.util.TreeSet;
 
 import okhttp3.FormBody;
 import okhttp3.Request;
@@ -452,7 +449,10 @@ public static TokenEndpointResponse refreshAuthToken(HttpAccess httpAccessor, UR
         builder.add(FORMAT, JSON);
         if (addlParams != null ) {
             for (final Map.Entry<String,String> entry : addlParams.entrySet()) {
-                builder.add(entry.getKey(),entry.getValue());
+                // Safely ignore missing values since, for instance, a user account that is being upgraded may not have received that value yet.
+                if (entry.getValue() != null) {
+                    builder.add(entry.getKey(), entry.getValue());
+                }
             }
         }
         return makeTokenEndpointRequest(httpAccessor, loginServer, builder);

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

@@ -508,7 +508,7 @@ private UserAccount refreshStaleToken(Account account) throws NetworkErrorExcept
                 }
                 return null;
             } catch (Exception e) {
-                SalesforceSDKLogger.w(TAG, "Exception thrown while getting new auth token", e);
+                SalesforceSDKLogger.e(TAG, "Exception thrown while getting new auth token", e);
                 throw new NetworkErrorException(e);
             }
         }