diff --git a/ledger/accounts/pipeline.py b/ledger/accounts/pipeline.py index bb10939752..60a23800f7 100644 --- a/ledger/accounts/pipeline.py +++ b/ledger/accounts/pipeline.py @@ -49,7 +49,7 @@ def user_by_email(backend, details, *args, **kwargs): request_data = backend.strategy.request_data() if request_data.get('verification_code') and details.get('email'): try: - user = EmailIdentity.objects.get(email=details['email']).user + user = EmailIdentity.objects.get(email__iexact=details['email']).user except EmailIdentity.DoesNotExist: user = None return {'user': user} diff --git a/ledger/settings_base.py b/ledger/settings_base.py index 186f50c752..3d8f2eb6ce 100755 --- a/ledger/settings_base.py +++ b/ledger/settings_base.py @@ -65,8 +65,6 @@ 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'dpaw_utils.middleware.SSOLoginMiddleware', 'dpaw_utils.middleware.AuditMiddleware', # Sets model creator/modifier field values. -# FIXME: find out why django 1.10 breaks -# 'ledger.middleware.FirstTimeNagScreenMiddleware', 'oscar.apps.basket.middleware.BasketMiddleware', 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', ] @@ -101,7 +99,7 @@ 'social_core.pipeline.user.create_user', 'social_core.pipeline.social_auth.associate_user', 'social_core.pipeline.social_auth.load_extra_data', - 'social_core.pipeline.user.user_details' + #'social_core.pipeline.user.user_details' ) SESSION_COOKIE_DOMAIN = env('SESSION_COOKIE_DOMAIN', None) diff --git a/requirements.txt b/requirements.txt index 4c2827a38d..f57599a3c9 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Django<1.11.0 -git+https://github.com/parksandwildlife/dpaw-utils.git@0.3a13#egg=dpaw-utils +git+https://github.com/parksandwildlife/dpaw-utils.git@0.3a14#egg=dpaw-utils git+https://github.com/django-oscar/django-oscar.git@feature/django-110#egg=django-oscar social-auth-app-django==0.1.0 coverage==4.3.1