Skip to content

Commit f0f6ac8

Browse files
authored
Merge pull request #23 from bugout-dev/fixed-libs
Fixed outdated libs
2 parents 8819976 + 7c759fd commit f0f6ac8

14 files changed

Lines changed: 313 additions & 129 deletions

File tree

brood/actions.py

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,9 @@ def verify_username(username: str) -> None:
380380

381381

382382
def password_confirm(
383-
user: User, password: Optional[str] = None, password_hash: Optional[str] = None,
383+
user: User,
384+
password: Optional[str] = None,
385+
password_hash: Optional[str] = None,
384386
) -> bool:
385387
"""
386388
Confirm password provided by user.
@@ -582,7 +584,9 @@ def change_password(
582584
user = get_user(session, username, email, user_id)
583585

584586
password_abide = password_confirm(
585-
user, password=current_password, password_hash=current_password_hash,
587+
user,
588+
password=current_password,
589+
password_hash=current_password_hash,
586590
)
587591
if password_abide is False:
588592
raise UserIncorrectPassword(
@@ -664,7 +668,9 @@ def send_verification_email(
664668

665669
verification_code = generate_verification_code()
666670
verification_email = VerificationEmail(
667-
verification_code=verification_code, active=True, user_id=user.id,
671+
verification_code=verification_code,
672+
active=True,
673+
user_id=user.id,
668674
)
669675
session.add(verification_email)
670676
session.commit()
@@ -1313,7 +1319,9 @@ def set_user_in_group(
13131319

13141320

13151321
def change_group_name(
1316-
session: Session, group_id: uuid.UUID, group_name: str,
1322+
session: Session,
1323+
group_id: uuid.UUID,
1324+
group_name: str,
13171325
) -> data.GroupResponse:
13181326
"""
13191327
Change group name by group id.
@@ -1417,7 +1425,9 @@ def delete_group(session: Session, group_id: uuid.UUID, current_user: User) -> G
14171425

14181426

