Skip to content

Commit

Permalink
Rebase and resolve conflicts in poetry.lock
Browse files Browse the repository at this point in the history
  • Loading branch information
matkaczmarek committed Oct 4, 2024
1 parent 13a115f commit ed65f4f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion physionet-django/user/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ def validate_nan(value):
if re.fullmatch(r'[0-9\-+()]*', value):
raise ValidationError('Cannot be a number.')


def validate_orcid_token(value):
"""
Validation to verify the token returned during
Expand All @@ -219,6 +220,7 @@ def validate_orcid_token(value):
if not re.fullmatch(r'^[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}$', value):
raise ValidationError('ORCID token is not in expected format.')


def validate_orcid_id_token(token):
"""
When openid scope is enabled then ORCID returns
Expand Down Expand Up @@ -246,7 +248,7 @@ def validate_orcid_id_token(token):
audience=settings.ORCID_CLIENT_ID,
issuer=settings.ORCID_DOMAIN
)
except jwt.InvalidTokenError as e:
except jwt.InvalidTokenError:
raise ValidationError('ORCID id_token is invalid.')

def validate_orcid_id(value):
Expand Down
2 changes: 1 addition & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ed65f4f

Please sign in to comment.