feat: add email for 2fa not yet enabled on upload #14444
Merged
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
As preparation for adding 2FA requirement for everyone, update the base `UserFactory` to have a random `totp_secret` value, which then makes `User.has_2fa` return `True` during tests. Make explicit `None` in test cases that are asserting about specifics. This is simpler than updating the ~50 test cases in forklift/test_legacy.py, not to mention the other 400+ test locations that use `UserFactory`. Signed-off-by: Mike Fiedler <[email protected]>
As a way to create an activity-based campaign, enable the email on file upload. Use the `repeat_window` to only send the email again within the 14 (or 90 in the event of failure) day window. Resolves pypi#13761 Signed-off-by: Mike Fiedler <[email protected]>
|
An example of the HTML email, for easier viewing: 
|
ewdurbin
approved these changes
Aug 29, 2023
| @@ -1493,6 +1494,11 @@ def file_upload(request): | |||
| }, | |||
| ) | |||
|
|
|||
| # Check if the user has any 2FA methods enabled, and if not, email them. | |||
| if request.user and not request.user.has_two_factor: | |||
There was a problem hiding this comment.
Two questions: under what conditions would request.user be falsy rather than None here? should we be doing a request.user is None instead of implicit falsy check?
There was a problem hiding this comment.
Looks like it's either a sqlalchemy object or None.
I followed the pattern that others had implemented in this 700+ line function where others use if request.user.
Signed-off-by: Mike Fiedler <[email protected]>
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.
As a way to create an activity-based campaign, enable the email on file upload.
Use the
repeat_windowto only send the email again within the 14 (or 90 in the event of failure) day window.Resolves #13761
Includes a test commit refactor to supply
totp_secretby default.