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(selfservice): Recovery self service flow passes on return_to URL #1920

Merged
merged 7 commits into from
Dec 22, 2021

Conversation

sawadashota
Copy link
Contributor

Related issue(s)

#914

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 green light (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

@codecov
Copy link

codecov bot commented Nov 2, 2021

Codecov Report

Merging #1920 (6d315bb) into master (29eccd7) will decrease coverage by 0.00%.
The diff coverage is 75.00%.

❗ Current head 6d315bb differs from pull request most recent head 341e8b2. Consider uploading reports for the commit 341e8b2 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1920      +/-   ##
==========================================
- Coverage   74.93%   74.92%   -0.01%     
==========================================
  Files         293      293              
  Lines       15318    15331      +13     
==========================================
+ Hits        11478    11487       +9     
- Misses       3012     3014       +2     
- Partials      828      830       +2     
Impacted Files Coverage Δ
selfservice/flow/recovery/handler.go 59.09% <ø> (ø)
selfservice/strategy/link/strategy_recovery.go 63.98% <60.00%> (-0.18%) ⬇️
internal/testhelpers/selfservice_verification.go 100.00% <100.00%> (ø)

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 29eccd7...341e8b2. Read the comment docs.

@sawadashota
Copy link
Contributor Author

@aeneasr Would you please review this PR?

@aeneasr
Copy link
Member

aeneasr commented Nov 22, 2021

Sorry @sawadashota - I did not have a lot of time these past weeks to review PRs. Can you please add an e2e test for this PR? If you need help, please do let me know :)

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.

Looking great, only a few minor requests :))

@@ -271,6 +272,7 @@ func (s *Strategy) recoveryIssueSession(w http.ResponseWriter, r *http.Request,
if err != nil {
return s.retryRecoveryFlowWithError(w, r, flow.TypeBrowser, err)
}
sf.RequestURL = f.RequestURL
Copy link
Member

Choose a reason for hiding this comment

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

This would incorrectly use the original recovery flow as the request URL. But we only need the return_to query parameter - I would suggest we use only that part!

Signed-off-by: sawadashota <[email protected]>
@sawadashota
Copy link
Contributor Author

e2e tests failed at profiles/verification/verify but this is also failed at master branch.

@aeneasr I've fixed. Tests for these seem to be passed!

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.

🙏

@aeneasr aeneasr merged commit b925d35 into ory:master Dec 22, 2021
@aeneasr
Copy link
Member

aeneasr commented Dec 22, 2021

Sorry for taking so long to review!

@sawadashota sawadashota deleted the fix-914 branch December 23, 2021 04:56
peturgeorgievv pushed a commit to senteca/kratos-fork that referenced this pull request Jun 30, 2023
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