update login view for new authentic symbol location (#55941)
This commit is contained in:
parent
ae7937538a
commit
c0831bdce9
|
@ -26,7 +26,11 @@ from django.shortcuts import resolve_url
|
||||||
from django.views.decorators.csrf import csrf_exempt
|
from django.views.decorators.csrf import csrf_exempt
|
||||||
from django.views.generic import View
|
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.utils
|
||||||
import mellon.views
|
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]
|
nonce = urllib.parse.parse_qs(urllib.parse.urlparse(next_url).query)['nonce'][0]
|
||||||
except (KeyError, IndexError):
|
except (KeyError, IndexError):
|
||||||
nonce = None
|
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:
|
if not user.email:
|
||||||
adapter.provision_attribute(user, idp, attributes)
|
adapter.provision_attribute(user, idp, attributes)
|
||||||
|
@ -58,7 +62,7 @@ class LoginView(mellon.views.LoginView):
|
||||||
data['skip_email_check'] = True
|
data['skip_email_check'] = True
|
||||||
data['user_id'] = user.id
|
data['user_id'] = user.id
|
||||||
data['authentication_method'] = 'fedict'
|
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.is_active = True
|
||||||
user.save()
|
user.save()
|
||||||
return super(LoginView, self).authenticate(request, login, attributes)
|
return super(LoginView, self).authenticate(request, login, attributes)
|
||||||
|
|
Loading…
Reference in New Issue