mirror of
https://github.com/simple-login/app.git
synced 2024-09-27 20:31:30 +02:00
remove can_create_new_random_alias()
This commit is contained in:
parent
ec62fad3a0
commit
e5079e48da
@ -33,7 +33,6 @@ def options():
|
||||
ret = {
|
||||
"existing": [ge.email for ge in GenEmail.query.filter_by(user_id=user.id)],
|
||||
"can_create_custom": user.can_create_new_custom_alias(),
|
||||
"can_create_random": user.can_create_new_random_alias(),
|
||||
}
|
||||
|
||||
# recommendation alias if exist
|
||||
|
@ -1,45 +0,0 @@
|
||||
from flask import g
|
||||
from flask import jsonify, request
|
||||
from flask_cors import cross_origin
|
||||
|
||||
from app.api.base import api_bp, verify_api_key
|
||||
from app.extensions import db
|
||||
from app.log import LOG
|
||||
from app.models import GenEmail, AliasUsedOn
|
||||
|
||||
|
||||
# OBSOLETE
|
||||
@api_bp.route("/alias/random/new", methods=["POST"])
|
||||
@cross_origin()
|
||||
@verify_api_key
|
||||
def new_random_alias():
|
||||
"""
|
||||
Create a new random alias
|
||||
Input:
|
||||
optional "hostname" in args
|
||||
Output:
|
||||
201 if success
|
||||
409 if alias already exists
|
||||
|
||||
"""
|
||||
LOG.error("/api/alias/new is obsolete! Called by %s", g.user)
|
||||
|
||||
user = g.user
|
||||
if not user.can_create_new_random_alias():
|
||||
LOG.d("user %s cannot create random alias", user)
|
||||
return (
|
||||
jsonify(
|
||||
error="You have created 3 random aliases, please upgrade to create more"
|
||||
),
|
||||
400,
|
||||
)
|
||||
|
||||
hostname = request.args.get("hostname")
|
||||
gen_email = GenEmail.create_new_gen_email(user_id=user.id)
|
||||
db.session.commit()
|
||||
|
||||
if hostname:
|
||||
AliasUsedOn.create(gen_email_id=gen_email.id, hostname=hostname)
|
||||
db.session.commit()
|
||||
|
||||
return jsonify(alias=gen_email.email), 201
|
@ -143,15 +143,6 @@ class User(db.Model, ModelMixin, UserMixin):
|
||||
< MAX_NB_EMAIL_FREE_PLAN
|
||||
)
|
||||
|
||||
def can_create_new_random_alias(self):
|
||||
if self.is_premium():
|
||||
return True
|
||||
else:
|
||||
return (
|
||||
GenEmail.filter_by(user_id=self.id, custom=False).count()
|
||||
< MAX_NB_EMAIL_FREE_PLAN
|
||||
)
|
||||
|
||||
def set_password(self, password):
|
||||
salt = bcrypt.gensalt()
|
||||
password_hash = bcrypt.hashpw(password.encode(), salt).decode()
|
||||
|
3
cron.py
3
cron.py
@ -10,7 +10,8 @@ from app.models import (
|
||||
ForwardEmailLog,
|
||||
ForwardEmail,
|
||||
CustomDomain,
|
||||
Client)
|
||||
Client,
|
||||
)
|
||||
from server import create_app
|
||||
|
||||
|
||||
|
@ -19,25 +19,6 @@ def test_profile_picture_url(flask_client):
|
||||
assert user.profile_picture_url() == "http://sl.test/static/default-avatar.png"
|
||||
|
||||
|
||||
def test_suggested_emails_for_user_who_can_create_new_random_alias(flask_client):
|
||||
user = User.create(
|
||||
email="a@b.c", password="password", name="Test User", activated=True
|
||||
)
|
||||
db.session.commit()
|
||||
|
||||
suggested_email, other_emails = user.suggested_emails(website_name="test")
|
||||
assert suggested_email
|
||||
assert len(other_emails) == 1
|
||||
|
||||
db.session.rollback()
|
||||
|
||||
# the suggested email is new and not exist in GenEmail
|
||||
assert GenEmail.get_by(email=suggested_email) is None
|
||||
|
||||
# all other emails are generated emails
|
||||
assert GenEmail.get_by(email=other_emails[0])
|
||||
|
||||
|
||||
def test_suggested_emails_for_user_who_cannot_create_new_email(flask_client):
|
||||
user = User.create(
|
||||
email="a@b.c", password="password", name="Test User", activated=True
|
||||
|
Loading…
Reference in New Issue
Block a user