From aeed62e95b2d97902aff1643824a31ddb200e823 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sat, 29 Feb 2020 00:03:35 +0700 Subject: [PATCH] All users use full-mailbox - remove can_use_multiple_mailbox col - remove full_mailbox col --- .../templates/dashboard/custom_alias.html | 28 +++++++---------- app/dashboard/templates/dashboard/index.html | 2 +- .../templates/dashboard/mailbox.html | 12 +++---- app/dashboard/views/custom_alias.py | 7 ++--- app/dashboard/views/index.py | 9 +----- app/dashboard/views/mailbox.py | 4 --- app/models.py | 18 +---------- .../versions/2020_022900_7eef64ffb398_.py | 31 +++++++++++++++++++ server.py | 2 -- shell.py | 20 ------------ templates/menu.html | 16 +++++----- 11 files changed, 61 insertions(+), 88 deletions(-) create mode 100644 migrations/versions/2020_022900_7eef64ffb398_.py diff --git a/app/dashboard/templates/dashboard/custom_alias.html b/app/dashboard/templates/dashboard/custom_alias.html index 55e95813..c294b952 100644 --- a/app/dashboard/templates/dashboard/custom_alias.html +++ b/app/dashboard/templates/dashboard/custom_alias.html @@ -54,24 +54,20 @@ - {% if mailboxes|length > 1 or current_user.full_mailbox %} -
-
- -
- The mailbox that owns this alias. -
+
+
+ +
+ The mailbox that owns this alias.
- {% else %} - - {% endif %} +
diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html index 54f23bad..c0fc29fa 100644 --- a/app/dashboard/templates/dashboard/index.html +++ b/app/dashboard/templates/dashboard/index.html @@ -151,7 +151,7 @@
- {% if current_user.full_mailbox and mailboxes|length > 1 %} + {% if mailboxes|length > 1 %}
Current mailbox
diff --git a/app/dashboard/templates/dashboard/mailbox.html b/app/dashboard/templates/dashboard/mailbox.html index ee83e1c1..639fd95a 100644 --- a/app/dashboard/templates/dashboard/mailbox.html +++ b/app/dashboard/templates/dashboard/mailbox.html @@ -22,10 +22,8 @@ - all emails sent to this alias will be forwarded to this mailbox
- from this mailbox, you can reply/send emails from the alias.

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

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

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. @@ -61,7 +59,7 @@
- {% if mailbox.verified and current_user.full_mailbox %} + {% if mailbox.verified %}
@@ -70,8 +68,8 @@ + Set As Default Mailbox +
{% endif %} diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py index d8ab8991..c0c46ec1 100644 --- a/app/dashboard/views/custom_alias.py +++ b/app/dashboard/views/custom_alias.py @@ -84,10 +84,9 @@ def custom_alias(): gen_email.custom_domain_id = custom_domain.id # 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) + mailbox = Mailbox.get_by(email=mailbox_email) + gen_email.mailbox_id = mailbox.id + LOG.d("Set alias %s mailbox to %s", full_alias, mailbox) db.session.commit() flash(f"Alias {full_alias} has been created", "success") diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index 6591077d..e65dbe65 100644 --- a/app/dashboard/views/index.py +++ b/app/dashboard/views/index.py @@ -75,14 +75,7 @@ def index(): 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 + gen_email.mailbox_id = current_user.default_mailbox_id db.session.commit() diff --git a/app/dashboard/views/mailbox.py b/app/dashboard/views/mailbox.py index f81b9a3f..a2bc4155 100644 --- a/app/dashboard/views/mailbox.py +++ b/app/dashboard/views/mailbox.py @@ -27,10 +27,6 @@ class NewMailboxForm(FlaskForm): @dashboard_bp.route("/mailbox", methods=["GET", "POST"]) @login_required def mailbox_route(): - 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")) - mailboxes = Mailbox.query.filter_by(user_id=current_user.id).all() new_mailbox_form = NewMailboxForm() diff --git a/app/models.py b/app/models.py index bf764ee1..6b884102 100644 --- a/app/models.py +++ b/app/models.py @@ -135,18 +135,6 @@ class User(db.Model, ModelMixin, UserMixin): ArrowType, default=lambda: arrow.now().shift(days=7, hours=1), nullable=True ) - can_use_multiple_mailbox = db.Column( - 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 @@ -169,7 +157,6 @@ class User(db.Model, ModelMixin, UserMixin): 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 @@ -296,10 +283,7 @@ class User(db.Model, ModelMixin, UserMixin): def mailboxes(self) -> [str]: """list of mailbox emails that user own""" - if self.full_mailbox: - mailboxes = [] - else: - mailboxes = [self.email] + mailboxes = [] for mailbox in Mailbox.query.filter_by(user_id=self.id, verified=True): mailboxes.append(mailbox.email) diff --git a/migrations/versions/2020_022900_7eef64ffb398_.py b/migrations/versions/2020_022900_7eef64ffb398_.py new file mode 100644 index 00000000..985d54f9 --- /dev/null +++ b/migrations/versions/2020_022900_7eef64ffb398_.py @@ -0,0 +1,31 @@ +"""empty message + +Revision ID: 7eef64ffb398 +Revises: 5f191273d067 +Create Date: 2020-02-29 00:02:34.372338 + +""" +import sqlalchemy_utils +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '7eef64ffb398' +down_revision = '5f191273d067' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('users', 'full_mailbox') + op.drop_column('users', 'can_use_multiple_mailbox') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('users', sa.Column('can_use_multiple_mailbox', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False)) + op.add_column('users', sa.Column('full_mailbox', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False)) + # ### end Alembic commands ### diff --git a/server.py b/server.py index f636427b..fd9381c6 100644 --- a/server.py +++ b/server.py @@ -131,8 +131,6 @@ def fake_data(): activated=True, is_admin=True, otp_secret="base32secret3232", - can_use_multiple_mailbox=True, - full_mailbox=True, ) db.session.commit() diff --git a/shell.py b/shell.py index 50fc7053..e594a133 100644 --- a/shell.py +++ b/shell.py @@ -40,26 +40,6 @@ 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): - if not gen_email.mailbox_id: - LOG.d("Set alias %s mailbox to default mailbox", gen_email) - gen_email.mailbox_id = default_mb.id - - # finally set user to full_mailbox - user.full_mailbox = True - user.default_mailbox_id = default_mb.id - db.session.commit() - - app = create_app() with app.app_context(): diff --git a/templates/menu.html b/templates/menu.html index 2d5dcfe5..7cfd7140 100644 --- a/templates/menu.html +++ b/templates/menu.html @@ -29,15 +29,13 @@ - {% if current_user.can_use_multiple_mailbox or current_user.full_mailbox %} -
  • - - Mailboxes - Beta - -
    • - {% endif %} +
  • + + Mailboxes + Beta + +