mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-04 10:13:30 +02:00
Set finished_setup as property, remove id
This commit is contained in:
parent
c1d9cb1b13
commit
47de6f17a7
11 changed files with 45 additions and 95 deletions
|
@ -50,9 +50,6 @@ class OpenIdConnectBackend(ModelBackend):
|
|||
|
||||
user, created = UserModel.objects.get_or_create(**args)
|
||||
|
||||
if created and request is not None:
|
||||
request.session["is_new_user"] = True
|
||||
|
||||
if not created:
|
||||
# If user exists, update existing user
|
||||
self.update_existing_user(user, args["defaults"])
|
||||
|
@ -63,8 +60,6 @@ class OpenIdConnectBackend(ModelBackend):
|
|||
try:
|
||||
user = UserModel.objects.get_by_natural_key(username)
|
||||
except UserModel.DoesNotExist:
|
||||
if request is not None:
|
||||
request.session["is_new_user"] = True
|
||||
return None
|
||||
# run this callback for a each login
|
||||
user.on_each_login()
|
||||
|
|
|
@ -98,11 +98,10 @@ def login_callback(request):
|
|||
request.session["acr_value"] = CLIENT.get_step_up_acr_value()
|
||||
return CLIENT.create_authn_request(request.session)
|
||||
user = authenticate(request=request, **userinfo)
|
||||
is_new_user = request.session.get("is_new_user", False)
|
||||
if user:
|
||||
# Set login metadata about this user
|
||||
# (verification_type for instance)
|
||||
_set_authenticated_user_metadata(user, is_new_user)
|
||||
_set_authenticated_user_metadata(user)
|
||||
|
||||
login(request, user)
|
||||
|
||||
|
@ -132,7 +131,7 @@ def login_callback(request):
|
|||
return error_page(request, err)
|
||||
|
||||
|
||||
def _set_authenticated_user_metadata(user, is_new_user):
|
||||
def _set_authenticated_user_metadata(user):
|
||||
"""Does checks on the recieved authenticated user from login_callback,
|
||||
and updates fields accordingly."""
|
||||
should_update_user = False
|
||||
|
@ -148,10 +147,6 @@ def _set_authenticated_user_metadata(user, is_new_user):
|
|||
user.set_user_verification_type()
|
||||
should_update_user = True
|
||||
|
||||
if is_new_user:
|
||||
user.finished_setup = False
|
||||
should_update_user = True
|
||||
|
||||
if should_update_user:
|
||||
user.save()
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue