Skip to content

[ENG-10586] BE: Ensure only one ORCID ID is availalble in the UserModel.external_identity attribute #11661

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

Open
mkovalua wants to merge 1 commit into
base: feature/orcid-integration
Choose a base branch
from
+8 −3
Open

[ENG-10586] BE: Ensure only one ORCID ID is availalble in the UserModel.external_identity attribute #11661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions api/users/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,10 @@ def post(self, request, *args, **kwargs):
# 1. update user oauth, with pending status
external_identity[external_id_provider][external_id] = 'LINK'
if external_id_provider in user.external_identity:
user.external_identity[external_id_provider].update(external_identity[external_id_provider])
if external_id_provider == 'orcid':
user.external_identity[external_id_provider] = external_identity[external_id_provider]
else:
user.external_identity[external_id_provider].update(external_identity[external_id_provider])
else:
user.external_identity.update(external_identity)
if not user.accepted_terms_of_service and accepted_terms_of_service:
Expand Down Expand Up @@ -1153,7 +1156,6 @@ class ConfirmEmailView(generics.CreateAPIView):

def _process_external_identity(self, user, external_identity, service_url):
"""Handle all external_identity logic, including task enqueueing and url updates."""

provider = next(iter(external_identity))
if provider not in user.external_identity:
raise ValidationError('External-ID provider mismatch.')
Expand Down
5 changes: 4 additions & 1 deletion framework/auth/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,10 @@ def external_login_email_post():
# 1. update user oauth, with pending status
external_identity[external_id_provider][external_id] = 'LINK'
if external_id_provider in user.external_identity:
user.external_identity[external_id_provider].update(external_identity[external_id_provider])
if external_id_provider == 'orcid':
user.external_identity[external_id_provider] = external_identity[external_id_provider]
else:
user.external_identity[external_id_provider].update(external_identity[external_id_provider])
else:
user.external_identity.update(external_identity)
if not user.accepted_terms_of_service and form.accepted_terms_of_service.data:
Expand Down
Loading