DSN: reset_user_dsn() přesouváme do mo.util_dsn

mo/users.py

@@ -467,12 +467,3 @@ def request_reset_password(user: db.User, client: Optional[str]) -> Optional[db.
             details={'action': 'ask-reset'},
         )
     return rr
-
-
-def reset_user_dsn(user: db.User) -> None:
-    if user.dsn_id:
-        logger.info(f'Uživatel #{user.user_id}: Reset DSN')
-        user.dsn_id = None
-        conn = db.get_session().connection()
-        dsn_table = db.EmailDSN.__table__
-        conn.execute(dsn_table.delete().where(dsn_table.c.user_id == user.user_id))

mo/util_dsn.py

@@ -7,6 +7,7 @@ from typing import Optional
 import mo
 import mo.config as config
 import mo.db as db
+from mo.util import logger
 
 
 dsn_explanation = {
@@ -48,3 +49,12 @@ def expire_dsns() -> None:
                  .where(dsn_table.c.dsn_id.not_in(select(user_table.c.dsn_id))))
 
     sess.commit()
+
+
+def reset_user_dsn(user: db.User) -> None:
+    if user.dsn_id:
+        logger.info(f'Uživatel #{user.user_id}: Reset DSN')
+        user.dsn_id = None
+        conn = db.get_session().connection()
+        dsn_table = db.EmailDSN.__table__
+        conn.execute(dsn_table.delete().where(dsn_table.c.user_id == user.user_id))

mo/web/acct.py

@@ -555,14 +555,14 @@ class Reg2:
             },
         )
 
-        mo.users.reset_user_dsn(user)
+        mo.util_dsn.reset_user_dsn(user)
         self.spend_request_and_commit()
         return True
 
     def validate_email(self) -> None:
         user = self.rr.user
         app.logger.info(f'Reg2: Uživatel #{user.user_id} potvrzuje email <{user.email}>')
-        mo.users.reset_user_dsn(user)
+        mo.util_dsn.reset_user_dsn(user)
         self.spend_request_and_commit()
 
     def change_passwd(self, new_passwd: str):
@@ -572,7 +572,7 @@ class Reg2:
         app.logger.info(f'Reg2: Uživatel #{user.user_id} si resetoval heslo')
         mo.users.set_password(user, new_passwd, reset=True)
         mo.users.login(user)
-        mo.users.reset_user_dsn(user)
+        mo.util_dsn.reset_user_dsn(user)
         self.spend_request_and_commit()
 
     def spend_request_and_commit(self):

mo/web/org_users.py

@@ -21,6 +21,7 @@ from mo.imports import GlobalOrgsImport
 import mo.rights
 from mo.rights import Right, Rights
 import mo.util
+import mo.util_dsn
 import mo.users
 from mo.web import app
 import mo.web.fields as mo_fields
@@ -525,7 +526,7 @@ def org_user_edit(id: int):
             if sess.is_modified(user):
                 changes = db.get_object_changes(user)
                 if 'email' in changes:
-                    mo.users.reset_user_dsn(user)
+                    mo.util_dsn.reset_user_dsn(user)
                 app.logger.info(f"Uživatel #{id} změněn: {changes}")
                 mo.util.log(
                     type=db.LogType.user,