Merge pull request #2678 from brandonpage/remove_loginoptions

Remove LoginOptions and OAuthWebviewHelper.

Author: brandonpage

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

@@ -325,8 +325,7 @@ public void switchToUser(UserAccount user, int userSwitchType, Bundle extras) {
 		if (user.equals(curUser)) {
 			return;
 		}
-		final ClientManager cm = new ClientManager(context, accountType,
-				SalesforceSDKManager.getInstance().getLoginOptions(), true);
+		final ClientManager cm = new ClientManager(context, accountType, true);
 		final Account account = cm.getAccountByName(user.getAccountName());
 		storeCurrentUserInfo(user.getUserId(), user.getOrgId());
 		cm.peekRestClient(account);
@@ -350,23 +349,17 @@ public void switchToUser(UserAccount user, int userSwitchType, Bundle extras) {
 	 * in ClientManager will return a RestClient instance for the new user.
 	 */
 	public void switchToNewUser() {
-		final Bundle options = SalesforceSDKManager.getInstance().getLoginOptions().asBundle();
-		switchToNewUserWithOptions(options);
+		final Bundle options = new Bundle();
+		final Bundle reply = new Bundle();
+		final Intent i = new Intent(context, SalesforceSDKManager.getInstance().getLoginActivityClass());
+		i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+		options.putBoolean(BiometricAuthenticationManager.SHOW_BIOMETRIC, false);
+		options.putBoolean(LoginActivity.NEW_USER, true);
+		i.putExtras(options);
+		reply.putParcelable(AccountManager.KEY_INTENT, i);
+		context.startActivity(i);
 	}
 
-	/**
-	 * Kicks off the login flow to switch to a new user with jwt. Once the login
-	 * flow is complete, the context will automatically become the
-	 * new user's context and a call to peekRestClient() or getRestClient()
-	 * in ClientManager will return a RestClient instance for the new user.
-	 *
-	 * @param jwt JWT.
-	 * @param url Instance/My domain URL.
-	 */
-	public void switchToNewUser(String jwt, String url) {
-		final Bundle options = SalesforceSDKManager.getInstance().getLoginOptions(jwt, url).asBundle();
-		switchToNewUserWithOptions(options);
-	}
 
 	/**
 	 * Logs the current user out.
@@ -697,17 +690,6 @@ public synchronized void refreshToken(UserAccount userAccount) {
 		}
 	}
 
-	private void switchToNewUserWithOptions(Bundle options) {
-		final Bundle reply = new Bundle();
-		final Intent i = new Intent(context, SalesforceSDKManager.getInstance().getLoginActivityClass());
-		i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-		options.putBoolean(BiometricAuthenticationManager.SHOW_BIOMETRIC, false);
-		options.putBoolean(LoginActivity.NEW_USER, true);
-		i.putExtras(options);
-		reply.putParcelable(AccountManager.KEY_INTENT, i);
-		context.startActivity(i);
-	}
-
 	/**
 	 * Create bundle for authenticator service
 	 * - it uses keys understood by authenticator service

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

@@ -119,7 +119,6 @@ import com.salesforce.androidsdk.push.PushService
 import com.salesforce.androidsdk.push.PushService.Companion.pushNotificationsRegistrationType
 import com.salesforce.androidsdk.push.PushService.PushNotificationReRegistrationType.ReRegistrationOnAppForeground
 import com.salesforce.androidsdk.rest.ClientManager
-import com.salesforce.androidsdk.rest.ClientManager.LoginOptions
 import com.salesforce.androidsdk.rest.RestClient
 import com.salesforce.androidsdk.security.BiometricAuthenticationManager
 import com.salesforce.androidsdk.security.SalesforceKeyGenerator.getEncryptionKey
@@ -188,9 +187,6 @@ open class SalesforceSDKManager protected constructor(
     /** The Android context */
     val appContext: Context = context
 
-    /** Login options associated with the app */
-    private var loginOptionsInternal: LoginOptions? = null
-
     /**
      * Returns the class for the main activity.
      *
@@ -550,42 +546,6 @@ open class SalesforceSDKManager protected constructor(
         }
     }
 
-    /** Login options associated with the app */
-    open val loginOptions: LoginOptions get() = getLoginOptions(null, null)
-
-    /**
-     * Sets the login options associated with the app.
-     *
-     * @param jwt The `jwt`
-     * @param url The URL
-     */
-    open fun getLoginOptions(
-        jwt: String?,
-        url: String?
-    ) = loginOptionsInternal?.apply {
-        this.jwt = jwt
-        setUrl(url)
-    } ?: getBootConfig(
-        appContext
-    ).let { config ->
-        when {
-            isEmpty(jwt) -> LoginOptions(
-                url,
-                config.oauthRedirectURI,
-                config.remoteAccessConsumerKey,
-                config.oauthScopes
-            )
-
-            else -> LoginOptions(
-                url,
-                config.oauthRedirectURI,
-                config.remoteAccessConsumerKey,
-                config.oauthScopes,
-                jwt
-            )
-        }.also { loginOptionsInternal = it }
-    }
-
     /**
      * Indicates if the Salesforce Mobile SDK should automatically log out when
      * the access token is revoked. When overriding this method to return false,
@@ -995,7 +955,6 @@ open class SalesforceSDKManager protected constructor(
         val clientMgr = ClientManager(
             appContext,
             accountType,
-            null,
             shouldLogoutWhenTokenRevoked()
         )
 
@@ -1202,7 +1161,6 @@ open class SalesforceSDKManager protected constructor(
         ClientManager(
             appContext,
             accountType,
-            loginOptions,
             true
         )
     }
@@ -1218,7 +1176,6 @@ open class SalesforceSDKManager protected constructor(
     ): ClientManager = ClientManager(
         appContext,
         accountType,
-        getLoginOptions(jwt, url),
         true
     )
 

libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/AuthenticationUtilities.kt

@@ -26,13 +26,19 @@
  */
 package com.salesforce.androidsdk.auth
 
+import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import com.salesforce.androidsdk.R.string.sf__generic_authentication_error
 import com.salesforce.androidsdk.R.string.sf__generic_authentication_error_title
 import com.salesforce.androidsdk.R.string.sf__managed_app_error
 import com.salesforce.androidsdk.accounts.UserAccount
 import com.salesforce.androidsdk.accounts.UserAccountBuilder
 import com.salesforce.androidsdk.accounts.UserAccountManager
+import com.salesforce.androidsdk.accounts.UserAccountManager.USER_SWITCH_TYPE_DEFAULT
+import com.salesforce.androidsdk.accounts.UserAccountManager.USER_SWITCH_TYPE_FIRST_LOGIN
+import com.salesforce.androidsdk.accounts.UserAccountManager.USER_SWITCH_TYPE_LOGIN
 import com.salesforce.androidsdk.analytics.EventBuilderHelper.createAndStoreEventSync
+import com.salesforce.androidsdk.analytics.SalesforceAnalyticsManager
 import com.salesforce.androidsdk.app.Features.FEATURE_BIOMETRIC_AUTH
 import com.salesforce.androidsdk.app.Features.FEATURE_SCREEN_LOCK
 import com.salesforce.androidsdk.app.SalesforceSDKManager
@@ -46,7 +52,6 @@ import com.salesforce.androidsdk.rest.RestClient.clearCaches
 import com.salesforce.androidsdk.security.BiometricAuthenticationManager
 import com.salesforce.androidsdk.security.BiometricAuthenticationManager.Companion.isBiometricAuthenticationEnabled
 import com.salesforce.androidsdk.security.ScreenLockManager
-import com.salesforce.androidsdk.ui.OAuthWebviewHelper.Companion.MUST_BE_MANAGED_APP_PERM
 import com.salesforce.androidsdk.util.SalesforceSDKLogger.e
 import com.salesforce.androidsdk.util.SalesforceSDKLogger.w
 import kotlinx.coroutines.CoroutineScope
@@ -60,6 +65,12 @@ import org.json.JSONObject
 import java.net.URI
 import java.util.function.Consumer
 
+/**
+ * Set a custom permission on the connected application with that name
+ * for the application to be restricted to managed devices
+ */
+private const val MUST_BE_MANAGED_APP_PERM = "must_be_managed_app"
+
 private const val TAG = "AuthenticationUtilities"
 
 /**
@@ -79,8 +90,10 @@ internal fun onAuthFlowComplete(
     onAuthFlowError: (error: String, errorDesc: String?, e: Throwable?) -> Unit,
     onAuthFlowSuccess: (userAccount: UserAccount) -> Unit,
     buildAccountName: (username: String?, instanceServer: String?) -> String = ::defaultBuildAccountName,
+    nativeLogin: Boolean = false,
 ) {
     val context = SalesforceSDKManager.getInstance().appContext
+    val userAccountManager = SalesforceSDKManager.getInstance().userAccountManager
     val blockIntegrationUser = SalesforceSDKManager.getInstance().shouldBlockSalesforceIntegrationUser &&
             fetchIsSalesforceIntegrationUser(tokenResponse, loginServer)
 
@@ -124,6 +137,7 @@ internal fun onAuthFlowComplete(
         .accountName(buildAccountName(userIdentity?.username, tokenResponse.instanceUrl))
         .loginServer(loginServer)
         .clientId(consumerKey)
+        .nativeLogin(nativeLogin)
         .build()
     account.downloadProfilePhoto()
 
@@ -141,7 +155,7 @@ internal fun onAuthFlowComplete(
         if (existingUsers.contains(account)) {
             val duplicateUserAccount = existingUsers.removeAt(existingUsers.indexOf(account))
             clearCaches()
-            UserAccountManager.getInstance().clearCachedCurrentUser()
+            userAccountManager.clearCachedCurrentUser()
 
             // Revoke existing refresh token
             if (account.refreshToken != duplicateUserAccount.refreshToken) {
@@ -172,7 +186,7 @@ internal fun onAuthFlowComplete(
             existingUsers.forEach(Consumer { existingUser ->
                 if (isBiometricAuthenticationEnabled(existingUser)) {
                     // This is an unexpected logout(s) because we only support one Bio Auth user.
-                    SalesforceSDKManager.getInstance().userAccountManager.signoutUser(
+                    userAccountManager.signoutUser(
                         existingUser, null, false, OAuth2.LogoutReason.UNEXPECTED
                     )
                 }
@@ -183,8 +197,35 @@ internal fun onAuthFlowComplete(
     // Save the user account
     addAccount(account)
 
+    // Init user logging
+    SalesforceAnalyticsManager.getInstance(account)?.updateLoggingPrefs()
+
+    // Send User Switch Intent, create user and switch to user.
+    val numAuthenticatedUsers = userAccountManager.authenticatedUsers?.size ?: 0
+    val userSwitchType = when {
+        // We've already authenticated the first user, so there should be one
+        numAuthenticatedUsers == 1 -> USER_SWITCH_TYPE_FIRST_LOGIN
+
+        // Otherwise we're logging in with an additional user
+        numAuthenticatedUsers > 1 -> USER_SWITCH_TYPE_LOGIN
+
+        // This should never happen but if it does, pass in the "unknown" value
+        else -> USER_SWITCH_TYPE_DEFAULT
+    }
+    userAccountManager.sendUserSwitchIntent(userSwitchType, null)
+    userAccountManager.createAccount(account)
+    userAccountManager.switchToUser(account)
+
     // Kickoff the end of the flow before storing mobile policy to prevent launching
     // the main activity over/after the screen lock.
+    with(SalesforceSDKManager.getInstance()) {
+        appContext.startActivity(Intent(appContext, mainActivityClass).apply {
+            setPackage(appContext.packageName)
+            flags = FLAG_ACTIVITY_NEW_TASK
+        })
+    }
+
+    // Let the calling process resume
     onAuthFlowSuccess(account)
 
     // Screen lock required by mobile policy

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

@@ -105,10 +105,6 @@ public IBinder onBind(Intent intent) {
     }
 
     private static class Authenticator extends AbstractAccountAuthenticator {
-
-    	private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";
-    	private static final String ANDROID_PACKAGE_NAME = "androidPackageName";
-
         private final Context context;
 
         Authenticator(Context ctx) {
@@ -122,24 +118,16 @@ public Bundle addAccount(AccountAuthenticatorResponse response,
                         String authTokenType,
                         String[] requiredFeatures,
                         Bundle options) {
-        	if (isAddFromSettings(options)) {
-        		options.putAll(SalesforceSDKManager.getInstance().getLoginOptions().asBundle());
-        	}
         	return makeAuthIntentBundle(response, options);
         }
 
-        private boolean isAddFromSettings(Bundle options) {
-			return options.containsKey(ANDROID_PACKAGE_NAME)
-                    && SETTINGS_PACKAGE_NAME.equals(options.getString(ANDROID_PACKAGE_NAME));
-		}
-
         @Override
         public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account,
                             String authTokenType, Bundle options) throws NetworkErrorException {
-
             UserAccount originalUserAccount = UserAccountManager.getInstance().buildUserAccount(account);
-            final Map<String,String> addlParamsMap = SalesforceSDKManager.getInstance().getLoginOptions().getAdditionalParameters();
+
             try {
+                final Map<String,String> addlParamsMap = originalUserAccount.getAdditionalOauthValues();
                 final OAuth2.TokenEndpointResponse tr = OAuth2.refreshAuthToken(HttpAccess.DEFAULT,
                         new URI(originalUserAccount.getLoginServer()), originalUserAccount.getClientId(), originalUserAccount.getRefreshToken(), addlParamsMap);
 
@@ -172,10 +160,6 @@ public Bundle getAuthToken(AccountAuthenticatorResponse response, Account accoun
             }
         }
 
-        private String decryptUserData(AccountManager mgr, Account account, String key, String encryptionKey) {
-            return  SalesforceSDKManager.decrypt(mgr.getUserData(account, key), encryptionKey);
-        }
-
         private Bundle makeAuthIntentBundle(AccountAuthenticatorResponse response, Bundle options) {
             final Bundle reply = new Bundle();
             final Intent i = new Intent(context, SalesforceSDKManager.getInstance().getLoginActivityClass());