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

fix password reset not working on custom cp reset page #640

Merged
merged 1 commit into from
Oct 27, 2023
Merged

fix password reset not working on custom cp reset page #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,29 @@ jobs:
flake8:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- run: pip install flake8
- run: flake8

mypy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- run: pip install -Ur mypy-requirements.txt
- run: mypy .

black:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- run: pip install black~=23.0
- run: black --check .
2 changes: 1 addition & 1 deletion newsroom/auth/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def send_token(user, token_type="validate", update_token=True):
if update_token:
updates = {}
add_token_data(updates)
superdesk.get_resource_service("users").patch(id=bson.ObjectId(user["_id"]), updates=updates)
superdesk.get_resource_service("users").system_update(bson.ObjectId(user["_id"]), updates, user)
token = updates["token"]

if token_type == "validate":
Expand Down
4 changes: 0 additions & 4 deletions newsroom/users/users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,10 +365,6 @@ def check_permissions(self, doc, updates=None):
elif request and request.method == "DELETE" and doc.get("_id") != manager.get("_id"):
return

if request.url_rule and request.url_rule.rule:
if request.url_rule.rule in ["/reset_password/<token>", "/token/<token_type>"]:
return

if request.method != "DELETE" and (
not updated_fields or all([key in USER_PROFILE_UPDATES for key in updated_fields])
):
Expand Down