fix(token): If the "username" is provided, then use "username" as the username.
This commit is contained in:
@@ -61,6 +61,7 @@ async def login_for_access_token(
|
|||||||
user = auth_service.register_user_with_invite(
|
user = auth_service.register_user_with_invite(
|
||||||
db=db,
|
db=db,
|
||||||
email=form_data.email,
|
email=form_data.email,
|
||||||
|
username=form_data.username,
|
||||||
password=form_data.password,
|
password=form_data.password,
|
||||||
invite_token=form_data.invite,
|
invite_token=form_data.invite,
|
||||||
workspace_id=invite_info.workspace_id
|
workspace_id=invite_info.workspace_id
|
||||||
|
|||||||
@@ -26,5 +26,6 @@ class RefreshTokenRequest(BaseModel):
|
|||||||
class TokenRequest(BaseModel):
|
class TokenRequest(BaseModel):
|
||||||
email: EmailStr
|
email: EmailStr
|
||||||
password: str
|
password: str
|
||||||
invite: Optional[str] = None
|
invite: Optional[str] = None,
|
||||||
|
username: Optional[str] = None
|
||||||
|
|
||||||
|
|||||||
@@ -129,7 +129,8 @@ def register_user_with_invite(
|
|||||||
email: str,
|
email: str,
|
||||||
password: str,
|
password: str,
|
||||||
invite_token: str,
|
invite_token: str,
|
||||||
workspace_id: str
|
workspace_id: str,
|
||||||
|
username: Optional[str] = None,
|
||||||
) -> User:
|
) -> User:
|
||||||
"""
|
"""
|
||||||
使用邀请码注册新用户并加入工作空间
|
使用邀请码注册新用户并加入工作空间
|
||||||
@@ -139,6 +140,7 @@ def register_user_with_invite(
|
|||||||
:param password: 用户密码
|
:param password: 用户密码
|
||||||
:param invite_token: 邀请令牌
|
:param invite_token: 邀请令牌
|
||||||
:param workspace_id: 工作空间ID
|
:param workspace_id: 工作空间ID
|
||||||
|
:param username: 用户名
|
||||||
:return: 创建的用户对象
|
:return: 创建的用户对象
|
||||||
"""
|
"""
|
||||||
from app.schemas.user_schema import UserCreate
|
from app.schemas.user_schema import UserCreate
|
||||||
@@ -154,7 +156,7 @@ def register_user_with_invite(
|
|||||||
user_create = UserCreate(
|
user_create = UserCreate(
|
||||||
email=email,
|
email=email,
|
||||||
password=password,
|
password=password,
|
||||||
username=email.split('@')[0]
|
username=email.split('@')[0] if not username else username
|
||||||
)
|
)
|
||||||
user = user_service.create_user(db=db, user=user_create)
|
user = user_service.create_user(db=db, user=user_create)
|
||||||
logger.info(f"用户创建成功: {user.email} (ID: {user.id})")
|
logger.info(f"用户创建成功: {user.email} (ID: {user.id})")
|
||||||
|
|||||||
Reference in New Issue
Block a user