diff --git a/lemur/auth/views.py b/lemur/auth/views.py index ce38d5d8..60f4e246 100644 --- a/lemur/auth/views.py +++ b/lemur/auth/views.py @@ -433,7 +433,7 @@ class Google(Resource): user = user_service.get_by_email(profile['email']) - if not user.active: + if not (user and user.active): metrics.send('login', 'counter', 1, metric_tags={'status': FAILURE_METRIC_STATUS}) return dict(message='The supplied credentials are invalid.'), 403 diff --git a/lemur/common/defaults.py b/lemur/common/defaults.py index bb49c5b7..3eba7be0 100644 --- a/lemur/common/defaults.py +++ b/lemur/common/defaults.py @@ -10,7 +10,7 @@ from lemur.constants import SAN_NAMING_TEMPLATE, DEFAULT_NAMING_TEMPLATE def text_to_slug(value): """Normalize a string to a "slug" value, stripping character accents and removing non-alphanum characters.""" - # Strip all character accents (รค => a): decompose Unicode characters and then drop combining chars. + # Strip all character accents: decompose Unicode characters and then drop combining chars. value = ''.join(c for c in unicodedata.normalize('NFKD', value) if not unicodedata.combining(c)) # Replace all remaining non-alphanumeric characters with '-'. Multiple characters get collapsed into a single dash.