Skip to content

Commit 58aa808

Browse files
committed
update literal from 'orcid' to 'ORCID'
1 parent 41ad2da commit 58aa808

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

api/users/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,8 @@ def post(self, request, *args, **kwargs):
755755
# 1. update user oauth, with pending status
756756
external_identity[external_id_provider][external_id] = 'LINK'
757757
if external_id_provider in user.external_identity:
758-
if external_id_provider == 'orcid':
758+
# v2 looks to be used for auth but add orcid external identity rewrite updates for v1 as well
759+
if external_id_provider == settings.EXTERNAL_IDENTITY_PROFILE.get('OrcidProfile'):
759760
user.external_identity[external_id_provider] = external_identity[external_id_provider]
760761
else:
761762
user.external_identity[external_id_provider].update(external_identity[external_id_provider])

api_tests/users/views/test_user_external_login.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,18 @@ def test_existing_user(self, app, payload, url, user_one, session_data, csrf_tok
9090

9191
def test_existing_user_orcid_overwrites(self, app, payload, url, user_one, session_data, csrf_token):
9292
user_one.external_identity = {
93-
'orcid': {
93+
'ORCID': {
9494
'0000-0000-0000-0000': 'LINK',
9595
}
9696
}
9797
user_one.save()
9898
app.set_cookie(CSRF_COOKIE_NAME, csrf_token)
9999
app.set_cookie(settings.COOKIE_NAME, str(session_data))
100-
assert '0000-0000-0000-0000' in user_one.external_identity['orcid']
100+
assert '0000-0000-0000-0000' in user_one.external_identity['ORCID']
101101
payload['data']['attributes']['email'] = user_one.username
102102
with capture_notifications():
103103
res = app.post_json_api(url, payload, headers={'X-CSRFToken': csrf_token})
104104
assert res.status_code == 200
105105
user_one.reload()
106-
assert '0000-0000-0000-0000' not in user_one.external_identity['orcid']
107-
assert user_one.external_identity['orcid'] == {'1234-1234-1234-1234': 'LINK'}
106+
assert '0000-0000-0000-0000' not in user_one.external_identity['ORCID']
107+
assert user_one.external_identity['ORCID'] == {'1234-1234-1234-1234': 'LINK'}

framework/auth/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1097,7 +1097,8 @@ def external_login_email_post():
10971097
# 1. update user oauth, with pending status
10981098
external_identity[external_id_provider][external_id] = 'LINK'
10991099
if external_id_provider in user.external_identity:
1100-
if external_id_provider == 'orcid':
1100+
# v2 looks to be used for auth but add orcid external identity rewrite updates for v1 as well
1101+
if external_id_provider == settings.EXTERNAL_IDENTITY_PROFILE.get('OrcidProfile'):
11011102
user.external_identity[external_id_provider] = external_identity[external_id_provider]
11021103
else:
11031104
user.external_identity[external_id_provider].update(external_identity[external_id_provider])

0 commit comments

Comments
 (0)