Fix failed login if api_instance_url is missing.

Author: brandonpage

libs/SalesforceSDK/src/com/salesforce/androidsdk/accounts/UserAccountBuilder.kt

@@ -615,7 +615,7 @@ class UserAccountBuilder private constructor() {
             tokenFormat,
             beaconChildConsumerKey,
             beaconChildConsumerSecret,
-            apiInstanceServer
+            apiInstanceServer,
         )
     }
 

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

@@ -906,7 +906,9 @@ public TokenEndpointResponse(Response response, List<String> additionalOauthKeys
                 Log.d(TAG, "parsedResponse-->" + parsedResponse);
                 authToken = parsedResponse.getString(ACCESS_TOKEN);
                 instanceUrl = parsedResponse.getString(INSTANCE_URL);
-                apiInstanceUrl = parsedResponse.getString(API_INSTANCE_URL);
+                if (parsedResponse.has(API_INSTANCE_URL)) {
+                    apiInstanceUrl = parsedResponse.getString(API_INSTANCE_URL);
+                }
                 idUrl = parsedResponse.getString(ID);
                 computeOtherFields();
                 if (parsedResponse.has(REFRESH_TOKEN)) {

native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/ExplorerActivity.java

@@ -791,7 +791,6 @@ private void exportCredentials() {
 		credsMap.put("test_redirect_uri", config.getOauthRedirectURI());
 		credsMap.put("refresh_token", user.getRefreshToken());
 		credsMap.put("instance_url", user.getInstanceServer());
-		credsMap.put("api_instance_url", user.getApiInstanceServer());
 		credsMap.put("identity_url", user.getIdUrl());
 		credsMap.put("access_token", "__NOT_REQUIRED__");
 		credsMap.put("organization_id", user.getOrgId());
@@ -804,6 +803,10 @@ private void exportCredentials() {
 			credsMap.put("community_url", user.getCommunityUrl());
 		}
 
+		if (user.getApiInstanceServer() != null) {
+			credsMap.put("api_instance_url", user.getApiInstanceServer());
+		}
+
 		String credentials = new JSONObject(credsMap).toString().replaceAll("\\\\", "");
 		ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
 		ClipData data = ClipData.newPlainText("credentials", credentials);