fix: change name to more general ones
This commit is contained in:
parent
497e6080a3
commit
2036c4b9ae
@ -96,8 +96,8 @@ class SignInHub:
|
|||||||
)
|
)
|
||||||
|
|
||||||
@log_entry_exit_async
|
@log_entry_exit_async
|
||||||
async def update_magicleaps_user_password(self, user_id: str, password: str) -> dict[str, any]:
|
async def update_user_password_no_depot(self, user_id: str, password: str) -> dict[str, any]:
|
||||||
return await self.signin_manager.update_magicleaps_user_password(
|
return await self.signin_manager.update_user_password_no_depot(
|
||||||
user_id=user_id, password=password
|
user_id=user_id, password=password
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -368,7 +368,7 @@ class SignInManager:
|
|||||||
)
|
)
|
||||||
return {"succeeded": True}
|
return {"succeeded": True}
|
||||||
|
|
||||||
async def update_magicleaps_user_password(self, user_id: str, password: str) -> dict[str, any]:
|
async def update_user_password_no_depot(self, user_id: str, password: str) -> dict[str, any]:
|
||||||
error_message = """
|
error_message = """
|
||||||
Password does not pass complexity requirements:
|
Password does not pass complexity requirements:
|
||||||
- At least one lowercase character
|
- At least one lowercase character
|
||||||
@ -380,7 +380,7 @@ class SignInManager:
|
|||||||
raise InvalidDataError(error_message)
|
raise InvalidDataError(error_message)
|
||||||
|
|
||||||
user_flid = await self.user_auth_service.get_user_flid(user_id)
|
user_flid = await self.user_auth_service.get_user_flid(user_id)
|
||||||
await self.user_auth_service.save_magicleaps_password_auth_method(
|
await self.user_auth_service.save_password_auth_method_no_depot(
|
||||||
user_id, user_flid, password
|
user_id, user_flid, password
|
||||||
)
|
)
|
||||||
return {"succeeded": True}
|
return {"succeeded": True}
|
||||||
|
|||||||
@ -235,8 +235,8 @@ class UserAuthHandler:
|
|||||||
if not result:
|
if not result:
|
||||||
raise Exception("Failed to update user password in code depot")
|
raise Exception("Failed to update user password in code depot")
|
||||||
|
|
||||||
async def save_magicleaps_password_auth_method(self, user_id: str, user_flid, password: str):
|
async def save_password_auth_method_no_depot(self, user_id: str, user_flid, password: str):
|
||||||
"""save password auth method to user_password doc for MagicLeaps users (skips depot service)
|
"""save password auth method to user_password doc without updating depot service
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
user_id (str): user id
|
user_id (str): user id
|
||||||
@ -257,8 +257,7 @@ class UserAuthHandler:
|
|||||||
user_password.password = password_hashed
|
user_password.password = password_hashed
|
||||||
await user_password.save()
|
await user_password.save()
|
||||||
|
|
||||||
# Skip depot service call for MagicLeaps users
|
# Skip depot service call - users don't exist in Gitea, so we don't update depot password
|
||||||
# MagicLeaps users don't exist in Gitea, so we don't update depot password
|
|
||||||
|
|
||||||
async def reset_password(self, user_id: str):
|
async def reset_password(self, user_id: str):
|
||||||
"""clean password auth method from user_password doc
|
"""clean password auth method from user_password doc
|
||||||
|
|||||||
@ -52,9 +52,9 @@ class UserAuthService:
|
|||||||
user_id, user_flid, password
|
user_id, user_flid, password
|
||||||
)
|
)
|
||||||
|
|
||||||
async def save_magicleaps_password_auth_method(
|
async def save_password_auth_method_no_depot(
|
||||||
self, user_id: str, user_flid: str, password: str
|
self, user_id: str, user_flid: str, password: str
|
||||||
):
|
):
|
||||||
return await self.user_auth_handler.save_magicleaps_password_auth_method(
|
return await self.user_auth_handler.save_password_auth_method_no_depot(
|
||||||
user_id, user_flid, password
|
user_id, user_flid, password
|
||||||
)
|
)
|
||||||
|
|||||||
@ -5,7 +5,7 @@ from .signin_with_email_and_password import router as se_router
|
|||||||
from .signin_with_email_and_code import router as sw_router
|
from .signin_with_email_and_code import router as sw_router
|
||||||
from .signin_with_magicleaps_email_and_code import router as swm_router
|
from .signin_with_magicleaps_email_and_code import router as swm_router
|
||||||
from .update_user_password import router as up_router
|
from .update_user_password import router as up_router
|
||||||
from .update_magicleaps_user_password import router as ump_router
|
from .update_user_password_no_depot import router as upnd_router
|
||||||
from .update_new_user_flid import router as uu_router
|
from .update_new_user_flid import router as uu_router
|
||||||
from .reset_password_through_email import router as rp_router
|
from .reset_password_through_email import router as rp_router
|
||||||
from .sign_out import router as so_router
|
from .sign_out import router as so_router
|
||||||
@ -18,7 +18,7 @@ router.include_router(tms_router, prefix="/signin", tags=["signin"])
|
|||||||
router.include_router(sw_router, prefix="/signin", tags=["signin"])
|
router.include_router(sw_router, prefix="/signin", tags=["signin"])
|
||||||
router.include_router(swm_router, prefix="/signin", tags=["signin"])
|
router.include_router(swm_router, prefix="/signin", tags=["signin"])
|
||||||
router.include_router(up_router, prefix="/signin", tags=["signin"])
|
router.include_router(up_router, prefix="/signin", tags=["signin"])
|
||||||
router.include_router(ump_router, prefix="/signin", tags=["signin"])
|
router.include_router(upnd_router, prefix="/signin", tags=["signin"])
|
||||||
router.include_router(se_router, prefix="/signin", tags=["signin"])
|
router.include_router(se_router, prefix="/signin", tags=["signin"])
|
||||||
router.include_router(so_router, prefix="/signin", tags=["signin"])
|
router.include_router(so_router, prefix="/signin", tags=["signin"])
|
||||||
router.include_router(rp_router, prefix="/signin", tags=["signin"])
|
router.include_router(rp_router, prefix="/signin", tags=["signin"])
|
||||||
|
|||||||
@ -12,7 +12,7 @@ from common.config.app_settings import app_settings
|
|||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
token_manager = TokenManager()
|
token_manager = TokenManager()
|
||||||
# Web API
|
# Web API
|
||||||
# update_magicleaps_user_password
|
# update_user_password_no_depot
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
@ -22,14 +22,14 @@ class RequestIn(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
@router.post(
|
@router.post(
|
||||||
"/update-magicleaps-user-password",
|
"/update-user-password-no-depot",
|
||||||
operation_id="magicleaps_update_user_password",
|
operation_id="user_update_user_password_no_depot",
|
||||||
summary="update MagicLeaps user's sign-in password",
|
summary="update user's sign-in password without depot service",
|
||||||
description="Update the MagicLeaps user's sign-in password without updating code depot. If the password was not set yet, this will enable the user to log in using the password",
|
description="Update the user's sign-in password without updating code depot. If the password was not set yet, this will enable the user to log in using the password",
|
||||||
response_description="signin_type:0 meaning simplified(using email) signin, \
|
response_description="signin_type:0 meaning simplified(using email) signin, \
|
||||||
1 meaning standard(using FLID and passward) signin",
|
1 meaning standard(using FLID and passward) signin",
|
||||||
)
|
)
|
||||||
async def update_magicleaps_user_password(
|
async def update_user_password_no_depot(
|
||||||
item: RequestIn,
|
item: RequestIn,
|
||||||
credentials: HTTPAuthorizationCredentials = Security(HTTPBearer()),
|
credentials: HTTPAuthorizationCredentials = Security(HTTPBearer()),
|
||||||
):
|
):
|
||||||
@ -51,5 +51,5 @@ async def update_magicleaps_user_password(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
result = await SignInHub().update_magicleaps_user_password(user_id, item.password)
|
result = await SignInHub().update_user_password_no_depot(user_id, item.password)
|
||||||
return JSONResponse(content=jsonable_encoder(result))
|
return JSONResponse(content=jsonable_encoder(result))
|
||||||
Loading…
Reference in New Issue
Block a user