diff --git a/app/dashboard/__init__.py b/app/dashboard/__init__.py index 2f432540..3d981918 100644 --- a/app/dashboard/__init__.py +++ b/app/dashboard/__init__.py @@ -16,4 +16,5 @@ from .views import ( directory, mailbox, deleted_alias, + mailbox_detail, ) diff --git a/app/dashboard/templates/dashboard/mailbox.html b/app/dashboard/templates/dashboard/mailbox.html index be3c4b24..95589d31 100644 --- a/app/dashboard/templates/dashboard/mailbox.html +++ b/app/dashboard/templates/dashboard/mailbox.html @@ -20,13 +20,15 @@ A mailbox is just another personal email address. When creating a new alias, you could choose the mailbox that owns this alias, i.e:
- all emails sent to this alias will be forwarded to this mailbox
- - from this mailbox, you can reply/send emails from the alias.
+ - from this mailbox, you can reply/send emails from the alias.

- By default, all aliases are owned by your email {{ current_user.email }}.

+ {% if current_user.full_mailbox %} + When you signed up, a mailbox is automatically created with your email {{ current_user.email }} +

+ {% endif %} The mailbox doesn't have to be your email: it can be your friend's email - if you want to create aliases for your buddy.
- They just need to validate this mailbox when they receive the activation email. + if you want to create aliases for your buddy. {% for mailbox in mailboxes %} @@ -45,8 +47,10 @@
Created {{ mailbox.created_at | dt }}
- {{ mailbox.nb_alias() }} aliases. + {{ mailbox.nb_alias() }} aliases.
+ + Edit ➡
diff --git a/app/dashboard/templates/dashboard/mailbox_detail.html b/app/dashboard/templates/dashboard/mailbox_detail.html new file mode 100644 index 00000000..62cc0e64 --- /dev/null +++ b/app/dashboard/templates/dashboard/mailbox_detail.html @@ -0,0 +1,58 @@ +{% extends 'default.html' %} + +{% set active_page = "mailbox" %} + +{% block title %} + Mailbox {{ mailbox.email }} +{% endblock %} + +{% block default_content %} + +
+

{{ mailbox.email }} + {% if mailbox.verified %} + ✅ + {% else %} + + 🚫 + + {% endif %} +

