Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

fix: account linking with 2FA #4188

Merged
merged 4 commits into from
Nov 7, 2024
Merged

fix: account linking with 2FA #4188

merged 4 commits into from
Nov 7, 2024

Conversation

hperl
Copy link
Contributor

@hperl hperl commented Nov 4, 2024

This fixes some edge cases with OIDC account linking for accounts with 2FA enabled.

Related issue(s)

Checklist

  • I have read the contributing guidelines.
  • I have referenced an issue containing the design document if my change
    introduces a new feature.
  • I am following the
    contributing code guidelines.
  • I have read the security policy.
  • I confirm that this pull request does not address a security
    vulnerability. If this pull request addresses a security vulnerability, I
    confirm that I got the approval (please contact
    [email protected]) from the maintainers to push
    the changes.
  • I have added tests that prove my fix is effective or that my feature
    works.
  • I have added or changed the documentation.

Further Comments

@hperl hperl self-assigned this Nov 4, 2024
Copy link

codecov bot commented Nov 4, 2024

Codecov Report

Attention: Patch coverage is 56.41026% with 34 lines in your changes missing coverage. Please review.

Project coverage is 78.46%. Comparing base (234b6f2) to head (e17557a).

Files with missing lines Patch % Lines
selfservice/flow/login/hook.go 46.66% 13 Missing and 3 partials ⚠️
selfservice/strategy/oidc/strategy_settings.go 67.74% 6 Missing and 4 partials ⚠️
selfservice/flow/login/handler.go 30.00% 7 Missing ⚠️
selfservice/flow/registration/hook.go 85.71% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4188      +/-   ##
==========================================
- Coverage   78.84%   78.46%   -0.38%     
==========================================
  Files         380      380              
  Lines       27577    27176     -401     
==========================================
- Hits        21743    21325     -418     
- Misses       4204     4224      +20     
+ Partials     1630     1627       -3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@aeneasr aeneasr left a comment

Choose a reason for hiding this comment

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

Just two minor things otherwise LGTM

selfservice/strategy/oidc/strategy_login.go Outdated Show resolved Hide resolved
@hperl hperl requested a review from aeneasr November 6, 2024 08:55
@hperl hperl merged commit 4a870a6 into master Nov 7, 2024
27 checks passed
@hperl hperl deleted the hperl/fix-account-linking-2fa branch November 7, 2024 08:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants