From f662adf237c37b64b2504a7517966b53dbca61fb Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 13:39:52 +0700 Subject: [PATCH 01/24] Add User.full_mailbox col --- app/models.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/models.py b/app/models.py index f6f92a3b..344d23e8 100644 --- a/app/models.py +++ b/app/models.py @@ -137,6 +137,14 @@ 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" + ) + profile_picture = db.relationship(File) @classmethod From 70802bff1752dea3eb5a12adce8b186a71e4d020 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 13:41:27 +0700 Subject: [PATCH 02/24] Create User.mailboxes() --- app/dashboard/views/custom_alias.py | 4 +--- app/models.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py index e0f7e7da..cdea83fc 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") diff --git a/app/models.py b/app/models.py index 344d23e8..1de69fa1 100644 --- a/app/models.py +++ b/app/models.py @@ -278,6 +278,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"" From bc0dc0265d9d1ea3313d7de055905563275eb2a4 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 13:41:59 +0700 Subject: [PATCH 03/24] Show mailbox when creating alias for user who has full_mailbox enabled --- app/dashboard/templates/dashboard/custom_alias.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dashboard/templates/dashboard/custom_alias.html b/app/dashboard/templates/dashboard/custom_alias.html index 53b9f08a..42279832 100644 --- a/app/dashboard/templates/dashboard/custom_alias.html +++ b/app/dashboard/templates/dashboard/custom_alias.html @@ -54,7 +54,7 @@ - {% if mailboxes|length > 1 %} + {% if mailboxes|length > 1 or current_user.full_mailbox %}
+ + + + {% for mailbox in mailboxes %} + + {% endfor %} + +
+ +
+ + + + +
+ +
+ + {% elif alias_info.mailbox != None %} +
+ Owned by {{ alias_info.mailbox.email }} mailbox +
+ {% endif %} + +
-
+
-
+
-
diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index f8a1b076..f55ad639 100644 --- a/app/dashboard/views/index.py +++ b/app/dashboard/views/index.py @@ -142,6 +142,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 +178,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 +187,7 @@ def index(): highlight_gen_email_id=highlight_gen_email_id, query=query, AliasGeneratorEnum=AliasGeneratorEnum, + mailboxes=mailboxes, ) diff --git a/app/models.py b/app/models.py index 1de69fa1..62b380df 100644 --- a/app/models.py +++ b/app/models.py @@ -162,6 +162,13 @@ 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 + # Mailbox.create(user_id=user.id, email=user.email, verified=True) + # user.full_mailbox = True + # db.session.flush() + # Schedule onboarding emails Job.create( name=JOB_ONBOARDING_1, @@ -511,7 +518,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") @@ -523,7 +530,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( diff --git a/server.py b/server.py index 02790473..9098ec5f 100644 --- a/server.py +++ b/server.py @@ -132,6 +132,7 @@ def fake_data(): is_admin=True, otp_secret="base32secret3232", can_use_multiple_mailbox=True, + full_mailbox=True, ) db.session.commit() @@ -156,9 +157,13 @@ def fake_data(): api_key = ApiKey.create(user_id=user.id, name="Firefox") api_key.code = "codeFF" - GenEmail.create_new(user.id, "e1@") - GenEmail.create_new(user.id, "e2@") - GenEmail.create_new(user.id, "e3@") + m1 = Mailbox.create(user_id=user.id, email="m1@cd.ef", verified=True) + m2 = Mailbox.create(user_id=user.id, email="m2@zt.com", verified=False) + m3 = Mailbox.create(user_id=user.id, email="m3@cd.ef", verified=True) + db.session.commit() + + GenEmail.create_new(user.id, "e1@", mailbox_id=m1.id) + GenEmail.create_new(user.id, "e2@", mailbox_id=m3.id) CustomDomain.create(user_id=user.id, domain="ab.cd", verified=True) CustomDomain.create( @@ -185,10 +190,6 @@ def fake_data(): client2.published = True db.session.commit() - Mailbox.create(user_id=user.id, email="ab@cd.ef", verified=True) - Mailbox.create(user_id=user.id, email="xy@zt.com", verified=False) - db.session.commit() - DeletedAlias.create(user_id=user.id, email="d1@ab.cd") DeletedAlias.create(user_id=user.id, email="d2@ab.cd") db.session.commit() From 18a6a50e388712945389cf23aecfcd13e069be94 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 14:02:02 +0700 Subject: [PATCH 06/24] Add Mailbox.new_email col --- app/models.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/models.py b/app/models.py index 62b380df..712c6f0b 100644 --- a/app/models.py +++ b/app/models.py @@ -857,6 +857,9 @@ class Mailbox(db.Model, ModelMixin): email = db.Column(db.String(256), unique=True, nullable=False) verified = db.Column(db.Boolean, default=False, nullable=False) + # used when user wants to update mailbox email + new_email = db.Column(db.String(256), unique=True) + user = db.relationship(User) def nb_alias(self): From 571ff03115e20c420d046e929ae08b3b7b53114a Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 14:04:00 +0700 Subject: [PATCH 07/24] handle case where mailbox_email is the same as user email --- app/dashboard/views/custom_alias.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py index cdea83fc..d8ab8991 100644 --- a/app/dashboard/views/custom_alias.py +++ b/app/dashboard/views/custom_alias.py @@ -83,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) From aa784a05934abc27c7ba1a54ef08ffbd0ca84be8 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 14:04:20 +0700 Subject: [PATCH 08/24] use red text for delete button --- app/dashboard/templates/dashboard/directory.html | 2 +- app/dashboard/templates/dashboard/mailbox.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dashboard/templates/dashboard/directory.html b/app/dashboard/templates/dashboard/directory.html index ccc1edcd..90da7bed 100644 --- a/app/dashboard/templates/dashboard/directory.html +++ b/app/dashboard/templates/dashboard/directory.html @@ -57,7 +57,7 @@ - + Delete diff --git a/app/dashboard/templates/dashboard/mailbox.html b/app/dashboard/templates/dashboard/mailbox.html index bfa07221..be3c4b24 100644 --- a/app/dashboard/templates/dashboard/mailbox.html +++ b/app/dashboard/templates/dashboard/mailbox.html @@ -56,7 +56,7 @@ - + Delete From 731d898774a7457cb4a824ff926ff651346daf27 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 14:08:55 +0700 Subject: [PATCH 09/24] Handle mailbox change --- app/dashboard/__init__.py | 1 + .../templates/dashboard/mailbox.html | 14 +- .../templates/dashboard/mailbox_detail.html | 58 +++++++ app/dashboard/views/mailbox_detail.py | 150 ++++++++++++++++++ .../transactional/verify-mailbox-change.html | 11 ++ .../transactional/verify-mailbox-change.txt | 10 ++ 6 files changed, 239 insertions(+), 5 deletions(-) create mode 100644 app/dashboard/templates/dashboard/mailbox_detail.html create mode 100644 app/dashboard/views/mailbox_detail.py create mode 100644 templates/emails/transactional/verify-mailbox-change.html create mode 100644 templates/emails/transactional/verify-mailbox-change.txt 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. From 362032b80371e7e9d49e5f98ed120007c0c4512d Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 14:09:57 +0700 Subject: [PATCH 10/24] full_mailbox user can use mailbox --- app/dashboard/views/mailbox.py | 2 +- templates/menu.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dashboard/views/mailbox.py b/app/dashboard/views/mailbox.py index 33cc9b55..5ce2ed5e 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")) diff --git a/templates/menu.html b/templates/menu.html index 5a6a8191..2d5dcfe5 100644 --- a/templates/menu.html +++ b/templates/menu.html @@ -29,7 +29,7 @@ - {% if current_user.can_use_multiple_mailbox %} + {% if current_user.can_use_multiple_mailbox or current_user.full_mailbox %}
  • From 9788c5afbb96eeb6b467434df474d8af8cbf980a Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 14:14:14 +0700 Subject: [PATCH 11/24] add migration script --- .../versions/2020_022314_903ec5f566e8_.py | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 migrations/versions/2020_022314_903ec5f566e8_.py diff --git a/migrations/versions/2020_022314_903ec5f566e8_.py b/migrations/versions/2020_022314_903ec5f566e8_.py new file mode 100644 index 00000000..0fc40497 --- /dev/null +++ b/migrations/versions/2020_022314_903ec5f566e8_.py @@ -0,0 +1,33 @@ +"""empty message + +Revision ID: 903ec5f566e8 +Revises: 3fa3a648c8e7 +Create Date: 2020-02-23 14:11:46.332532 + +""" +import sqlalchemy_utils +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '903ec5f566e8' +down_revision = '3fa3a648c8e7' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('mailbox', sa.Column('new_email', sa.String(length=256), nullable=True)) + op.create_unique_constraint(None, 'mailbox', ['new_email']) + op.add_column('users', sa.Column('full_mailbox', sa.Boolean(), server_default='0', nullable=False)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('users', 'full_mailbox') + op.drop_constraint(None, 'mailbox', type_='unique') + op.drop_column('mailbox', 'new_email') + # ### end Alembic commands ### From 6615631b4ee8405dfea3e732574fa8c486f67172 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 14:38:53 +0700 Subject: [PATCH 12/24] improve logging --- app/email_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 80a6168e87e806513790bb2bcdd643f108f29fae Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 14:39:51 +0700 Subject: [PATCH 13/24] add convert_user_full_mailbox() --- shell.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/shell.py b/shell.py index e594a133..1f12c28d 100644 --- a/shell.py +++ b/shell.py @@ -40,6 +40,23 @@ def send_safari_extension_newsletter(): ) +def convert_user_full_mailbox(user): + # create a default mailbox + default_mb = Mailbox.get_by(user_id=user.id, email=user.email) + if not default_mb: + LOG.d("create default mailbox for user %s", user) + default_mb = Mailbox.create(user_id=user.id, email=user.email, verified=True) + db.session.commit() + + # assign existing alias to this mailbox + for gen_email in GenEmail.query.filter_by(user_id=user.id): + gen_email.mailbox_id = default_mb.id + + # finally set user to full_mailbox + user.full_mailbox = True + db.session.commit() + + app = create_app() with app.app_context(): From 3c2762dfad444378d38c4f19e5e7ec7f18c55d73 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 14:40:37 +0700 Subject: [PATCH 14/24] only show mailbox when mailbox email != user email --- app/dashboard/templates/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html index 4396580f..8e7d39a0 100644 --- a/app/dashboard/templates/dashboard/index.html +++ b/app/dashboard/templates/dashboard/index.html @@ -176,7 +176,7 @@
    • - {% elif alias_info.mailbox != None %} + {% elif alias_info.mailbox != None and alias_info.mailbox.email != current_user.email %}
    Owned by {{ alias_info.mailbox.email }} mailbox
    From 0a5113962f890539a2382a9c633bd9043611c1ba Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 15:10:59 +0700 Subject: [PATCH 15/24] remove autofocus on directory & mailbox --- app/dashboard/templates/dashboard/directory.html | 3 +-- app/dashboard/templates/dashboard/mailbox.html | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/dashboard/templates/dashboard/directory.html b/app/dashboard/templates/dashboard/directory.html index 90da7bed..9794c387 100644 --- a/app/dashboard/templates/dashboard/directory.html +++ b/app/dashboard/templates/dashboard/directory.html @@ -85,8 +85,7 @@ {{ new_dir_form.name(class="form-control", placeholder="my-directory", pattern="[0-9a-z-_]{3,}", - title="Only letter, number, dash (-), underscore (_) can be used. Directory name must be at least 3 characters.", - autofocus="1") }} + title="Only letter, number, dash (-), underscore (_) can be used. Directory name must be at least 3 characters.") }} {{ render_field_errors(new_dir_form.name) }} diff --git a/app/dashboard/templates/dashboard/mailbox.html b/app/dashboard/templates/dashboard/mailbox.html index 95589d31..12727d32 100644 --- a/app/dashboard/templates/dashboard/mailbox.html +++ b/app/dashboard/templates/dashboard/mailbox.html @@ -85,8 +85,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) }} From 9669c0441416c7f887384ea760145f6202501d82 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 15:40:41 +0700 Subject: [PATCH 16/24] Add user.default_mailbox_id col --- app/models.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models.py b/app/models.py index 712c6f0b..d6c36329 100644 --- a/app/models.py +++ b/app/models.py @@ -145,6 +145,11 @@ class User(db.Model, ModelMixin, UserMixin): 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 @@ -165,9 +170,10 @@ class User(db.Model, ModelMixin, UserMixin): # 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 - # Mailbox.create(user_id=user.id, email=user.email, verified=True) - # user.full_mailbox = True + # 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( @@ -860,8 +866,6 @@ class Mailbox(db.Model, ModelMixin): # used when user wants to update mailbox email new_email = db.Column(db.String(256), unique=True) - user = db.relationship(User) - def nb_alias(self): return GenEmail.filter_by(mailbox_id=self.id).count() From 2eae0ba4fd54fd040cd4dbf7c8c90f1fda281bf5 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 15:41:08 +0700 Subject: [PATCH 17/24] set user default mailbox in convert_user_full_mailbox --- server.py | 2 ++ shell.py | 1 + 2 files changed, 3 insertions(+) diff --git a/server.py b/server.py index 9098ec5f..f636427b 100644 --- a/server.py +++ b/server.py @@ -162,6 +162,8 @@ def fake_data(): m3 = Mailbox.create(user_id=user.id, email="m3@cd.ef", verified=True) db.session.commit() + user.default_mailbox_id = m1.id + GenEmail.create_new(user.id, "e1@", mailbox_id=m1.id) GenEmail.create_new(user.id, "e2@", mailbox_id=m3.id) diff --git a/shell.py b/shell.py index 1f12c28d..39607d0e 100644 --- a/shell.py +++ b/shell.py @@ -54,6 +54,7 @@ def convert_user_full_mailbox(user): # finally set user to full_mailbox user.full_mailbox = True + user.default_mailbox_id = default_mb.id db.session.commit() From 7febe6e15b94624190cf75b2c35e3c064aae7462 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 15:41:53 +0700 Subject: [PATCH 18/24] cannot delete default mailbox --- app/dashboard/templates/dashboard/mailbox.html | 11 +++++++++-- app/dashboard/views/mailbox.py | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/dashboard/templates/dashboard/mailbox.html b/app/dashboard/templates/dashboard/mailbox.html index 12727d32..b86affe8 100644 --- a/app/dashboard/templates/dashboard/mailbox.html +++ b/app/dashboard/templates/dashboard/mailbox.html @@ -43,11 +43,17 @@ 🚫 {% endif %} - + {% if mailbox.id == current_user.default_mailbox_id %} +
    Default Mailbox +
    + {% endif %} +
    Created {{ mailbox.created_at | dt }}
    {{ mailbox.nb_alias() }} aliases.
    +
    Edit ➡ @@ -60,7 +66,8 @@ - + Delete diff --git a/app/dashboard/views/mailbox.py b/app/dashboard/views/mailbox.py index 5ce2ed5e..796c0001 100644 --- a/app/dashboard/views/mailbox.py +++ b/app/dashboard/views/mailbox.py @@ -44,6 +44,10 @@ 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() From 1fcbe329902fcd2e439f622cbe681cb213da154b Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 15:51:26 +0700 Subject: [PATCH 19/24] Can set a mailbox as default --- .../templates/dashboard/mailbox.html | 17 ++++++++++++++- app/dashboard/views/mailbox.py | 21 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/app/dashboard/templates/dashboard/mailbox.html b/app/dashboard/templates/dashboard/mailbox.html index b86affe8..1d4d84f0 100644 --- a/app/dashboard/templates/dashboard/mailbox.html +++ b/app/dashboard/templates/dashboard/mailbox.html @@ -45,7 +45,7 @@ {% endif %} {% if mailbox.id == current_user.default_mailbox_id %}
    Default Mailbox + title="When a new random alias is created, it belongs to the default mailbox">Default Mailbox
    {% endif %} @@ -61,6 +61,21 @@
    + {% if mailbox.verified %} +
    +
    + + + + +
    +
    + {% endif %} +
    diff --git a/app/dashboard/views/mailbox.py b/app/dashboard/views/mailbox.py index 796c0001..f81b9a3f 100644 --- a/app/dashboard/views/mailbox.py +++ b/app/dashboard/views/mailbox.py @@ -53,6 +53,27 @@ def mailbox_route(): 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": From f20930ac4e417a9f6aea729acfd0a018df3b15cf Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 15:51:40 +0700 Subject: [PATCH 20/24] Assign random alias to default mailbox if user is full mailbox --- app/dashboard/views/index.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index f55ad639..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) From ec3a41e53cc14dd332a1b20ee69cfdec88b2976f Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 16:01:03 +0700 Subject: [PATCH 21/24] Prettify waiting activation page --- app/auth/templates/auth/register_waiting_activation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.

    From 37080713207c975732830ce01ca229d48176b60e Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 16:01:22 +0700 Subject: [PATCH 22/24] Improve welcome & trial-end email --- templates/emails/com/welcome.html | 2 +- templates/emails/com/welcome.txt | 1 + templates/emails/transactional/trial-end.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/emails/com/welcome.html b/templates/emails/com/welcome.html index bf7cb34d..f6e5d998 100644 --- a/templates/emails/com/welcome.html +++ b/templates/emails/com/welcome.html @@ -21,7 +21,7 @@ and create your business emails using email alias. This is cheaper and more convenient than buying a dedicated solution like GSuite. By the way, all our business emails are actually aliases.') }} {% if user.in_trial() %} - {{ render_text('You can use all premium features like custom domain or alias directory during the trial period. Your trial will end ' + user.trial_end.humanize() + ".") }} + {{ render_text('You can use all premium features like custom domain or alias directory during the trial period. Your trial will end ' + user.trial_end.humanize() + ". All aliases you create during the trial will continue to work normally when the trial ends.") }} {% endif %} {{ render_text('In the next coming days, you are going to receive some onboarding emails to quickly present SimpleLogin features. If you don\'t want to receive these emails, you can disable them on Settings.') }} diff --git a/templates/emails/com/welcome.txt b/templates/emails/com/welcome.txt index 19618028..4a0f963d 100644 --- a/templates/emails/com/welcome.txt +++ b/templates/emails/com/welcome.txt @@ -22,6 +22,7 @@ and create your business emails backed by your personal email! By the way, all o {% if user.in_trial() %} You can use all premium features like custom domain or alias directory during the trial period. Your trial will end {{ user.trial_end.humanize() }}. +All aliases you create during the trial will continue to work normally when the trial ends. {% endif %} If there's anything that's bugging you, even the smallest of issues that could be done better, I want to hear about it - so hit the reply button. diff --git a/templates/emails/transactional/trial-end.html b/templates/emails/transactional/trial-end.html index 9a4a4480..2303617b 100644 --- a/templates/emails/transactional/trial-end.html +++ b/templates/emails/transactional/trial-end.html @@ -11,7 +11,7 @@ {{ render_text("When the trial ends:") }} - {{ render_text("- All aliases/domains/directories you have created are kept and continue working.") }} + {{ render_text("- All aliases/domains/directories you have created are kept and continue working normally.") }} {{ render_text("- You cannot create new aliases if you exceed the free plan limit, i.e. have more than 5 aliases.") }} {{ render_text("- As features like catch-all or directory allow you to create aliases on-the-fly, those aliases cannot be automatically created if you have more than 5 aliases.") }} {{ render_text("- You cannot add new domain or directory.") }} From e51f91e769647600af3670b1cf6fea4ce88a6bfd Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 16:04:23 +0700 Subject: [PATCH 23/24] add necessary migration --- .../versions/2020_022316_f580030d9beb_.py | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 migrations/versions/2020_022316_f580030d9beb_.py diff --git a/migrations/versions/2020_022316_f580030d9beb_.py b/migrations/versions/2020_022316_f580030d9beb_.py new file mode 100644 index 00000000..11423a47 --- /dev/null +++ b/migrations/versions/2020_022316_f580030d9beb_.py @@ -0,0 +1,31 @@ +"""empty message + +Revision ID: f580030d9beb +Revises: 903ec5f566e8 +Create Date: 2020-02-23 16:03:46.064813 + +""" +import sqlalchemy_utils +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'f580030d9beb' +down_revision = '903ec5f566e8' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('users', sa.Column('default_mailbox_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'users', 'mailbox', ['default_mailbox_id'], ['id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'users', type_='foreignkey') + op.drop_column('users', 'default_mailbox_id') + # ### end Alembic commands ### From 9958e1ab8e886a52b62d530e3cf5ce287fbfb80f Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 23 Feb 2020 16:17:09 +0700 Subject: [PATCH 24/24] only full mailbox user can set default mailbox --- app/dashboard/templates/dashboard/mailbox.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dashboard/templates/dashboard/mailbox.html b/app/dashboard/templates/dashboard/mailbox.html index 1d4d84f0..ee83e1c1 100644 --- a/app/dashboard/templates/dashboard/mailbox.html +++ b/app/dashboard/templates/dashboard/mailbox.html @@ -61,7 +61,7 @@
    - {% if mailbox.verified %} + {% if mailbox.verified and current_user.full_mailbox %}