Use new email validation.

Use logger.exception where it makes sense, not for SqlAlchemy errors as it give too much information away.
This commit is contained in:
Rebecca Law
2016-03-08 15:47:35 +00:00
parent cbc585a1b1
commit 29a7289d1e
3 changed files with 10 additions and 9 deletions

View File

@@ -1,9 +1,8 @@
import re
from flask_marshmallow.fields import fields
from . import ma
from . import models
from app.dao.permissions_dao import permission_dao
from marshmallow import (post_load, ValidationError, validates, validates_schema)
from marshmallow import (post_load, ValidationError, validates)
from marshmallow_sqlalchemy import field_for
from utils.recipients import (
validate_email_address, InvalidEmailError,
@@ -202,8 +201,10 @@ class EmailDataSchema(ma.Schema):
email = fields.Str(required=False)
@validates('email')
def validate_to(self, value):
if not email_regex.match(value):
def validate_email(self, value):
try:
validate_email_address(value)
except InvalidEmailError:
raise ValidationError('Invalid email')
user_schema = UserSchema()