Skip to content
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.

Sign up for GitHub

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

[Hotfix][PLAT-1014] Fix email write only #8590

Merged
merged 2 commits into from
Jul 30, 2018
Merged

[Hotfix][PLAT-1014] Fix email write only #8590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7372fd6
make email a write-only field for NodeContributorsCreateSerializer
Johnetordoff Jul 30, 2018
81c1500
fix tests to not expose email
Johnetordoff Jul 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/nodes/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ class NodeContributorsCreateSerializer(NodeContributorsSerializer):

id = IDField(source='_id', required=False, allow_null=True)
full_name = ser.CharField(required=False)
email = ser.EmailField(required=False, source='user.email')
email = ser.EmailField(required=False, source='user.email', write_only=True)
index = ser.IntegerField(required=False, source='_order')

users = RelationshipField(
Expand Down
18 changes: 14 additions & 4 deletions api_tests/nodes/views/test_node_contributors_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,16 @@ def test_contributor_create_invalid_data(
assert res.status_code == 400
assert res.json['errors'][0]['detail'] == exceptions.ParseError.default_detail

def test_add_contributor_dont_expose_email(
self, app, user, user_two, project_public, data_user_two, url_public):

res = app.post_json_api(
url_public,
data_user_two,
auth=user.auth)
assert res.status_code == 201
assert res.json['data']['attributes'].get('email') is None

def test_add_contributor_is_visible_by_default(
self, app, user, user_two, project_public,
data_user_two, url_public):
Expand Down Expand Up @@ -952,7 +962,7 @@ def test_add_unregistered_contributor_with_fullname(
project_public.reload()
assert res.status_code == 201
assert res.json['data']['attributes']['unregistered_contributor'] == 'John Doe'
assert res.json['data']['attributes']['email'] is None
assert res.json['data']['attributes'].get('email') is None
Copy link
Contributor

Choose a reason for hiding this comment

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

Minor: no need for the code to be defensive in tests. Better to be...assertive 😅 ... about what is expected. In other words, if email isn't expected to be in attributes, test that directly.

assert 'email' not in res.json['data']['attributes']

assert res.json['data']['embeds']['users']['data']['id'] in project_public.contributors.values_list(
'guids___id', flat=True)

Expand All @@ -972,7 +982,7 @@ def test_add_contributor_with_fullname_and_email_unregistered_user(
project_public.reload()
assert res.status_code == 201
assert res.json['data']['attributes']['unregistered_contributor'] == 'John Doe'
assert res.json['data']['attributes']['email'] == 'john@doe.com'
assert res.json['data']['attributes'].get('email') is None
assert res.json['data']['attributes']['bibliographic'] is True
assert res.json['data']['attributes']['permission'] == permissions.WRITE
assert res.json['data']['embeds']['users']['data']['id'] in project_public.contributors.values_list(
Expand All @@ -996,7 +1006,7 @@ def test_add_contributor_with_fullname_and_email_unregistered_user_set_attribute
project_public.reload()
assert res.status_code == 201
assert res.json['data']['attributes']['unregistered_contributor'] == 'John Doe'
assert res.json['data']['attributes']['email'] == 'john@doe.com'
assert res.json['data']['attributes'].get('email') is None
assert res.json['data']['attributes']['bibliographic'] is False
assert res.json['data']['attributes']['permission'] == permissions.READ
assert res.json['data']['embeds']['users']['data']['id'] in project_public.contributors.values_list(
Expand All @@ -1019,7 +1029,7 @@ def test_add_contributor_with_fullname_and_email_registered_user(
project_public.reload()
assert res.status_code == 201
assert res.json['data']['attributes']['unregistered_contributor'] is None
assert res.json['data']['attributes']['email'] == user_contrib.username
assert res.json['data']['attributes'].get('email') is None
assert res.json['data']['embeds']['users']['data']['id'] in project_public.contributors.values_list(
'guids___id', flat=True)

Expand Down