Triplehx3/contentdb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix password issues caused by Flask-User migration

Browse Source
This commit is contained in:
rubenwardy
2020-01-19 19:48:41 +00:00
parent 0bda16de6d
commit e115b0678c
7 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/blueprints/users/githublogin.py
View File

@@ -65,7 +65,7 @@ def github_authorized(oauth_token):
flash("Unable to find an account for that Github user", "error")
return redirect(url_for("users.claim"))
elif loginUser(userByGithub):
if current_user.password is None:
if not current_user.hasPassword():
return redirect(next_url or url_for("users.set_password", optional=True))
else:
return redirect(next_url or url_for("homepage.home"))

9
app/blueprints/users/profile.py
View File

@@ -170,7 +170,7 @@ class SetPasswordForm(FlaskForm):
@bp.route("/user/set-password/", methods=["GET", "POST"])
@login_required
def set_password():
if current_user.password is not None:
if current_user.hasPassword():
return redirect(url_for("user.change_password"))
form = SetPasswordForm(request.form)
@@ -185,10 +185,11 @@ def set_password():
hashed_password = user_manager.hash_password(form.password.data)
# Change password
user_manager.update_password(current_user, hashed_password)
current_user.password = hashed_password
db.session.commit()
# Send 'password_changed' email
if user_manager.enable_email and user_manager.send_password_changed_email and current_user.email:
if user_manager.USER_ENABLE_EMAIL and current_user.email:
emails.send_password_changed_email(current_user)
# Send password_changed signal
@@ -211,7 +212,7 @@ def set_password():
task = sendVerifyEmail.delay(newEmail, token)
return redirect(url_for("tasks.check", id=task.id, r=url_for("users.profile", username=current_user.username)))
else:
return redirect(url_for("users.profile", username=current_user.username))
return redirect(url_for("user.login"))
else:
flash("Passwords do not match", "error")