14191427
def check_user_type_in_group(
1420-
session: Session, user_id: uuid.UUID, group_id: uuid.UUID,
1428+
session: Session,
1429+
user_id: uuid.UUID,
1430+
group_id: uuid.UUID,
14211431
) -> data.GroupUserResponse:
14221432
"""
14231433
Checks if user is an owner or member of requested group.
@@ -1650,7 +1660,9 @@ def get_applications(
16501660

16511661

16521662
def delete_application(
1653-
db_session: Session, application_id: uuid.UUID, groups_ids: List[uuid.UUID],
1663+
db_session: Session,
1664+
application_id: uuid.UUID,
1665+
groups_ids: List[uuid.UUID],
16541666
) -> Application:
16551667
application = (
16561668
db_session.query(Application)

brood/api.py

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,13 @@ async def create_user_handler(
133133
)
134134
except actions.UsernameInvalidParameters:
135135
raise HTTPException(
136-
status_code=422, detail="Username must not contain spaces",
136+
status_code=422,
137+
detail="Username must not contain spaces",
137138
)
138139
except actions.PasswordInvalidParameters as invalid_password_error:
139140
raise HTTPException(
140-
status_code=422, detail=invalid_password_error.generic_error_message,
141+
status_code=422,
142+
detail=invalid_password_error.generic_error_message,
141143
)
142144
except Exception as e:
143145
logger.error(e)
@@ -148,7 +150,9 @@ async def create_user_handler(
148150

149151
if SEND_EMAIL_WELCOME:
150152
background_tasks.add_task(
151-
actions.send_welcome_email, user=user, application_id=application_id,
153+
actions.send_welcome_email,
154+
user=user,
155+
application_id=application_id,
152156
)
153157

154158
if not REQUIRE_EMAIL_VERIFICATION:
@@ -493,7 +497,9 @@ async def restore_password_handler(
493497
reset_object = actions.generate_reset_password(db_session, email=email)
494498

495499
background_tasks.add_task(
496-
actions.send_reset_password_email, reset_object=reset_object, email=email,
500+
actions.send_reset_password_email,
501+
reset_object=reset_object,
502+
email=email,
497503
)
498504
reset_status = "ok"
499505
except actions.UserNotFound:
@@ -533,7 +539,8 @@ async def reset_password_confirmation_handler(
533539
raise HTTPException(status_code=401, detail="Incorrect password")
534540
except actions.PasswordInvalidParameters as invalid_password_error:
535541
raise HTTPException(
536-
status_code=422, detail=invalid_password_error.generic_error_message,
542+
status_code=422,
543+
detail=invalid_password_error.generic_error_message,
537544
)
538545

539546
return user
@@ -576,7 +583,8 @@ async def change_password_handler(
576583
raise HTTPException(status_code=401, detail="Incorrect password")
577584
except actions.PasswordInvalidParameters as invalid_password_error:
578585
raise HTTPException(
579-
status_code=422, detail=invalid_password_error.generic_error_message,
586+
status_code=422,
587+
detail=invalid_password_error.generic_error_message,
580588
)
581589

582590
return user
@@ -643,7 +651,9 @@ async def delete_user_handler(
643651
raise HTTPException(status_code=403, detail="Autogenerated user bypass failed")
644652
try:
645653
user = actions.delete_user(
646-
session=db_session, user_id=user_id, current_password=password,
654+
session=db_session,
655+
user_id=user_id,
656+
current_password=password,
647657
)
648658
except actions.UserInvalidParameters:
649659
raise HTTPException(status_code=400, detail="Invalid user parameters")
@@ -1407,7 +1417,8 @@ async def invite_accept_handler(
14071417
raise HTTPException(status_code=404, detail="No user with that email")
14081418
except actions.NoPermissions:
14091419
raise HTTPException(
1410-
status_code=403, detail="You nave no permission to change roles in group",
1420+
status_code=403,
1421+
detail="You nave no permission to change roles in group",
14111422
)
14121423

14131424
return group_user_response
@@ -1503,7 +1514,9 @@ async def get_subscriptions_handler(
15031514
@app.post("/subscriptions/stripe/webhook", include_in_schema=False)
15041515
@app.post("/subscription/stripe/webhook", include_in_schema=False)
15051516
async def stripe_webhook_handler(
1506-
request: Request, response: Response, db_session=Depends(yield_db_session_from_env),
1517+
request: Request,
1518+
response: Response,
1519+
db_session=Depends(yield_db_session_from_env),
15071520
) -> None:
15081521
"""
15091522
Notify when an event happens in Stripe account.
@@ -1667,7 +1680,8 @@ async def add_subscription_handler(
16671680
)
16681681
except subscriptions.GroupSubscriptionAlreadyExists:
16691682
raise HTTPException(
1670-
status_code=409, detail="Group subscription already attached to group",
1683+
status_code=409,
1684+
detail="Group subscription already attached to group",
16711685
)
16721686
except Exception as e:
16731687
logger.error(repr(e))
@@ -1734,7 +1748,9 @@ async def delete_subscription_handler(
17341748
)
17351749
plans_obj_response.append(
17361750
data.SubscriptionPlanResponse(
1737-
id=plan.id, name=plan.name, description=plan.description,
1751+
id=plan.id,
1752+
name=plan.name,
1753+
description=plan.description,
17381754
)
17391755
)
17401756

@@ -1827,7 +1843,8 @@ async def get_application_handler(
18271843
raise HTTPException(status_code=404, detail="No application with that id")
18281844
except actions.GroupNotFound:
18291845
raise HTTPException(
1830-
status_code=404, detail="You do not have permission to view this resource",
1846+
status_code=404,
1847+
detail="You do not have permission to view this resource",
18311848
)
18321849
except Exception as e:
18331850
raise HTTPException(status_code=500)

0 commit comments

Comments
 (0)