Skip to content
Snippets Groups Projects
Commit 48145ba1 authored by Martin Mareš's avatar Martin Mareš
Browse files

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

parent 03abff5a
No related branches found
No related tags found
1 merge request!138Zpracování nedoručenek
...@@ -467,12 +467,3 @@ def request_reset_password(user: db.User, client: Optional[str]) -> Optional[db. ...@@ -467,12 +467,3 @@ def request_reset_password(user: db.User, client: Optional[str]) -> Optional[db.
details={'action': 'ask-reset'}, details={'action': 'ask-reset'},
) )
return rr 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))
...@@ -7,6 +7,7 @@ from typing import Optional ...@@ -7,6 +7,7 @@ from typing import Optional
import mo import mo
import mo.config as config import mo.config as config
import mo.db as db import mo.db as db
from mo.util import logger
dsn_explanation = { dsn_explanation = {
...@@ -48,3 +49,12 @@ def expire_dsns() -> None: ...@@ -48,3 +49,12 @@ def expire_dsns() -> None:
.where(dsn_table.c.dsn_id.not_in(select(user_table.c.dsn_id)))) .where(dsn_table.c.dsn_id.not_in(select(user_table.c.dsn_id))))
sess.commit() 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))
...@@ -555,14 +555,14 @@ class Reg2: ...@@ -555,14 +555,14 @@ class Reg2:
}, },
) )
mo.users.reset_user_dsn(user) mo.util_dsn.reset_user_dsn(user)
self.spend_request_and_commit() self.spend_request_and_commit()
return True return True
def validate_email(self) -> None: def validate_email(self) -> None:
user = self.rr.user user = self.rr.user
app.logger.info(f'Reg2: Uživatel #{user.user_id} potvrzuje email <{user.email}>') 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() self.spend_request_and_commit()
def change_passwd(self, new_passwd: str): def change_passwd(self, new_passwd: str):
...@@ -572,7 +572,7 @@ class Reg2: ...@@ -572,7 +572,7 @@ class Reg2:
app.logger.info(f'Reg2: Uživatel #{user.user_id} si resetoval heslo') app.logger.info(f'Reg2: Uživatel #{user.user_id} si resetoval heslo')
mo.users.set_password(user, new_passwd, reset=True) mo.users.set_password(user, new_passwd, reset=True)
mo.users.login(user) mo.users.login(user)
mo.users.reset_user_dsn(user) mo.util_dsn.reset_user_dsn(user)
self.spend_request_and_commit() self.spend_request_and_commit()
def spend_request_and_commit(self): def spend_request_and_commit(self):
......
...@@ -21,6 +21,7 @@ from mo.imports import GlobalOrgsImport ...@@ -21,6 +21,7 @@ from mo.imports import GlobalOrgsImport
import mo.rights import mo.rights
from mo.rights import Right, Rights from mo.rights import Right, Rights
import mo.util import mo.util
import mo.util_dsn
import mo.users import mo.users
from mo.web import app from mo.web import app
import mo.web.fields as mo_fields import mo.web.fields as mo_fields
...@@ -525,7 +526,7 @@ def org_user_edit(id: int): ...@@ -525,7 +526,7 @@ def org_user_edit(id: int):
if sess.is_modified(user): if sess.is_modified(user):
changes = db.get_object_changes(user) changes = db.get_object_changes(user)
if 'email' in changes: 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}") app.logger.info(f"Uživatel #{id} změněn: {changes}")
mo.util.log( mo.util.log(
type=db.LogType.user, type=db.LogType.user,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment