From a48269d21020ccd5e2b2335b6c61acbd8a0ac4f5 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Fri, 15 Aug 2025 08:31:36 -0700
Subject: [PATCH 1/2] fix deactivate

---
 app/main/views/sign_in.py  | 4 +++-
 app/main/views/sign_out.py | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py
index 24c49d7bd..d171d1d9b 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -147,7 +147,9 @@ def _do_login_dot_gov():  # $ pragma: no cover
 
             usr = User.from_email_address(user["email_address"])
             current_app.logger.info(f"activating user {usr.id} #notify-admin-1505")
-            activate_user(usr.id)
+            # New users on the invite path need activation
+            if not usr.is_active:
+                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 8055e5f50..9df4c27cc 100644
--- a/app/main/views/sign_out.py
+++ b/app/main/views/sign_out.py
@@ -27,7 +27,6 @@ def _sign_out_at_login_dot_gov():
 def sign_out():
 
     if current_user.is_authenticated:
-        current_user.deactivate()
         session.clear()
         current_user.sign_out()
 

From 20db7929b5ef7320f40602909d4a737a6c485058 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Fri, 15 Aug 2025 09:02:58 -0700
Subject: [PATCH 2/2] fix deactivate

---
 app/main/views/sign_in.py  | 7 ++++---
 app/main/views/sign_out.py | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

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()