Skip to content

Commit 8cedd64

Browse files
CaptainArilCaptainAril
committed
fixed lint format
1 parent a9cd400 commit 8cedd64

File tree

9 files changed

+62
-40
lines changed

9 files changed

+62
-40
lines changed

‎src/api/constants/messages.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class CommonMessages(TypedDict):
5757
JWT_GENERATED: str
5858
VALIDATION_ERROR: str
5959

60+
6061
class PasswordResetMessages(TypedDict):
6162
EMAIL_SENT: str
6263
INVALID_TOKEN: str
@@ -88,7 +89,6 @@ class DynamicAccountMessages(TypedDict):
8889
EXISTS: Callable[[str], str]
8990

9091

91-
9292
class DynamicPasswordResetMessages(TypedDict):
9393
EMAIL_SENT: Callable[[str], str]
9494

@@ -154,7 +154,7 @@ class DynamicMessages(TypedDict):
154154
"INVALID_TOKEN": "Invalid password reset token!",
155155
"DOESNT_EXIST": "You don't have an account with us yet!",
156156
"TOKEN_EXPIRED": "Password reset token has expired!",
157-
}
157+
},
158158
}
159159

160160
DYNAMIC_MESSAGES: DynamicMessages = {
@@ -169,7 +169,7 @@ class DynamicMessages(TypedDict):
169169
},
170170
"PASSWORD_RESET": {
171171
"EMAIL_SENT": lambda x: f"Password reset email has been sent to {x}",
172-
}
172+
},
173173
}
174174

175175
__all__ = ["DYNAMIC_MESSAGES", "MESSAGES"]

‎src/api/controllers/PasswordResetController.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ async def request_password_reset(self, user_data: PasswordResetRequest) -> tuple
2929
user_data
3030
)
3131
return success_response(
32-
message=sent_request["message"],
33-
status_code=HTTPStatus.OK)
32+
message=sent_request["message"], status_code=HTTPStatus.OK
33+
)
3434
except Exception as exc:
3535
if isinstance(exc, HttpError):
3636
raise
@@ -43,13 +43,16 @@ async def request_password_reset(self, user_data: PasswordResetRequest) -> tuple
4343
)
4444
raise HttpError(HTTPStatus.INTERNAL_SERVER_ERROR, "Something went wrong")
4545

46-
47-
async def confirm_password_reset(self, user_data: ConfirmPasswordResetRequest) -> tuple:
46+
async def confirm_password_reset(
47+
self, user_data: ConfirmPasswordResetRequest
48+
) -> tuple:
4849
try:
4950
sent_request = await self.password_reset_service.confirm_password_reset(
5051
user_data
5152
)
52-
return success_response(message=sent_request["message"], status_code=HTTPStatus.OK)
53+
return success_response(
54+
message=sent_request["message"], status_code=HTTPStatus.OK
55+
)
5356
except Exception as exc:
5457
if isinstance(exc, HttpError):
5558
raise

‎src/api/controllers/UserController.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ async def set_account_pin(self, id: str, user_pin: Pin) -> tuple:
5656
message=updated_pin["message"], status_code=HTTPStatus.OK
5757
)
5858

59-
async def change_password(self, id: str, user_data: ChangeUserPasswordRequest) -> tuple:
59+
async def change_password(
60+
self, id: str, user_data: ChangeUserPasswordRequest
61+
) -> tuple:
6062
updated_password = await self.user_service.change_password(id, user_data)
6163
if not updated_password["is_success"]:
6264
return error_response(
@@ -65,4 +67,4 @@ async def change_password(self, id: str, user_data: ChangeUserPasswordRequest) -
6567
return success_response(
6668
message=updated_password["message"],
6769
status_code=HTTPStatus.OK,
68-
)
70+
)

‎src/api/models/payload/requests/PasswordResetRequest.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
class PasswordResetRequest(BaseModel):
77
email: EmailStr
88

