diff --git a/app/auth/templates/auth/register_waiting_activation.html b/app/auth/templates/auth/register_waiting_activation.html index a6418335..19ba96bd 100644 --- a/app/auth/templates/auth/register_waiting_activation.html +++ b/app/auth/templates/auth/register_waiting_activation.html @@ -5,7 +5,7 @@ {% endblock %} {% block single_content %} -
+

An email to validate your email is on its way.

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/custom_alias.html b/app/dashboard/templates/dashboard/custom_alias.html index 53b9f08a..55e95813 100644 --- a/app/dashboard/templates/dashboard/custom_alias.html +++ b/app/dashboard/templates/dashboard/custom_alias.html @@ -40,7 +40,7 @@
- {% for suffix in suffixes %}
- {% if mailboxes|length > 1 %} + {% if mailboxes|length > 1 or current_user.full_mailbox %}
- {% for mailbox in mailboxes %}
+ {% if current_user.full_mailbox and mailboxes|length > 1 %} +
+
Current mailbox
+
+
+ +
+ +
+ + + + +
+ +
+
+ {% elif alias_info.mailbox != None and alias_info.mailbox.email != current_user.email %} +
+ Owned by {{ alias_info.mailbox.email }} mailbox +
+ {% endif %} + +
-
+
-
+
-
diff --git a/app/dashboard/templates/dashboard/mailbox.html b/app/dashboard/templates/dashboard/mailbox.html index bfa07221..ee83e1c1 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 %} @@ -41,22 +43,46 @@ 🚫 {% endif %} - + {% if mailbox.id == current_user.default_mailbox_id %} +
Default Mailbox +
+ {% endif %} +
Created {{ mailbox.created_at | dt }}
- {{ mailbox.nb_alias() }} aliases. + {{ mailbox.nb_alias() }} aliases.
+
+ + Edit âž¡
+ {% if mailbox.verified and current_user.full_mailbox %} +
+ + + + + + +
+ {% endif %} +
- + Delete @@ -81,8 +107,7 @@ A verification email will be sent to this email to make sure you have access to this email.
- {{ new_mailbox_form.email(class="form-control", placeholder="email@example.com", - autofocus="1") }} + {{ new_mailbox_form.email(class="form-control", placeholder="email@example.com") }} {{ render_field_errors(new_mailbox_form.email) }} 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/custom_alias.py b/app/dashboard/views/custom_alias.py index e0f7e7da..d8ab8991 100644 --- a/app/dashboard/views/custom_alias.py +++ b/app/dashboard/views/custom_alias.py @@ -43,9 +43,7 @@ def custom_alias(): ) ) - mailboxes = [current_user.email] - for mailbox in Mailbox.query.filter_by(user_id=current_user.id, verified=True): - mailboxes.append(mailbox.email) + mailboxes = current_user.mailboxes() if request.method == "POST": alias_prefix = request.form.get("prefix") @@ -85,7 +83,8 @@ def custom_alias(): LOG.d("Set alias %s domain to %s", full_alias, custom_domain) gen_email.custom_domain_id = custom_domain.id - if mailbox_email != current_user.email: + # assign alias to a mailbox + if current_user.full_mailbox or mailbox_email != current_user.email: mailbox = Mailbox.get_by(email=mailbox_email) gen_email.mailbox_id = mailbox.id LOG.d("Set alias %s mailbox to %s", full_alias, mailbox) diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index f8a1b076..6591077d 100644 --- a/app/dashboard/views/index.py +++ b/app/dashboard/views/index.py @@ -74,6 +74,16 @@ def index(): gen_email = GenEmail.create_new_random( user_id=current_user.id, scheme=scheme ) + + if current_user.full_mailbox: + if not current_user.default_mailbox_id: + LOG.error( + "Full mailbox User %s does not have default mailbox ", + current_user, + ) + else: + gen_email.mailbox_id = current_user.default_mailbox_id + db.session.commit() LOG.d("generate new email %s for user %s", gen_email, current_user) @@ -142,6 +152,31 @@ def index(): ) ) + elif request.form.get("form-name") == "set-mailbox": + gen_email_id = request.form.get("gen-email-id") + gen_email: GenEmail = GenEmail.get(gen_email_id) + mailbox_email = request.form.get("mailbox") + + mailbox = Mailbox.get_by(email=mailbox_email) + if not mailbox or mailbox.user_id != current_user.id: + flash("Something went wrong, please retry", "warning") + else: + gen_email.mailbox_id = mailbox.id + db.session.commit() + LOG.d("Set alias %s mailbox to %s", gen_email, mailbox) + + flash( + f"Update mailbox for {gen_email.email} to {mailbox_email}", + "success", + ) + return redirect( + url_for( + "dashboard.index", + highlight_gen_email_id=gen_email.id, + query=query, + ) + ) + return redirect(url_for("dashboard.index", query=query)) client_users = ( @@ -153,6 +188,8 @@ def index(): sorted(client_users, key=lambda cu: cu.client.name) + mailboxes = current_user.mailboxes() + return render_template( "dashboard/index.html", client_users=client_users, @@ -160,6 +197,7 @@ def index(): highlight_gen_email_id=highlight_gen_email_id, query=query, AliasGeneratorEnum=AliasGeneratorEnum, + mailboxes=mailboxes, ) diff --git a/app/dashboard/views/mailbox.py b/app/dashboard/views/mailbox.py index 33cc9b55..f81b9a3f 100644 --- a/app/dashboard/views/mailbox.py +++ b/app/dashboard/views/mailbox.py @@ -27,7 +27,7 @@ class NewMailboxForm(FlaskForm): @dashboard_bp.route("/mailbox", methods=["GET", "POST"]) @login_required def mailbox_route(): - if not current_user.can_use_multiple_mailbox: + if not current_user.can_use_multiple_mailbox and not current_user.full_mailbox: flash("You don't have access to this page, redirect to home page", "warning") return redirect(url_for("dashboard.index")) @@ -44,11 +44,36 @@ def mailbox_route(): flash("Unknown error. Refresh the page", "warning") return redirect(url_for("dashboard.mailbox_route")) + if mailbox.id == current_user.default_mailbox_id: + flash("You cannot delete default mailbox", "error") + return redirect(url_for("dashboard.mailbox_route")) + email = mailbox.email Mailbox.delete(mailbox_id) db.session.commit() flash(f"Mailbox {email} has been deleted", "success") + return redirect(url_for("dashboard.mailbox_route")) + if request.form.get("form-name") == "set-default": + mailbox_id = request.form.get("mailbox-id") + mailbox = Mailbox.get(mailbox_id) + + if not mailbox or mailbox.user_id != current_user.id: + flash("Unknown error. Refresh the page", "warning") + return redirect(url_for("dashboard.mailbox_route")) + + if mailbox.id == current_user.default_mailbox_id: + flash("This mailbox is already default one", "error") + return redirect(url_for("dashboard.mailbox_route")) + + if not mailbox.verified: + flash("Cannot set unverified mailbox as default", "error") + return redirect(url_for("dashboard.mailbox_route")) + + current_user.default_mailbox_id = mailbox.id + db.session.commit() + flash(f"Mailbox {mailbox.email} is set as Default Mailbox", "success") + return redirect(url_for("dashboard.mailbox_route")) elif request.form.get("form-name") == "create": 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/app/email_utils.py b/app/email_utils.py index b7f01971..6aa864b9 100644 --- a/app/email_utils.py +++ b/app/email_utils.py @@ -185,6 +185,8 @@ def send_email( ) return + LOG.d("send email to %s, subject %s", to_email, subject) + # host IP, setup via Docker network smtp = SMTP(POSTFIX_SERVER, 25) @@ -214,11 +216,9 @@ def send_email( msg["To"] = to_email msg_id_header = make_msgid() - LOG.d("message-id %s", msg_id_header) msg["Message-ID"] = msg_id_header date_header = formatdate() - LOG.d("Date header: %s", date_header) msg["Date"] = date_header # add DKIM diff --git a/app/models.py b/app/models.py index f6f92a3b..d6c36329 100644 --- a/app/models.py +++ b/app/models.py @@ -137,6 +137,19 @@ class User(db.Model, ModelMixin, UserMixin): db.Boolean, default=False, nullable=False, server_default="0" ) + # only use mailbox instead of default to user email + # this requires a migration before to: + # 1. create default mailbox for the user email address + # 2. assign existing aliases to this default mailbox + full_mailbox = db.Column( + db.Boolean, default=False, nullable=False, server_default="0" + ) + + # the mailbox used when create random alias + default_mailbox_id = db.Column( + db.ForeignKey("mailbox.id"), nullable=True, default=None + ) + profile_picture = db.relationship(File) @classmethod @@ -154,6 +167,14 @@ class User(db.Model, ModelMixin, UserMixin): GenEmail.create_new(user.id, prefix="my-first-alias") db.session.flush() + # todo: uncomment when all existing users are full_mailbox + # to run just after migrating all existing user to full mailbox + # so new users are automatically full-mailbox + # mb = Mailbox.create(user_id=user.id, email=user.email, verified=True) + # db.session.flush() + # user.full_mailbox = True + # user.default_mailbox_id = mb.id + # Schedule onboarding emails Job.create( name=JOB_ONBOARDING_1, @@ -270,6 +291,18 @@ class User(db.Model, ModelMixin, UserMixin): def verified_custom_domains(self): return CustomDomain.query.filter_by(user_id=self.id, verified=True).all() + def mailboxes(self) -> [str]: + """list of mailbox emails that user own""" + if self.full_mailbox: + mailboxes = [] + else: + mailboxes = [self.email] + + for mailbox in Mailbox.query.filter_by(user_id=self.id, verified=True): + mailboxes.append(mailbox.email) + + return mailboxes + def __repr__(self): return f"" @@ -491,7 +524,7 @@ class GenEmail(db.Model, ModelMixin): mailbox = db.relationship("Mailbox") @classmethod - def create_new(cls, user_id, prefix, note=None): + def create_new(cls, user_id, prefix, note=None, mailbox_id=None): if not prefix: raise Exception("alias prefix cannot be empty") @@ -503,7 +536,9 @@ class GenEmail(db.Model, ModelMixin): if not cls.get_by(email=email): break - return GenEmail.create(user_id=user_id, email=email, note=note) + return GenEmail.create( + user_id=user_id, email=email, note=note, mailbox_id=mailbox_id + ) @classmethod def create_new_random( @@ -828,7 +863,8 @@ class Mailbox(db.Model, ModelMixin): email = db.Column(db.String(256), unique=True, nullable=False) verified = db.Column(db.Boolean, default=False, nullable=False) - user = db.relationship(User) + # used when user wants to update mailbox email + new_email = db.Column(db.String(256), unique=True) def nb_alias(self): return GenEmail.filter_by(mailbox_id=self.id).count() diff --git a/app/oauth/templates/oauth/authorize.html b/app/oauth/templates/oauth/authorize.html index b2080423..a07ca485 100644 --- a/app/oauth/templates/oauth/authorize.html +++ b/app/oauth/templates/oauth/authorize.html @@ -106,7 +106,7 @@
- {% for suffix in suffixes %}