CHANGELOG.md

+## [1.8.4](https://gitlab.ics.muni.cz/perun-proxy-aai/python/perun-proxygui/compare/v1.8.3...v1.8.4) (2023-06-19)
+
+
+### Bug Fixes
+
+* fixed removing tokens from mitre ([59b3ead](https://gitlab.ics.muni.cz/perun-proxy-aai/python/perun-proxygui/commit/59b3ead724f79cea82ee3a760c15103481fee2f4))
+
 ## [1.8.3](https://gitlab.ics.muni.cz/perun-proxy-aai/python/perun-proxygui/compare/v1.8.2...v1.8.3) (2023-06-15)
 
 

perun/proxygui/user_manager.py

@@ -52,17 +52,18 @@ class UserManager:
     def _get_mitre_delete_statements(self, user_id: str, engine: Engine) -> list[Any]:
         meta_data = sqlalchemy.MetaData(bind=engine)
         sqlalchemy.MetaData.reflect(meta_data)
+        session = Session(bind=engine)
 
         AUTH_HOLDER_TBL = meta_data.tables["authentication_holder"]
         SAVED_USER_AUTH_TBL = meta_data.tables["saved_user_auth"]
 
         ACCESS_TOKEN_TBL = meta_data.tables["access_token"]
         delete_access_tokens_stmt = delete(ACCESS_TOKEN_TBL).where(
-            ACCESS_TOKEN_TBL.auth_holder_id.in_(
-                Session.query(AUTH_HOLDER_TBL.id).filter(
-                    AUTH_HOLDER_TBL.user_auth_id.in_(
-                        Session.query(SAVED_USER_AUTH_TBL.id).filter(
-                            SAVED_USER_AUTH_TBL.name == user_id
+            ACCESS_TOKEN_TBL.c.auth_holder_id.in_(
+                session.query(AUTH_HOLDER_TBL.c.id).filter(
+                    AUTH_HOLDER_TBL.c.user_auth_id.in_(
+                        session.query(SAVED_USER_AUTH_TBL.c.id).filter(
+                            SAVED_USER_AUTH_TBL.c.name == user_id
                         )
                     )
                 )
@@ -71,11 +72,11 @@ class UserManager:
 
         AUTH_CODE_TBL = meta_data.tables["authorization_code"]
         delete_authorization_codes_stmt = delete(AUTH_CODE_TBL).where(
-            AUTH_CODE_TBL.auth_holder_id.in_(
-                Session.query(AUTH_HOLDER_TBL.id).filter(
-                    AUTH_HOLDER_TBL.user_auth_id.in_(
-                        Session.query(SAVED_USER_AUTH_TBL.id).filter(
-                            SAVED_USER_AUTH_TBL.name == user_id
+            AUTH_CODE_TBL.c.auth_holder_id.in_(
+                session.query(AUTH_HOLDER_TBL.c.id).filter(
+                    AUTH_HOLDER_TBL.c.user_auth_id.in_(
+                        session.query(SAVED_USER_AUTH_TBL.c.id).filter(
+                            SAVED_USER_AUTH_TBL.c.name == user_id
                         )
                     )
                 )
@@ -84,11 +85,11 @@ class UserManager:
 
         DEVICE_CODE = meta_data.tables["device_code"]
         delete_device_codes_stmt = delete(DEVICE_CODE).where(
-            DEVICE_CODE.auth_holder_id.in_(
-                Session.query(AUTH_HOLDER_TBL.id).filter(
-                    AUTH_HOLDER_TBL.user_auth_id.in_(
-                        Session.query(SAVED_USER_AUTH_TBL.id).filter(
-                            SAVED_USER_AUTH_TBL.name == user_id
+            DEVICE_CODE.c.auth_holder_id.in_(
+                session.query(AUTH_HOLDER_TBL.c.id).filter(
+                    AUTH_HOLDER_TBL.c.user_auth_id.in_(
+                        session.query(SAVED_USER_AUTH_TBL.c.id).filter(
+                            SAVED_USER_AUTH_TBL.c.name == user_id
                         )
                     )
                 )

setup.cfg

 [metadata]
-version = 1.8.3
+version = 1.8.4
 license_files = LICENSE