Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Allow OIDC for existing users #8345

Merged
merged 20 commits into from
Sep 25, 2020
Merged

Allow OIDC for existing users #8345

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e8d43bc
add config option for always using userinfo endpoint
BBBSnowball Jun 3, 2020
a1821f3
add config option that allows merging OpenID Connect users with exist…
BBBSnowball Jun 3, 2020
0ab81d3
Merge branch 'develop' into feature-allows-merging-oidc-with-existing…
OmmyZhang Aug 26, 2020
073b3b6
some format detail
OmmyZhang Aug 26, 2020
94e52a1
fix checks
OmmyZhang Aug 26, 2020
74e6ddd
Merge branch 'develop' into feature-allows-merging-oidc-with-existing…
OmmyZhang Aug 27, 2020
5c0ba94
only for for the existing users
OmmyZhang Sep 9, 2020
11b8138
fix bug and variable name
OmmyZhang Sep 11, 2020
d28b476
fix code style
OmmyZhang Sep 11, 2020
2b4d7b0
Merge remote-tracking branch 'origin/develop' into feature-allows-mer…
OmmyZhang Sep 12, 2020
0a51c2d
fix comments
OmmyZhang Sep 18, 2020
ba3e939
pr 8345
OmmyZhang Sep 18, 2020
4b04c57
Merge remote-tracking branch 'origin/develop' into feature-allows-mer…
OmmyZhang Sep 18, 2020
2606ed8
handle multiple matches
OmmyZhang Sep 21, 2020
8f05f01
fix a bug
OmmyZhang Sep 21, 2020
2f4b335
return str
OmmyZhang Sep 23, 2020
841a8af
Merge remote-tracking branch 'origin/develop' into feature-allows-mer…
OmmyZhang Sep 23, 2020
d0f056d
fix type hints error of get_user_by_external_id
OmmyZhang Sep 23, 2020
96737c4
add tests for allowing OIDC for existing users
OmmyZhang Sep 24, 2020
f39d02c
Apply suggestions from code review
OmmyZhang Sep 25, 2020
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/develop' into feature-allows-mer… 
…ging-oidc-with-existing-users
  • Loading branch information
@OmmyZhang
OmmyZhang committed Sep 18, 2020
commit 4b04c57e9553220ac37f4c739cb5334bf58ba1a8

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.