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

Record the SSO Auth Provider in the login token #9510

Merged
merged 14 commits into from
Mar 4, 2021
Merged

Record the SSO Auth Provider in the login token #9510

merged 14 commits into from
Mar 4, 2021

Commits on Feb 28, 2021

  1. Factor out satisfy_expiry function

    @richvdh
    richvdh committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    c5934f8 View commit details
    Browse the repository at this point in the history

  2. Factor out get_value_from_macaroon utility function

    @richvdh
    richvdh committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    444c697 View commit details
    Browse the repository at this point in the history

  3. get_value_from_macaroon: check only one instance of caveat

    @richvdh
    richvdh committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    7fa4d77 View commit details
    Browse the repository at this point in the history

  4. Replace get_user_id_from_macaroon with calls to get_value_from_macaroon

    @richvdh
    richvdh committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    7f104a2 View commit details
    Browse the repository at this point in the history

  5. create verify_short_term_login_token function 

    short-term-login tokens and access tokens use somewhat different caveats, so I
think it makes more sense to use a different verify method. Putting it next to
the generator makes it easier to keep them in sync.
    @richvdh
    richvdh committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    d651626 View commit details
    Browse the repository at this point in the history

  6. Return an object from validate_short_term_login_token_and_get_user_id 

    ... and rename it to `validate_short_term_login_token`.
    @richvdh
    richvdh committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    0b8dfb1 View commit details
    Browse the repository at this point in the history

  7. Allow login tokens to include auth_provider_id

    @richvdh
    richvdh committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    3d4902b View commit details
    Browse the repository at this point in the history

  8. Store auth provider id in login tokens

    @richvdh
    richvdh committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    f2466b2 View commit details
    Browse the repository at this point in the history

  9. changelog

    @richvdh
    richvdh committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    cd7448e View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. Ensure that each login token has an auth provider id

    @richvdh
    richvdh committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    a7e5112 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Merge remote-tracking branch 'origin/develop' into rav/auth_provider_… 

    …in_login_token
    @richvdh
    richvdh committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    cf5b9e1 View commit details
    Browse the repository at this point in the history

  2. fix tests

    @richvdh
    richvdh committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    94226a4 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. Remove support for default values in macaroons

    @richvdh
    richvdh committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    92a2f05 View commit details
    Browse the repository at this point in the history

  2. auth_provider_id is no longer Optional

    @richvdh
    richvdh committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    ee4f580 View commit details
    Browse the repository at this point in the history