Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Only add new globus scopes during plugin load #535

Merged
merged 1 commit into from
Mar 21, 2022
Merged

Conversation

Xarthisius
Copy link
Collaborator

Fixes #534 (for now...). Avoids doubling deriva scope in oauth requests. I'll note that a better solution would be to use set() for scopes in oauth provider, but I don't want to mess with girder proper for now.

How to test?

  1. See 500 error when logging in with ORCID #534
  2. Alternatively:
    $ docker exec -ti -u root $(docker ps --filter=name=girder -q) gosu girder:girder girder-shell
    > from girder.plugins.oauth.providers.globus import Globus
    > Globus._AUTH_SCOPES
    
    verify that there are no duplicates.

@codecov
Copy link

codecov bot commented Mar 15, 2022

Codecov Report

Merging #535 (78957b3) into master (df40eef) will increase coverage by 0.02%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #535      +/-   ##
==========================================
+ Coverage   92.86%   92.88%   +0.02%     
==========================================
  Files          58       58              
  Lines        4554     4556       +2     
==========================================
+ Hits         4229     4232       +3     
+ Misses        325      324       -1     
Impacted Files Coverage Δ
server/__init__.py 90.59% <100.00%> (+0.39%) ⬆️
server/lib/deriva/auth.py 41.17% <100.00%> (-6.20%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0f6d1a9...78957b3. Read the comment docs.

Copy link

@craig-willis craig-willis left a comment

Choose a reason for hiding this comment

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

wfm

@Xarthisius Xarthisius merged commit b48bf9d into master Mar 21, 2022
@Xarthisius Xarthisius deleted the deriva_scope branch March 21, 2022 16:34
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

500 error when logging in with ORCID
2 participants