Merge master into dev (resolve LoginViewModel conflicts)#2881
Merged
Conversation
* 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 Report✅ All modified and coverable lines are covered by tests. 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
🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
LoginViewModel.ktandLoginViewModelTest.ktbetween the App Attestation feature (dev) and the auth flow regression fix cherry-picked to masterConflict resolutions
generateMigrationAuthorizationPathsignaturesuspend funfun(non-suspend)addlParamsadditionalParameters(attestation flows through)emptyMapgenerateAuthorizationUrldebug configval debugOverrideAppConfiglocal, no!!!!additionalParamsmutableMapOf()(attestation can be appended)nullgenerateAuthorizationUrlgenerateMigrationAuthorizationPath_UsesMigrationConfig= runTest {(suspend){CoroutineContextimportTest plan
./gradlew :libs:SalesforceSDK:connectedAndroidTest—LoginViewModelTestandLoginViewModelMockTestsuites must passoAuthConfigto the migration config before code exchangeappAttestationClientis configured