+ + +
+
+ + {{ change_email_form.csrf_token }} + +
+
+ Change Mailbox Address +
+
+ + + + {{ change_email_form.email(class="form-control", value=mailbox.email, readonly=pending_email != None) }} + {{ render_field_errors(change_email_form.email) }} + + {% if pending_email %} +
+ Pending change: {{ pending_email }} + + Cancel mailbox change + +
+ {% endif %} +
+ +
+
+
+ + +
+{% endblock %} + + diff --git a/app/dashboard/views/mailbox_detail.py b/app/dashboard/views/mailbox_detail.py new file mode 100644 index 00000000..b9847fb4 --- /dev/null +++ b/app/dashboard/views/mailbox_detail.py @@ -0,0 +1,150 @@ +from flask import render_template, request, redirect, url_for, flash +from flask_login import login_required, current_user +from flask_wtf import FlaskForm +from itsdangerous import Signer, BadSignature +from wtforms import validators +from wtforms.fields.html5 import EmailField + +from app.config import FLASK_SECRET +from app.config import URL +from app.dashboard.base import dashboard_bp +from app.email_utils import can_be_used_as_personal_email, email_already_used +from app.email_utils import ( + send_email, + render, +) +from app.extensions import db +from app.log import LOG +from app.models import ( + GenEmail, + DeletedAlias, +) +from app.models import Mailbox + + +class ChangeEmailForm(FlaskForm): + email = EmailField( + "email", validators=[validators.DataRequired(), validators.Email()] + ) + + +@dashboard_bp.route("/mailbox//", methods=["GET", "POST"]) +@login_required +def mailbox_detail_route(mailbox_id): + mailbox = Mailbox.get(mailbox_id) + if not mailbox or mailbox.user_id != current_user.id: + flash("You cannot see this page", "warning") + return redirect(url_for("dashboard.index")) + + change_email_form = ChangeEmailForm() + + if mailbox.new_email: + pending_email = mailbox.new_email + else: + pending_email = None + + if change_email_form.validate_on_submit(): + new_email = change_email_form.email.data + if new_email != mailbox.email and not pending_email: + # check if this email is not already used + if ( + email_already_used(new_email) + or GenEmail.get_by(email=new_email) + or DeletedAlias.get_by(email=new_email) + ): + flash(f"Email {new_email} already used", "error") + elif not can_be_used_as_personal_email(new_email): + flash( + "You cannot use this email address as your mailbox", "error", + ) + else: + mailbox.new_email = new_email + db.session.commit() + + s = Signer(FLASK_SECRET) + mailbox_id_signed = s.sign(str(mailbox.id)).decode() + verification_url = ( + URL + + "/dashboard/mailbox/confirm_change" + + f"?mailbox_id={mailbox_id_signed}" + ) + + send_email( + new_email, + f"Confirm mailbox change on SimpleLogin", + render( + "transactional/verify-mailbox-change.txt", + user=current_user, + link=verification_url, + mailbox_email=mailbox.email, + mailbox_new_email=new_email, + ), + render( + "transactional/verify-mailbox-change.html", + user=current_user, + link=verification_url, + mailbox_email=mailbox.email, + mailbox_new_email=new_email, + ), + ) + + flash( + f"You are going to receive an email to confirm {new_email}.", + "success", + ) + return redirect( + url_for("dashboard.mailbox_detail_route", mailbox_id=mailbox_id) + ) + + return render_template("dashboard/mailbox_detail.html", **locals(),) + + +@dashboard_bp.route( + "/mailbox//cancel_email_change", methods=["GET", "POST"] +) +@login_required +def cancel_mailbox_change_route(mailbox_id): + mailbox = Mailbox.get(mailbox_id) + if not mailbox or mailbox.user_id != current_user.id: + flash("You cannot see this page", "warning") + return redirect(url_for("dashboard.index")) + + if mailbox.new_email: + mailbox.new_email = None + db.session.commit() + flash("Your mailbox change is cancelled", "success") + return redirect( + url_for("dashboard.mailbox_detail_route", mailbox_id=mailbox_id) + ) + else: + flash("You have no pending mailbox change", "warning") + return redirect( + url_for("dashboard.mailbox_detail_route", mailbox_id=mailbox_id) + ) + + +@dashboard_bp.route("/mailbox/confirm_change") +def mailbox_confirm_change_route(): + s = Signer(FLASK_SECRET) + mailbox_id = request.args.get("mailbox_id") + + try: + r_id = int(s.unsign(mailbox_id)) + except BadSignature: + flash("Invalid link", "error") + else: + mailbox = Mailbox.get(r_id) + mailbox.email = mailbox.new_email + mailbox.new_email = None + + # mark mailbox as verified if the change request is sent from an unverified mailbox + mailbox.verified = True + db.session.commit() + + LOG.d("Mailbox change %s is verified", mailbox) + flash( + f"The {mailbox.email} is updated", "success", + ) + return redirect( + url_for("dashboard.mailbox_detail_route", mailbox_id=mailbox.id) + ) diff --git a/templates/emails/transactional/verify-mailbox-change.html b/templates/emails/transactional/verify-mailbox-change.html new file mode 100644 index 00000000..553c0fea --- /dev/null +++ b/templates/emails/transactional/verify-mailbox-change.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} + +{% block content %} + {{ render_text("Hi " + user.name) }} + {{ render_text("You recently requested to change mailbox "+ mailbox_email +" to " + mailbox_new_email + ".") }} + {{ render_text("To confirm, please click on the button below.") }} + {{ render_button("Confirm mailbox change", link) }} + {{ render_text('Thanks,
SimpleLogin Team.') }} + {{ raw_url(link) }} +{% endblock %} + diff --git a/templates/emails/transactional/verify-mailbox-change.txt b/templates/emails/transactional/verify-mailbox-change.txt new file mode 100644 index 00000000..1976d1df --- /dev/null +++ b/templates/emails/transactional/verify-mailbox-change.txt @@ -0,0 +1,10 @@ +Hi {{user.name}} + +You recently requested to change mailbox {{mailbox_email}} to {{mailbox_new_email}} + +To confirm, please click on this link: + +{{link}} + +Regards, +Son - SimpleLogin founder.