[WIDP] feat: backport email verification and email 2FA to 2.41.3.1 #88
Conversation
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
* feat: email verification (cherry picked from commit 2677448) [SMS2FA]
This includes manual merge conflict resolution and fixes because incompatible changes. Most of them tagged with [SMS2FA] (cherry picked from commit 80e3d05)
Manual resolutions tagged with [SMS2FA] (cherry picked from commit 402e2b7)
(cherry picked from commit 642d24c)
manual resolutions for SystemSettingManager + fix from previous commit (cherry picked from commit 015736f)
* fix: when you change your email and re-verify your email, 2FA needs to be disabled (cherry picked from commit e0327d8)
* feat: expose allowed 2FA types in the configuration endpoint (cherry picked from commit 7eb6381)
[SMS2FA] also added back ApplicationEventPublisher and HttpSessionEventPublisher (cherry picked from commit 80e3d05)
(cherry picked from commit 2ca0ee4)
(cherry picked from commit c56507a)
(cherry picked from commit 48a1168)
dhis-test-web-api tests were failing. This is not defined this way in upstream.
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.
Required by: https://app.clickup.com/t/8699feudb
This PR backports email verification and email 2FA features from
2.42to2.41.3.1via cherry-picking and manual conflict resolution.It also includes support for multiple
TwoFactorTypevalues, which is essential for implementing additional 2FA methods like SMS.Testing requires a modified version of the latest
user-settings-app(100.7.4).To enable, in
dhis_2.confuse:Pending: