diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py index d171d1d9b..9c420ff08 100644 --- a/app/main/views/sign_in.py +++ b/app/main/views/sign_in.py @@ -146,10 +146,11 @@ def _do_login_dot_gov(): # $ pragma: no cover # return verify_email(user, redirect_url) usr = User.from_email_address(user["email_address"]) - current_app.logger.info(f"activating user {usr.id} #notify-admin-1505") + # New users on the invite path need activation - if not usr.is_active: - activate_user(usr.id) + # if not usr.is_active: + current_app.logger.info(f"activating user {usr.id} #notify-admin-1505") + activate_user(usr.id) except BaseException as be: # noqa B036 current_app.logger.error(f"Error signing in: {be} #notify-admin-1505 ") error(401) diff --git a/app/main/views/sign_out.py b/app/main/views/sign_out.py index 9df4c27cc..a934308d1 100644 --- a/app/main/views/sign_out.py +++ b/app/main/views/sign_out.py @@ -27,6 +27,7 @@ def _sign_out_at_login_dot_gov(): def sign_out(): if current_user.is_authenticated: + # current_user.deactivate() session.clear() current_user.sign_out()