darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-17 04:58:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

try UserState enum

Browse Source
This commit is contained in:
Kenneth Kehl
2025-08-28 11:12:49 -07:00
parent 99110608aa
commit 1cef8881a8
13 changed files with 94 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/dao/users_dao.py
View File

@@ -11,7 +11,7 @@ from app import db
from app.dao.dao_utils import autocommit
from app.dao.permissions_dao import permission_dao
from app.dao.service_user_dao import dao_get_service_users_by_user_id
from app.enums import AuthType, PermissionType
from app.enums import AuthType, PermissionType, UserState
from app.errors import InvalidRequest
from app.models import Organization, Service, User, VerifyCode
from app.utils import escape_special_characters, get_archived_db_column_value, utc_now
@@ -233,7 +233,7 @@ def dao_archive_user(user):
user.password = str(uuid.uuid4())
# Changing the current_session_id signs the user out
user.current_session_id = "00000000-0000-0000-0000-000000000000"
user.state = "inactive"
user.state = UserState.INACTIVE
db.session.add(user)
@@ -243,7 +243,7 @@ def user_can_be_archived(user):
for service in active_services:
other_active_users = [
x for x in service.users if x.state == "active" and x != user
x for x in service.users if x.state == UserState.ACTIVE and x != user
]
if not other_active_users: