mirror of
https://github.com/imartinez/privateGPT.git
synced 2025-06-29 08:47:19 +00:00
Added a schema for username update
This commit is contained in:
parent
226c1a6622
commit
0a326c1e43
2
.env
2
.env
@ -4,7 +4,7 @@ ENVIRONMENT=dev
|
|||||||
DB_HOST=localhost
|
DB_HOST=localhost
|
||||||
DB_USER=postgres
|
DB_USER=postgres
|
||||||
DB_PORT=5432
|
DB_PORT=5432
|
||||||
DB_PASSWORD=quick
|
DB_PASSWORD=admin
|
||||||
DB_NAME=QuickGpt
|
DB_NAME=QuickGpt
|
||||||
|
|
||||||
SUPER_ADMIN_EMAIL=superadmin@email.com
|
SUPER_ADMIN_EMAIL=superadmin@email.com
|
||||||
|
@ -81,6 +81,7 @@ class Home:
|
|||||||
if completion_gen.sources:
|
if completion_gen.sources:
|
||||||
full_response += SOURCES_SEPARATOR
|
full_response += SOURCES_SEPARATOR
|
||||||
cur_sources = Source.curate_sources(completion_gen.sources)
|
cur_sources = Source.curate_sources(completion_gen.sources)
|
||||||
|
|
||||||
sources_text = "\n".join(
|
sources_text = "\n".join(
|
||||||
f'<a href="{source.page_link}" target="_blank" rel="noopener noreferrer">{index}. {source.file} (page {source.page})</a>'
|
f'<a href="{source.page_link}" target="_blank" rel="noopener noreferrer">{index}. {source.file} (page {source.page})</a>'
|
||||||
for index, source in enumerate(cur_sources, start=1)
|
for index, source in enumerate(cur_sources, start=1)
|
||||||
|
@ -115,15 +115,7 @@ def login_access_token(
|
|||||||
|
|
||||||
|
|
||||||
@router.post("/login/refresh-token", response_model=schemas.TokenSchema)
|
@router.post("/login/refresh-token", response_model=schemas.TokenSchema)
|
||||||
def refresh_
|
def refresh_access_token(
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
access_token(
|
|
||||||
db: Session = Depends(deps.get_db),
|
db: Session = Depends(deps.get_db),
|
||||||
refresh_token: str = Body(..., embed=True),
|
refresh_token: str = Body(..., embed=True),
|
||||||
) -> Any:
|
) -> Any:
|
||||||
@ -150,57 +142,6 @@ def register(
|
|||||||
*,
|
*,
|
||||||
db: Session = Depends(deps.get_db),
|
db: Session = Depends(deps.get_db),
|
||||||
email: str = Body(...),
|
email: str = Body(...),
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
fullname: str = Body(...),
|
fullname: str = Body(...),
|
||||||
company_id: int = Body(None, title="Company ID",
|
company_id: int = Body(None, title="Company ID",
|
||||||
description="Company ID for the user (if applicable)"),
|
description="Company ID for the user (if applicable)"),
|
||||||
|
@ -84,13 +84,13 @@ def create_user(
|
|||||||
def update_username(
|
def update_username(
|
||||||
*,
|
*,
|
||||||
db: Session = Depends(deps.get_db),
|
db: Session = Depends(deps.get_db),
|
||||||
fullname: str = Body(...),
|
|
||||||
current_user: models.User = Depends(deps.get_current_user),
|
current_user: models.User = Depends(deps.get_current_user),
|
||||||
|
update_in: schemas.UsernameUpdate,
|
||||||
) -> Any:
|
) -> Any:
|
||||||
"""
|
"""
|
||||||
Update own username.
|
Update own username.
|
||||||
"""
|
"""
|
||||||
user_in = schemas.UserUpdate(fullname=fullname, email=current_user.email, company_id=current_user.company_id)
|
user_in = schemas.UserUpdate(fullname=update_in.fullname, email=current_user.email, company_id=current_user.company_id)
|
||||||
user = crud.user.update(db, db_obj=current_user, obj_in=user_in)
|
user = crud.user.update(db, db_obj=current_user, obj_in=user_in)
|
||||||
user_data = schemas.UserBaseSchema(
|
user_data = schemas.UserBaseSchema(
|
||||||
email=user.email,
|
email=user.email,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
from .role import Role, RoleCreate, RoleInDB, RoleUpdate
|
from .role import Role, RoleCreate, RoleInDB, RoleUpdate
|
||||||
from .token import TokenSchema, TokenPayload
|
from .token import TokenSchema, TokenPayload
|
||||||
from .user import User, UserCreate, UserInDB, UserUpdate, UserBaseSchema, Profile
|
from .user import User, UserCreate, UserInDB, UserUpdate, UserBaseSchema, Profile, UsernameUpdate
|
||||||
from .user_role import UserRole, UserRoleCreate, UserRoleInDB, UserRoleUpdate
|
from .user_role import UserRole, UserRoleCreate, UserRoleInDB, UserRoleUpdate
|
||||||
from .subscription import Subscription, SubscriptionBase, SubscriptionCreate, SubscriptionUpdate
|
from .subscription import Subscription, SubscriptionBase, SubscriptionCreate, SubscriptionUpdate
|
||||||
from .company import Company, CompanyBase, CompanyCreate, CompanyUpdate
|
from .company import Company, CompanyBase, CompanyCreate, CompanyUpdate
|
@ -17,6 +17,8 @@ class UserBaseSchema(BaseModel):
|
|||||||
class UserCreate(UserBaseSchema):
|
class UserCreate(UserBaseSchema):
|
||||||
password: str = Field(alias="password")
|
password: str = Field(alias="password")
|
||||||
|
|
||||||
|
class UsernameUpdate(BaseModel):
|
||||||
|
fullname: str
|
||||||
|
|
||||||
class UserUpdate(UserBaseSchema):
|
class UserUpdate(UserBaseSchema):
|
||||||
last_login: Optional[datetime] = None
|
last_login: Optional[datetime] = None
|
||||||
|
Loading…
Reference in New Issue
Block a user