mgt c10 complete merge to put bootstrap css changes on their own fork

This commit is contained in:
2024-08-05 01:28:09 -07:00
parent 3d1f21ffcb
commit b3b188f370
4 changed files with 14 additions and 12 deletions

View File

@@ -10,7 +10,7 @@ from app.models import User, Post
from app.email import send_password_reset_email
#debug:
import sys
#import sys
@app.before_request
def before_request():
@@ -90,15 +90,12 @@ def register():
@app.route('/reset_password/<token>', methods=['GET', 'POST'])
def reset_password(token):
if current_user.is_authenticated:
print('rp user is authed', file=sys.stderr)
return redirect(url_for('index'))
user = User.verify_reset_password_token(token)
if not user:
print('rp not user', file=sys.stderr)
return redirect(url_for('index'))
form = ResetPasswordForm()
if form.validate_on_submit():
print('rp validated', file=sys.stderr)
user.set_password(form.password.data)
db.session.commit()
flash('Your password has been reset.')
@@ -175,14 +172,11 @@ def unfollow(username):
@app.route('/reset_password_request', methods=['GET', 'POST'])
def reset_password_request():
if current_user.is_authenticated:
print('rpr user is authed', file=sys.stderr)
return redirect(url_for('index'))
form = ResetPasswordRequestForm()
if form.validate_on_submit():
print('rpr form validated', file=sys.stderr)
user = db.session.scalar(sa.select(User).where(User.email == form.email.data))
if user:
print('rpr if user', file=sys.stderr)
send_password_reset_email(user)
flash('Password reset sent.')
return redirect(url_for('login'))