Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2025-01-09 14:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add email changed email

Browse Source
This commit is contained in:
rubenwardy 2020-12-05 21:30:36 +00:00
parent d654113204
commit da3175e7bd
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/blueprints/users/account.py
View File

@ -23,7 +23,7 @@ from wtforms import *
from wtforms.validators import * from wtforms.validators import *
from app.models import * from app.models import *
from app.tasks.emails import sendVerifyEmail, send_anon_email, sendUnsubscribeVerifyEmail from app.tasks.emails import sendVerifyEmail, send_anon_email, sendUnsubscribeVerifyEmail, send_user_email
from app.utils import randomString, make_flask_login_password, is_safe_url, check_password_hash, addAuditLog from app.utils import randomString, make_flask_login_password, is_safe_url, check_password_hash, addAuditLog
from passlib.pwd import genphrase from passlib.pwd import genphrase
@ -284,11 +284,18 @@ def verify_email():
was_activating = not user.is_active was_activating = not user.is_active
if user.email != ver.email and ver.email: if ver.email and user.email != ver.email:
if User.query.filter_by(email=ver.email).count() > 0: if User.query.filter_by(email=ver.email).count() > 0:
flash("Another user is already using that email", "danger") flash("Another user is already using that email", "danger")
return redirect(url_for("homepage.home")) return redirect(url_for("homepage.home"))
flash("Confirmed email change", "success")
if user.email:
send_user_email.delay(user.email,
"Email address changed",
"Your email address has changed. If you didn't request this, please contact an administrator.")
user.is_active = True user.is_active = True
user.notification_preferences = user.notification_preferences or UserNotificationPreferences(user) user.notification_preferences = user.notification_preferences or UserNotificationPreferences(user)
user.email = ver.email user.email = ver.email

6
app/blueprints/users/settings.py
View File

@ -136,8 +136,10 @@ def handle_email_notifications(user, prefs, is_new, form):
db.session.add(ver) db.session.add(ver)
db.session.commit() db.session.commit()
task = sendVerifyEmail.delay(newEmail, token) flash("Check your email to confirm it", "success")
return redirect(url_for("tasks.check", id=task.id, r=url_for("users.profile", username=user.username)))
sendVerifyEmail.delay(newEmail, token)
return redirect(url_for("homepage.home"))
db.session.commit() db.session.commit()
return redirect(url_for("users.email_notifications", username=user.username)) return redirect(url_for("users.email_notifications", username=user.username))