Skip to content
This repository has been 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

merged 20 commits into from
Sep 25, 2020

Commits on Jun 3, 2020

  1. add config option for always using userinfo endpoint

    @BBBSnowball
    BBBSnowball committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    e8d43bc View commit details
    Browse the repository at this point in the history

  2. add config option that allows merging OpenID Connect users with exist… 

    …ing users
    @BBBSnowball
    BBBSnowball committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    a1821f3 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2020

  1. Merge branch 'develop' into feature-allows-merging-oidc-with-existing… 

    …-users
    @OmmyZhang
    OmmyZhang committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    0ab81d3 View commit details
    Browse the repository at this point in the history

  2. some format detail

    @OmmyZhang
    OmmyZhang committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    073b3b6 View commit details
    Browse the repository at this point in the history

  3. fix checks

    @OmmyZhang
    OmmyZhang committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    94e52a1 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2020

  1. Merge branch 'develop' into feature-allows-merging-oidc-with-existing… 

    …-users
    @OmmyZhang
    OmmyZhang committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    74e6ddd View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2020

  1. only for for the existing users

    @OmmyZhang
    OmmyZhang committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    5c0ba94 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2020

  1. fix bug and variable name

    @OmmyZhang
    OmmyZhang committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    11b8138 View commit details
    Browse the repository at this point in the history

  2. fix code style

    @OmmyZhang
    OmmyZhang committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    d28b476 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2020

  1. Merge remote-tracking branch 'origin/develop' into feature-allows-mer… 

    …ging-oidc-with-existing-users
    @OmmyZhang
    OmmyZhang committed Sep 12, 2020
    Configuration menu
    Copy the full SHA
    2b4d7b0 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2020

  1. fix comments

    @OmmyZhang
    OmmyZhang committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    0a51c2d View commit details
    Browse the repository at this point in the history

  2. pr 8345

    @OmmyZhang
    OmmyZhang committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    ba3e939 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into feature-allows-mer… 

    …ging-oidc-with-existing-users
    @OmmyZhang
    OmmyZhang committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    4b04c57 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2020

  1. handle multiple matches

    @OmmyZhang
    OmmyZhang committed Sep 21, 2020
    Configuration menu
    Copy the full SHA
    2606ed8 View commit details
    Browse the repository at this point in the history

  2. fix a bug

    @OmmyZhang
    OmmyZhang committed Sep 21, 2020
    Configuration menu
    Copy the full SHA
    8f05f01 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2020

  1. return str

    @OmmyZhang
    OmmyZhang committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    2f4b335 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into feature-allows-mer… 

    …ging-oidc-with-existing-users
    @OmmyZhang
    OmmyZhang committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    841a8af View commit details
    Browse the repository at this point in the history

  3. fix type hints error of get_user_by_external_id

    @OmmyZhang
    OmmyZhang committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    d0f056d View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2020

  1. add tests for allowing OIDC for existing users

    @OmmyZhang
    OmmyZhang committed Sep 24, 2020
    Configuration menu
    Copy the full SHA
    96737c4 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2020

  1. Apply suggestions from code review 

    fix changelog

Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
    @OmmyZhang @clokep
    OmmyZhang and clokep committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    f39d02c View commit details
    Browse the repository at this point in the history