Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Odevzdávací Systém MO
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martin Mareš
Odevzdávací Systém MO
Commits
48145ba1
Commit
48145ba1
authored
6 months ago
by
Martin Mareš
Browse files
Options
Downloads
Patches
Plain Diff
DSN: reset_user_dsn() přesouváme do mo.util_dsn
parent
03abff5a
No related branches found
No related tags found
1 merge request
!138
Zpracování nedoručenek
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
mo/users.py
+0
-9
0 additions, 9 deletions
mo/users.py
mo/util_dsn.py
+10
-0
10 additions, 0 deletions
mo/util_dsn.py
mo/web/acct.py
+3
-3
3 additions, 3 deletions
mo/web/acct.py
mo/web/org_users.py
+2
-1
2 additions, 1 deletion
mo/web/org_users.py
with
15 additions
and
13 deletions
mo/users.py
+
0
−
9
View file @
48145ba1
...
@@ -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
))
This diff is collapsed.
Click to expand it.
mo/util_dsn.py
+
10
−
0
View file @
48145ba1
...
@@ -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
))
This diff is collapsed.
Click to expand it.
mo/web/acct.py
+
3
−
3
View file @
48145ba1
...
@@ -555,14 +555,14 @@ class Reg2:
...
@@ -555,14 +555,14 @@ class Reg2:
},
},
)
)
mo
.
u
sers
.
reset_user_dsn
(
user
)
mo
.
u
til_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
.
u
sers
.
reset_user_dsn
(
user
)
mo
.
u
til_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
.
u
sers
.
reset_user_dsn
(
user
)
mo
.
u
til_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
):
...
...
This diff is collapsed.
Click to expand it.
mo/web/org_users.py
+
2
−
1
View file @
48145ba1
...
@@ -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
.
u
sers
.
reset_user_dsn
(
user
)
mo
.
u
til_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
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment