sr2/cloud-api
6
0
Fork 1
Code Issues 9 Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

feat: org status check moved

Browse source 
Accessing endpoints as super admin no longer requires the org to be approved.
This commit is contained in:
Chris Milne 2026-06-12 14:50:32 +01:00
parent a655eaf543
commit 092e12a892
4 changed files with 94 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/auth/dependencies.py
View file

@ -9,8 +9,9 @@ Exports:
"""
from typing import Annotated
from fastapi import Depends
from fastapi import Depends, Request
from src.auth.service import org_status_check
from src.exceptions import ForbiddenException
from src.user.dependencies import user_model_claims_dependency
from src.user.models import User
@ -37,16 +38,19 @@ async def org_query_root_claims(
user_model: user_model_claims_dependency,
org_model: org_model_query_dependency,
su_emails: su_list_dependency,
request: Request,
):
if org_model.root_user_id == user_model.id:
return org_model
try:
if await user_model_super_admin(user_model, su_emails):
return org_model
except ForbiddenException:
pass
await org_status_check(org_model, request)
if org_model.root_user_id == user_model.id:
return org_model
raise ForbiddenException(message="Must be the org's root user")
@ -59,16 +63,19 @@ async def org_body_root_claims(
user_model: user_model_claims_dependency,
org_model: org_model_body_dependency,
su_emails: su_list_dependency,
request: Request,
):
if org_model.root_user_id == user_model.id:
return org_model
try:
if await user_model_super_admin(user_model, su_emails):
return org_model
except ForbiddenException:
pass
await org_status_check(org_model, request)
if org_model.root_user_id == user_model.id:
return org_model
raise ForbiddenException(message="Must be the org's root user")