From c0831bdce9682c0bcd45121012796a3f323cdf33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 3 Aug 2021 10:59:19 +0200 Subject: [PATCH] update login view for new authentic symbol location (#55941) --- src/authentic2_auth_fedict/views.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/authentic2_auth_fedict/views.py b/src/authentic2_auth_fedict/views.py index f75d4e2..d25a0af 100644 --- a/src/authentic2_auth_fedict/views.py +++ b/src/authentic2_auth_fedict/views.py @@ -26,7 +26,11 @@ from django.shortcuts import resolve_url from django.views.decorators.csrf import csrf_exempt from django.views.generic import View -from authentic2 import utils as a2_utils +try: + import authentic2.utils.misc as a2_utils_misc +except ImportError: + import authentic2.utils as a2_utils_misc + import mellon.utils import mellon.views @@ -44,7 +48,7 @@ class LoginView(mellon.views.LoginView): nonce = urllib.parse.parse_qs(urllib.parse.urlparse(next_url).query)['nonce'][0] except (KeyError, IndexError): nonce = None - a2_utils.record_authentication_event(request, 'fedict', nonce=nonce) + a2_utils_misc.record_authentication_event(request, 'fedict', nonce=nonce) if not user.email: adapter.provision_attribute(user, idp, attributes) @@ -58,7 +62,7 @@ class LoginView(mellon.views.LoginView): data['skip_email_check'] = True data['user_id'] = user.id data['authentication_method'] = 'fedict' - return HttpResponseRedirect(a2_utils.build_activation_url(request, **data)) + return HttpResponseRedirect(a2_utils_misc.build_activation_url(request, **data)) user.is_active = True user.save() return super(LoginView, self).authenticate(request, login, attributes)