Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
5b4bf45a
Commit
5b4bf45a
authored
Dec 28, 2023
by
Timothy J. Baek
Browse files
fix: delete auth with user
parent
48cc2c50
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
4 deletions
+22
-4
backend/apps/web/models/auths.py
backend/apps/web/models/auths.py
+16
-0
backend/apps/web/models/users.py
backend/apps/web/models/users.py
+2
-2
backend/apps/web/routers/users.py
backend/apps/web/routers/users.py
+4
-2
No files found.
backend/apps/web/models/auths.py
View file @
5b4bf45a
...
@@ -109,5 +109,21 @@ class AuthsTable:
...
@@ -109,5 +109,21 @@ class AuthsTable:
except
:
except
:
return
None
return
None
def
delete_auth_by_id
(
self
,
id
:
str
)
->
Optional
[
UserModel
]:
try
:
# Delete User
result
=
Users
.
delete_user_by_id
(
id
)
if
result
:
# Delete Auth
query
=
Auth
.
delete
().
where
(
Auth
.
id
==
id
)
query
.
execute
()
# Remove the rows, return number of rows removed.
return
True
else
:
return
False
except
:
return
False
Auths
=
AuthsTable
(
DB
)
Auths
=
AuthsTable
(
DB
)
backend/apps/web/models/users.py
View file @
5b4bf45a
...
@@ -8,7 +8,7 @@ from utils.utils import decode_token
...
@@ -8,7 +8,7 @@ from utils.utils import decode_token
from
utils.misc
import
get_gravatar_url
from
utils.misc
import
get_gravatar_url
from
apps.web.internal.db
import
DB
from
apps.web.internal.db
import
DB
from
apps.web.models.chats
import
Chat
from
apps.web.models.chats
import
Chat
s
####################
####################
...
@@ -115,7 +115,7 @@ class UsersTable:
...
@@ -115,7 +115,7 @@ class UsersTable:
def
delete_user_by_id
(
self
,
id
:
str
)
->
bool
:
def
delete_user_by_id
(
self
,
id
:
str
)
->
bool
:
try
:
try
:
# Delete User Chats
# Delete User Chats
result
=
Chat
.
delete_chats_by_user_id
(
id
)
result
=
Chat
s
.
delete_chats_by_user_id
(
id
)
if
result
:
if
result
:
# Delete User
# Delete User
...
...
backend/apps/web/routers/users.py
View file @
5b4bf45a
...
@@ -9,6 +9,8 @@ import time
...
@@ -9,6 +9,8 @@ import time
import
uuid
import
uuid
from
apps.web.models.users
import
UserModel
,
UserRoleUpdateForm
,
Users
from
apps.web.models.users
import
UserModel
,
UserRoleUpdateForm
,
Users
from
apps.web.models.auths
import
Auths
from
utils.utils
import
(
from
utils.utils
import
(
get_password_hash
,
get_password_hash
,
...
@@ -76,7 +78,7 @@ async def update_user_role(form_data: UserRoleUpdateForm, cred=Depends(bearer_sc
...
@@ -76,7 +78,7 @@ async def update_user_role(form_data: UserRoleUpdateForm, cred=Depends(bearer_sc
############################
############################
# DeleteUser
# DeleteUser
ById
############################
############################
...
@@ -88,7 +90,7 @@ async def delete_user_by_id(user_id: str, cred=Depends(bearer_scheme)):
...
@@ -88,7 +90,7 @@ async def delete_user_by_id(user_id: str, cred=Depends(bearer_scheme)):
if
user
:
if
user
:
if
user
.
role
==
"admin"
:
if
user
.
role
==
"admin"
:
if
user
.
id
!=
user_id
:
if
user
.
id
!=
user_id
:
result
=
User
s
.
delete_
user
_by_id
(
user_id
)
result
=
Auth
s
.
delete_
auth
_by_id
(
user_id
)
if
result
:
if
result
:
return
True
return
True
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment