-
Notifications
You must be signed in to change notification settings - Fork 26
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.
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
Server side email verification validation #4631
Merged
sergei-maertens
merged 3 commits into
master
from
feature/4542-server-side-email-verification-validation
Sep 4, 2024
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
1c2b26b
:white_check_mark: [#4542] Add tests for email verification validation
sergei-maertens 9e6ee6e
:safety_vest: [#4542] Validate that email address is verified
sergei-maertens 2ab9df6
:globe_with_meridians: [#4542] Add translations for formio strings
sergei-maertens File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,11 @@ | ||
from django.test import SimpleTestCase | ||
from django.test import SimpleTestCase, TestCase | ||
|
||
from rest_framework import serializers | ||
|
||
from openforms.submissions.tests.factories import ( | ||
EmailVerificationFactory, | ||
SubmissionFactory, | ||
) | ||
from openforms.typing import JSONValue | ||
from openforms.validations.base import BasePlugin | ||
|
||
|
@@ -94,3 +98,64 @@ def test_email_with_plugin_validator(self): | |
) | ||
|
||
self.assertFalse(is_valid) | ||
|
||
|
||
class EmailValidationDBTests(TestCase): | ||
def test_require_email_verification(self): | ||
submission = SubmissionFactory.create() | ||
# create some *unrelated* verification records | ||
ev = EmailVerificationFactory.create( | ||
component_key="foo", email="[email protected]", verified=True | ||
) | ||
assert ev.submission != submission | ||
EmailVerificationFactory( | ||
submission=submission, | ||
component_key="foo", | ||
email="[email protected]", | ||
verified=False, | ||
) | ||
EmailVerificationFactory( | ||
submission=submission, | ||
component_key="bar", | ||
email="[email protected]", | ||
verified=True, | ||
) | ||
EmailVerificationFactory( | ||
submission=submission, | ||
component_key="foo", | ||
email="[email protected]", | ||
verified=True, | ||
) | ||
|
||
component: Component = { | ||
"type": "email", | ||
"key": "foo", | ||
"label": "Test", | ||
"openForms": { | ||
"requireVerification": True, | ||
}, | ||
} | ||
data: JSONValue = {"foo": "[email protected]"} | ||
|
||
with self.subTest("not verified"): | ||
is_valid, errors = validate_formio_data( | ||
component, data, submission=submission | ||
) | ||
|
||
self.assertFalse(is_valid) | ||
error = extract_error(errors, "foo") | ||
self.assertEqual(error.code, "unverified") | ||
|
||
with self.subTest("verified"): | ||
# multiple successful verifications should not be a problem | ||
EmailVerificationFactory.create_batch( | ||
2, | ||
submission=submission, | ||
component_key="foo", | ||
email="[email protected]", | ||
verified=True, | ||
) | ||
|
||
is_valid, _ = validate_formio_data(component, data, submission=submission) | ||
|
||
self.assertTrue(is_valid) |
This file contains 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
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested this with multiple verification codes back and forth and with logic rules and indeed it's working as expected (since we allow this kind of behaviour).