9+
910
class ConfirmPasswordResetRequest(BaseModel):
1011
reset_token: str
11-
new_password: IsStrongPassword
12+
new_password: IsStrongPassword

‎src/api/repositories/UserRepository.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ async def update_by_id(cls, id: str, updates: dict | None = None) -> User | None
4242

4343
@classmethod
4444
async def find_by_reset_token(cls, reset_token: str) -> User | None:
45-
return await cls.manager.filter(password_reset_token=reset_token).afirst()
45+
return await cls.manager.filter(password_reset_token=reset_token).afirst()

‎src/api/routes/PasswordReset.py‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,32 @@
1818
router = Router()
1919

2020

21-
@router.post("/", response={
22-
HTTPStatus.OK: SuccessResponse,
23-
HTTPStatus.BAD_REQUEST: ErrorResponse,
24-
HTTPStatus.INTERNAL_SERVER_ERROR: ServerErrorResponse,
25-
26-
})
21+
@router.post(
22+
"/",
23+
response={
24+
HTTPStatus.OK: SuccessResponse,
25+
HTTPStatus.BAD_REQUEST: ErrorResponse,
26+
HTTPStatus.INTERNAL_SERVER_ERROR: ServerErrorResponse,
27+
},
28+
)
2729
async def reset_password(
2830
request: HttpRequest, credentials: PasswordResetRequest
2931
) -> tuple:
3032
reset_controller = await ADepends(PasswordResetController)
3133
return await reset_controller.request_password_reset(credentials)
3234

3335

34-
3536
# TODO: Implement router for password reset confirm and change password
3637

37-
@router.post("/confirm", response={
38-
HTTPStatus.OK: SuccessResponse,
39-
HTTPStatus.BAD_REQUEST: ErrorResponse,
40-
HTTPStatus.INTERNAL_SERVER_ERROR: ServerErrorResponse,
41-
})
38+
39+
@router.post(
40+
"/confirm",
41+
response={
42+
HTTPStatus.OK: SuccessResponse,
43+
HTTPStatus.BAD_REQUEST: ErrorResponse,
44+
HTTPStatus.INTERNAL_SERVER_ERROR: ServerErrorResponse,
45+
},
46+
)
4247
async def confirm_password_reset(
4348
request: HttpRequest, credentials: ConfirmPasswordResetRequest
4449
) -> tuple:

‎src/api/routes/User.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ async def update_user(request: HttpRequest, user_data: UpdateUserRequest) -> tup
7070
HTTPStatus.INTERNAL_SERVER_ERROR: ServerErrorResponse,
7171
},
7272
)
73-
async def update_password(request: HttpRequest, user_data: ChangeUserPasswordRequest) -> tuple:
73+
async def update_password(
74+
request: HttpRequest, user_data: ChangeUserPasswordRequest
75+
) -> tuple:
7476
user_id = getattr(request, "auth_id", "")
7577
user_controller = await ADepends(UserController)
76-
return await user_controller.change_password(user_id, user_data)
78+
return await user_controller.change_password(user_id, user_data)

‎src/api/services/PasswordResetService.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ async def request_password_reset(self, req: PasswordResetRequest) -> UserSuccess
3232
if not existing_user:
3333
self.logger.warn(
3434
{
35-
"activity_type": ACTIVITY_TYPES['REQUEST_RESET_PASSWORD'],
36-
"message": MESSAGES['USER']["DOESNT_EXIST"],
35+
"activity_type": ACTIVITY_TYPES["REQUEST_RESET_PASSWORD"],
36+
"message": MESSAGES["USER"]["DOESNT_EXIST"],
3737
"metadata": {"user": {"email": req.email}},
3838
}
3939
)
@@ -74,18 +74,22 @@ async def request_password_reset(self, req: PasswordResetRequest) -> UserSuccess
7474

