Skip to content

Merge master into dev (resolve LoginViewModel conflicts) #2881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wmathurin merged 4 commits into from
May 8, 2026
Merged

Merge master into dev (resolve LoginViewModel conflicts) #2881

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06d60e1
Replace Log with SalesforceSDKLogger. (#2869)
brandonpage Apr 17, 2026
a454489
Cherry Pick Login for Admin feature (#2872)
brandonpage Apr 25, 2026
d8f3d8c
Fix auth flow regressions. (#2876) (#2877)
brandonpage May 6, 2026
05bd247
Merge master into dev — resolve LoginViewModel/LoginViewModelTest con…
wmathurin May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ import com.salesforce.androidsdk.security.SalesforceKeyGenerator.getSHA256Hash
import com.salesforce.androidsdk.ui.LoginActivity.Companion.ABOUT_BLANK
import com.salesforce.androidsdk.ui.LoginActivity.Companion.isSalesforceWelcomeDiscoveryUrlPath
import com.salesforce.androidsdk.util.SalesforceSDKLogger.e
import kotlin.coroutines.CoroutineContext
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import java.net.URI
import kotlin.coroutines.CoroutineContext

open class LoginViewModel(val bootConfig: BootConfig) : ViewModel() {

Expand Down Expand Up @@ -446,7 +446,7 @@ open class LoginViewModel(val bootConfig: BootConfig) : ViewModel() {
* Generates an OAuth authorization URL for token migration given a login
* [server] and [migrationOAuthConfig].
*/
internal suspend fun generateMigrationAuthorizationPath (
internal suspend fun generateMigrationAuthorizationPath(
server: String,
migrationOAuthConfig: OAuthConfig,
sdkManager: SalesforceSDKManager = SalesforceSDKManager.getInstance(),
Expand Down Expand Up @@ -528,6 +528,7 @@ open class LoginViewModel(val bootConfig: BootConfig) : ViewModel() {
additionalParams[ATTESTATION] = attestation
}


val webServerAuthorizationUrl = OAuth2.getAuthorizationUrl(
/* useWebServerAuthentication = */ true,
sdkManager.useHybridAuthentication,
Expand Down
Loading