POKASH.PL
/
ably.do
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mod auth

This commit is contained in:
l.gabrysiak 2025-03-01 23:32:55 +01:00
parent e89bc1ef16
commit 02ea3c179f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/open_webui/models/auths.py
View File

@ -1,6 +1,6 @@
import logging import logging
import uuid import uuid
from typing import Optional from typing import Optional, List
from open_webui.internal.db import Base, get_db from open_webui.internal.db import Base, get_db
from open_webui.models.users import UserModel, Users from open_webui.models.users import UserModel, Users
@ -103,8 +103,8 @@ class AuthsTable:
profile_image_url: str = "/user.png", profile_image_url: str = "/user.png",
role: str = "pending", role: str = "pending",
oauth_sub: Optional[str] = None, oauth_sub: Optional[str] = None,
permissions: Optional[str] = None, permissions: Optional[dict] = None,
subscription: Optional[str] = None subscription: Optional[List[str]] = None
) -> Optional[UserModel]: ) -> Optional[UserModel]:
with get_db() as db: with get_db() as db:
log.info("insert_new_auth") log.info("insert_new_auth")
@ -204,7 +204,7 @@ class AuthsTable:
except Exception: except Exception:
return False return False
def update_user_profile(self, id: str, name: str, profile_image_url: str, role: str, permissions: dict, subscription: dict) -> bool: def update_user_profile(self, id: str, name: str, profile_image_url: str, role: str, permissions: Optional[dict] = None, subscription: Optional[List[str]] = None) -> bool:
result = Users.update_user_profile(id, name, profile_image_url, role, permissions, subscription) result = Users.update_user_profile(id, name, profile_image_url, role, permissions, subscription)
return True if result == 1 else False return True if result == 1 else False

10
backend/open_webui/models/users.py
View File

@ -1,5 +1,5 @@
import time import time
from typing import Optional from typing import Optional, List
from open_webui.internal.db import Base, JSONField, get_db from open_webui.internal.db import Base, JSONField, get_db
@ -64,7 +64,7 @@ class UserModel(BaseModel):
permissions: Optional[dict] = None permissions: Optional[dict] = None
subscription: Optional[dict] = None subscription: Optional[List[str]] = None
model_config = ConfigDict(from_attributes=True) model_config = ConfigDict(from_attributes=True)
@ -111,8 +111,8 @@ class UsersTable:
profile_image_url: str = "/user.png", profile_image_url: str = "/user.png",
role: str = "pending", role: str = "pending",
oauth_sub: Optional[str] = None, oauth_sub: Optional[str] = None,
permissions: Optional[str] = None, permissions: Optional[dict] = None,
subscription: Optional[str] = None subscription: Optional[List[str]] = None
) -> Optional[UserModel]: ) -> Optional[UserModel]:
with get_db() as db: with get_db() as db:
user = UserModel( user = UserModel(
@ -342,7 +342,7 @@ class UsersTable:
users = db.query(User).filter(User.id.in_(user_ids)).all() users = db.query(User).filter(User.id.in_(user_ids)).all()
return [user.id for user in users] return [user.id for user in users]
def update_user_profile(self, id: str, name: str, profile_image_url: str, role: str, permissions: dict, subscription: dict) -> bool: def update_user_profile(self, id: str, name: str, profile_image_url: str, role: str, permissions: Optional[dict] = None, subscription: Optional[List[str]] = None) -> bool:
try: try:
with get_db() as db: with get_db() as db:
result = db.query(User).filter_by(id=id).update({ result = db.query(User).filter_by(id=id).update({