7575
self.logger.info(
7676
{
77-
"activity_type": ACTIVITY_TYPES['REQUEST_RESET_PASSWORD'],
77+
"activity_type": ACTIVITY_TYPES["REQUEST_RESET_PASSWORD"],
7878
"message": "Password reset token set",
79-
"metadata": {"user": {"email": req.email}, "reset_token": existing_user.password_reset_token},
79+
"metadata": {
80+
"user": {"email": req.email},
81+
"reset_token": existing_user.password_reset_token,
82+
},
8083
}
8184
)
8285
return {
8386
"is_success": True,
8487
"message": DYNAMIC_MESSAGES["PASSWORD_RESET"]["EMAIL_SENT"](req.email),
8588
}
8689

87-
88-
async def confirm_password_reset(self, req: ConfirmPasswordResetRequest) -> UserSuccess:
90+
async def confirm_password_reset(
91+
self, req: ConfirmPasswordResetRequest
92+
) -> UserSuccess:
8993
existing_user = await UserRepository.find_by_reset_token(req.reset_token)
9094
if not existing_user:
9195
self.logger.warn(
@@ -137,7 +141,9 @@ async def confirm_password_reset(self, req: ConfirmPasswordResetRequest) -> User
137141
"message": MESSAGES["PASSWORD_RESET"]["TOKEN_EXPIRED"],
138142
}
139143
new_password_hash = await self.utility_service.hash_string(req.new_password)
140-
await UserRepository.update_by_user(existing_user, {"password": new_password_hash})
144+
await UserRepository.update_by_user(
145+
existing_user, {"password": new_password_hash}
146+
)
141147
message = MESSAGES["PASSWORD_RESET"]["PASSWORD_RESET"]
142148
self.logger.info(
143149
{
@@ -148,4 +154,3 @@ async def confirm_password_reset(self, req: ConfirmPasswordResetRequest) -> User
148154
)
149155

150156
return {"is_success": True, "message": message}
151-

‎src/api/services/UserService.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,13 @@ async def update(self, id: str, req: UpdateUserRequest) -> UserSuccess:
116116

117117
return {"is_success": True, "user": user}
118118

119-
async def change_password(self, id: str, req: ChangeUserPasswordRequest) -> UserSuccess:
119+
async def change_password(
120+
self, id: str, req: ChangeUserPasswordRequest
121+
) -> UserSuccess:
120122
existing_user = await UserRepository.find_by_id(id)
121123
old_password = req.old_password
122124
new_password = req.new_password
123-
125+
124126
if not existing_user:
125127
self.logger.warn(
126128
{
@@ -135,7 +137,7 @@ async def change_password(self, id: str, req: ChangeUserPasswordRequest) -> User
135137
old_password, existing_user.password
136138
)
137139
if not is_valid_old_password:
138-
message = MESSAGES['USER']['INCORRECT_PASSWORD']
140+
message = MESSAGES["USER"]["INCORRECT_PASSWORD"]
139141
self.logger.warn(
140142
{
141143
"activity_type": ACTIVITY_TYPES["CHANGE_PASSWORD"],
@@ -144,9 +146,11 @@ async def change_password(self, id: str, req: ChangeUserPasswordRequest) -> User
144146
}
145147
)
146148
return {"is_success": False, "message": message}
147-
149+
148150
new_password_hash = await self.utility_service.hash_string(new_password)
149-
await UserRepository.update_by_user(existing_user, {"password": new_password_hash})
151+
await UserRepository.update_by_user(
152+
existing_user, {"password": new_password_hash}
153+
)
150154
message = MESSAGES["USER"]["PASSWORD_CHANGED"]
151155
self.logger.info(
152156
{
@@ -156,4 +160,4 @@ async def change_password(self, id: str, req: ChangeUserPasswordRequest) -> User
156160
}
157161
)
158162

159-
return {"is_success": True, "message": message}
163+
return {"is_success": True, "message": message}

0 commit comments

Comments
 (0)