Skip to content

Merge master into dev (resolve LoginViewModel conflicts)#2881

Merged
wmathurin merged 4 commits into
forcedotcom:devfrom
wmathurin:dev
May 8, 2026
Merged

Merge master into dev (resolve LoginViewModel conflicts)#2881
wmathurin merged 4 commits into
forcedotcom:devfrom
wmathurin:dev

Conversation

@wmathurin
Copy link
Copy Markdown
Contributor

Summary

  • Merges master back into dev after patch commits landed in master were not yet in dev
  • Resolves conflicts in LoginViewModel.kt and LoginViewModelTest.kt between the App Attestation feature (dev) and the auth flow regression fix cherry-picked to master

Conflict resolutions

Location Dev (kept) Master
generateMigrationAuthorizationPath signature suspend fun fun (non-suspend)
Migration path addlParams additionalParameters (attestation flows through) emptyMap
generateAuthorizationUrl debug config val debugOverrideAppConfig local, no !! inlined with !!
JWT flow additionalParams mutableMapOf() (attestation can be appended) null
Attestation block in generateAuthorizationUrl present absent (pre-attestation)
Test generateMigrationAuthorizationPath_UsesMigrationConfig = runTest { (suspend) plain {
Duplicate CoroutineContext import removed duplicate n/a

Test plan

  • Run ./gradlew :libs:SalesforceSDK:connectedAndroidTestLoginViewModelTest and LoginViewModelMockTest suites must pass
  • Verify token migration flow still sets oAuthConfig to the migration config before code exchange
  • Verify App Attestation parameters appear in authorization URLs when appAttestationClient is configured

brandonpage and others added 4 commits April 16, 2026 17:12
* Add Login for Admin feature and fix existing issues with browser url and custom tabs routing. (forcedotcom#2870)

* Fix Login for Admin string. (forcedotcom#2873)
…flicts

Kept dev's suspend modifier on generateMigrationAuthorizationPath (required for
App Attestation suspend calls), attestation parameter population, mutableMapOf()
for JWT flow additionalParams, and null-safe debugOverrideAppConfig extraction.
Removed duplicate CoroutineContext import introduced by the merge.
@codecov
Copy link
Copy Markdown

codecov Bot commented May 8, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 55.02%. Comparing base (2f4d3e6) to head (05bd247).
⚠️ Report is 2 commits behind head on dev.

Additional details and impacted files
@@              Coverage Diff              @@
##                dev    #2881       +/-   ##
=============================================
- Coverage     65.59%   55.02%   -10.57%     
+ Complexity     3024     2496      -528     
=============================================
  Files           223      226        +3     
  Lines         17629    17751      +122     
  Branches       2300     2317       +17     
=============================================
- Hits          11563     9767     -1796     
- Misses         4988     6974     +1986     
+ Partials       1078     1010       -68     
Components Coverage Δ
Analytics 48.71% <ø> (ø)
SalesforceSDK 41.83% <5.83%> (-19.36%) ⬇️
Hybrid 59.30% <ø> (ø)
SmartStore 78.20% <ø> (ø)
MobileSync 81.68% <ø> (ø)
React 50.54% <ø> (ø)
Files with missing lines Coverage Δ
...src/com/salesforce/androidsdk/ui/LoginViewModel.kt 45.49% <100.00%> (-43.04%) ⬇️

... and 55 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copy link
Copy Markdown
Contributor

@JohnsonEricAtSalesforce JohnsonEricAtSalesforce left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏻

@wmathurin wmathurin merged commit 7d8d3a0 into forcedotcom:dev May 8, 2026
15 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants