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.

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

fix: disabled user login from login via link feature (backport #26134) #26140

Merged
merged 3 commits into from May 3, 2024
Merged

fix: disabled user login from login via link feature (backport #26134) #26140

merged 3 commits into from May 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 24, 2024

no-docs

This is an automatic backport of pull request #26134 done by Mergify.

@rutwikhdev @mergify
fix: disabled user login from login via link feature (#26134)
602ec28 
* fix(ui): button color for login via link template

- blue > black

* fix: restrict login via link for disabled users

* fix: validate user on session.resume

(cherry picked from commit a73e655)

# Conflicts:
#	frappe/www/login.py
@mergify mergify bot requested a review from a team as a code owner April 24, 2024 10:21
@mergify mergify bot requested review from akhilnarang and removed request for a team April 24, 2024 10:21
@mergify mergify bot added the conflicts label Apr 24, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Apr 24, 2024

Cherry-pick of a73e655 has failed:

On branch mergify/bp/version-14-hotfix/pr-26134
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit a73e65581d.
  (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/sessions.py
	modified:   frappe/templates/emails/login_with_email_link.html

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/www/login.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

@ankush
Copy link
Member

ankush commented May 3, 2024

@Mergifyio update

@ankush ankush enabled auto-merge (squash) May 3, 2024 13:21
@mergify Mergify
Copy link
Contributor Author

mergify bot commented May 3, 2024

update

✅ Branch has been successfully updated

@ankush ankush merged commit 96b7542 into version-14-hotfix May 3, 2024
10 of 11 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-26134 branch May 3, 2024 13:41
frappe-pr-bot pushed a commit that referenced this pull request May 7, 2024
@frappe-bot
chore(release): Bumped to Version 14.74.0
5536165 
# [14.74.0](v14.73.0...v14.74.0) (2024-05-07)

### Bug Fixes

* Apply configured perms on address list ([#26334](#26334)) ([#26335](#26335)) ([4307ab4](4307ab4))
* args is a stringified JSON ([98ece0e](98ece0e))
* changes for scheduler reliability (backport [#26292](#26292)) ([#26293](#26293)) ([7691afe](7691afe))
* **Data Import:** don't rely on permission for Data Import Log (backport [#26228](#26228)) ([#26250](#26250)) ([fd0a844](fd0a844))
* **Data Import:** scheduler not needed in dev mode (backport [#24667](#24667)) ([#26264](#26264)) ([9712f14](9712f14))
* disabled user login from login via link feature ([#26134](#26134)) ([#26140](#26140)) ([96b7542](96b7542))
* don't add creation index if one exists ([#26295](#26295)) ([#26297](#26297)) ([c74dcbd](c74dcbd))
* **Geo:** change Canadian dates to ISO 8601 format ([351cd04](351cd04))
* init db conn for unbuffered cursor if not set ([#26220](#26220)) ([#26256](#26256)) ([04afefb](04afefb))
* lstrip for query writes detection ([#26180](#26180)) ([#26252](#26252)) ([6ebfe54](6ebfe54))
* multistep webform page navigation ([d5a25f2](d5a25f2))
* **Navbar Settings:** reload page after save ([#26274](#26274)) ([#26275](#26275)) ([73f265b](73f265b))
* **oauth2:** refresh token is optional ([#26266](#26266)) ([#26271](#26271)) ([d6603c6](d6603c6)), closes [/www.rfc-editor.org/rfc/rfc6749#section-5](https://github.com//www.rfc-editor.org/rfc/rfc6749/issues/section-5)
* only redirect to same domain (backport [#26304](#26304)) ([#26305](#26305)) ([c2f2d6c](c2f2d6c))
* perm query for dashboard (backport [#26239](#26239)) ([#26242](#26242)) ([4ab6a46](4ab6a46))
* reportview average of ints should be float (backport [#26284](#26284)) ([#26287](#26287)) ([c0f3912](c0f3912))
* Treeview DB lookup should perform the same preperation operations as method update_nsm in file nestedset.py ([#26199](#26199)) ([#26259](#26259)) ([01e08f8](01e08f8))

### Features

* `Desk User` role (backport [#22224](#22224)) ([#26237](#26237)) ([171e1d0](171e1d0))
* System Health Report (backport [#26046](#26046)) ([#26255](#26255)) ([f2d2d0c](f2d2d0c))

### Performance Improvements

* Reduce 1 redis call while dumping monitor logs (backport [#26337](#26337)) ([#26338](#26338)) ([75b2a86](75b2a86))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.74.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akhilnarang akhilnarang Awaiting requested review from akhilnarang akhilnarang is a code owner automatically assigned from frappe/frappe-review-team

Assignees

@rutwikhdev rutwikhdev

Labels
conflicts released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ankush @frappe-pr-bot @rutwikhdev