Skip to content

Commit 235ee34

Browse files
Revert "Fix null created by" (#347)
* Revert "Fix `null` created by (#344)" This reverts commit d60bc0d. * chore: update submodules
1 parent d60bc0d commit 235ee34

File tree

5 files changed

+3
-86
lines changed

5 files changed

+3
-86
lines changed

alembic/versions/58c0e071db99_adds_deleted_user.py

Lines changed: 0 additions & 58 deletions
This file was deleted.

controller/auth/kratos.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from urllib.parse import quote
99

1010
from controller.user import manager
11-
from submodules.model import DELETED_USER_ID, DELETED_USER_EMAIL
1211

1312

1413
logging.basicConfig(level=logging.INFO)
@@ -76,24 +75,6 @@ def __refresh_identity_cache(update_db_users: bool = True) -> None:
7675
else:
7776
KRATOS_IDENTITY_CACHE = {}
7877

79-
# dummy identity for deleted users
80-
# this identity should not be in kratos but in db only
81-
# note that deleted users usually SET_NULL on foreign keys so the id is not in use anymore
82-
KRATOS_IDENTITY_CACHE[DELETED_USER_ID] = {
83-
"identity": {
84-
"id": DELETED_USER_ID,
85-
"traits": {
86-
"email": DELETED_USER_EMAIL,
87-
"name": {"first": "Deleted", "last": "User"},
88-
},
89-
},
90-
"simple": {
91-
"id": DELETED_USER_ID,
92-
"mail": DELETED_USER_EMAIL,
93-
"firstName": "Deleted",
94-
"lastName": "User",
95-
},
96-
}
9778
if update_db_users:
9879
manager.migrate_kratos_users()
9980

controller/monitor/manager.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
from submodules.model.business_objects import monitor as task_monitor
33
from controller.auth import kratos
44
from submodules.model.util import sql_alchemy_to_dict
5-
from submodules.model import DELETED_USER_ID
65

76

87
def monitor_all_tasks(page: int, limit: int) -> List[Any]:
98
tasks = task_monitor.get_all_tasks(page, limit)
109
tasks_dict = sql_alchemy_to_dict(tasks)
1110
user_ids = {str(t["created_by"]) for t in tasks} # set comprehension
1211
name_lookup = {u_id: kratos.resolve_user_name_by_id(u_id) for u_id in user_ids}
13-
name_lookup[DELETED_USER_ID] = {"first": "Deleted", "last": "User"}
1412

1513
for t in tasks_dict:
1614
created_by_first_last = name_lookup[str(t["created_by"])]

controller/user/manager.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from typing import Dict, Optional, Any
2-
from submodules.model import User, daemon, enums, DELETED_USER_ID
2+
from submodules.model import User, daemon, enums
33
from submodules.model.business_objects import user, general
44
from controller.auth import kratos
55
from submodules.model.exceptions import EntityNotFoundException
@@ -138,11 +138,7 @@ def __migrate_kratos_users():
138138

139139
for user_database in users_database:
140140
user_id = str(user_database.id)
141-
if (
142-
user_id not in users_kratos
143-
or users_kratos[user_id] is None
144-
or user_id == DELETED_USER_ID
145-
):
141+
if user_id not in users_kratos or users_kratos[user_id] is None:
146142
continue
147143
user_identity = users_kratos[user_id]["identity"]
148144
if user_database.email != user_identity["traits"]["email"]:

submodules/model

0 commit comments

Comments
 (0)