8000 refactor: Reset password flow (backport #24857) by mergify[bot] · Pull Request #24861 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

refactor: Reset password flow (backport #24857) #24861

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 6 commits into from
Feb 19, 2024
Merged

refactor: Reset password flow (backport #24857) #24861

merged 6 commits into from
Feb 19, 2024

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Feb 11, 2024

This is an automatic backport of pull request #24857 done by Mergify.
Cherry-pick of 4c925e0 has failed:

On branch mergify/bp/version-15-hotfix/pr-24857
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 4c925e0325.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   frappe/core/doctype/user/patches/__init__.py
	new file:   frappe/core/doctype/user/patches/hash_reset_password_tokens.py
	modified:   frappe/utils/data.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/user/user.json
	both modified:   frappe/core/doctype/user/user.py
	both modified:   frappe/patches.txt
	both modified:   frappe/tests/test_utils.py

Cherry-pick of 38565a8 has failed:

On branch mergify/bp/version-15-hotfix/pr-24857
Your branch is ahead of 'origin/version-15-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 38565a80e3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/tests/utils.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/user/test_user.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Feb 11, 2024
@mergify mergify bot requested review from a team and akhilnarang and removed request for a team February 11, 2024 15:30
@mergify mergify bot assigned ankush Feb 11, 2024
@ankush ankush enabled auto-merge (squash) February 12, 2024 06:13
@ankush
chore: remove default UI tours
cc7294e 
Experiment 🤷
(cherry picked from commit 74071c1)
@ankush
refactor: Reset password flow
035e549 
- Hash one time reset tokens instead of storing them as is
- Up the perm level
- Use better source of randomness for generating token
- minor code cleanup here and there

(cherry picked from commit 4c925e0)

# Conflicts:
#	frappe/core/doctype/user/user.json
#	frappe/core/doctype/user/user.py
#	frappe/patches.txt
#	frappe/tests/test_utils.py
@ankush
test: redo reset password tests
92489df 
(cherry picked from commit 38565a8)

# Conflicts:
#	frappe/core/doctype/user/test_user.py
@ankush
fix(UX): usability of reset password page
9cd3e28 
- password managers use paste, added that event to trigger our code
- if no password policy then skip. Way too much needless business logic in HTML here.

(cherry picked from commit 78264a7)
@ankush
chore: conflicts
8b85672
@ankush ankush force-pushed the mergify/bp/version-15-hotfix/pr-24857 branch from a415f48 to 8b85672 Compare February 19, 2024 10:09
@ankush ankush disabled auto-merge February 19, 2024 10:37
@ankush ankush force-pushed the mergify/bp/version-15-hotfix/pr-24857 branch from f3db85f to 10dd7e8 Compare February 19, 2024 10:40
@ankush ankush force-pushed the mergify/bp/version-15-hotfix/pr-24857 branch from 10dd7e8 to 362922e Compare February 19, 2024 13:06
@ankush ankush enabled auto-merge (squash) February 19, 2024 13:06
@ankush ankush merged commit e80ed8c into version-15-hotfix Feb 19, 2024
@ankush ankush deleted the mergify/bp/version-15-hotfix/pr-24857 branch February 19, 2024 13:20
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.15.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@akhilnarang akhilnarang Awaiting requested review from akhilnarang

Assignees

@ankush ankush

Labels
conflicts released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @ankush
0