eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Make get_user_from_headers and check_is_moderator_from_headers take in a bitflag of Scopes rather than a slice of Scopes (#3765)

Browse Source
This commit is contained in:
Josiah Glosson
2025-06-09 14:29:32 -05:00
committed by GitHub
parent 06f1df1995
commit 3afb682fc6
28 changed files with 161 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/labrinth/src/routes/internal/billing.rs
View File

@@ -102,7 +102,7 @@ pub async fn subscriptions(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_ACCESS]),
Scopes::SESSION_ACCESS,
)
.await?
.1;
@@ -161,7 +161,7 @@ pub async fn refund_charge(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_ACCESS]),
Scopes::SESSION_ACCESS,
)
.await?
.1;
@@ -325,7 +325,7 @@ pub async fn edit_subscription(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_ACCESS]),
Scopes::SESSION_ACCESS,
)
.await?
.1;
@@ -585,7 +585,7 @@ pub async fn user_customer(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_ACCESS]),
Scopes::SESSION_ACCESS,
)
.await?
.1;
@@ -623,7 +623,7 @@ pub async fn charges(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_ACCESS]),
Scopes::SESSION_ACCESS,
)
.await?
.1;
@@ -682,7 +682,7 @@ pub async fn add_payment_method_flow(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_ACCESS]),
Scopes::SESSION_ACCESS,
)
.await?
.1;
@@ -736,7 +736,7 @@ pub async fn edit_payment_method(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_ACCESS]),
Scopes::SESSION_ACCESS,
)
.await?
.1;
@@ -805,7 +805,7 @@ pub async fn remove_payment_method(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_ACCESS]),
Scopes::SESSION_ACCESS,
)
.await?
.1;
@@ -892,7 +892,7 @@ pub async fn payment_methods(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_ACCESS]),
Scopes::SESSION_ACCESS,
)
.await?
.1;
@@ -1089,7 +1089,7 @@ pub async fn initiate_payment(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_ACCESS]),
Scopes::SESSION_ACCESS,
)
.await?
.1;

12
apps/labrinth/src/routes/internal/flows.rs
View File

@@ -1243,7 +1243,7 @@ pub async fn delete_auth_provider(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::USER_AUTH_WRITE]),
Scopes::USER_AUTH_WRITE,
)
.await?
.1;
@@ -1663,7 +1663,7 @@ pub async fn begin_2fa_flow(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::USER_AUTH_WRITE]),
Scopes::USER_AUTH_WRITE,
)
.await?
.1;
@@ -1708,7 +1708,7 @@ pub async fn finish_2fa_flow(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::USER_AUTH_WRITE]),
Scopes::USER_AUTH_WRITE,
)
.await?
.1;
@@ -2140,7 +2140,7 @@ pub async fn set_email(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::USER_AUTH_WRITE]),
Scopes::USER_AUTH_WRITE,
)
.await?
.1;
@@ -2223,7 +2223,7 @@ pub async fn resend_verify_email(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::USER_AUTH_WRITE]),
Scopes::USER_AUTH_WRITE,
)
.await?
.1;
@@ -2328,7 +2328,7 @@ pub async fn subscribe_newsletter(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::USER_AUTH_WRITE]),
Scopes::USER_AUTH_WRITE,
)
.await?
.1;

2
apps/labrinth/src/routes/internal/gdpr.rs
View File

@@ -22,7 +22,7 @@ pub async fn export(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_ACCESS]),
Scopes::SESSION_ACCESS,
)
.await?
.1;

6
apps/labrinth/src/routes/internal/moderation.rs
View File

@@ -39,7 +39,7 @@ pub async fn get_projects(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::PROJECT_READ]),
Scopes::PROJECT_READ,
)
.await?;
@@ -82,7 +82,7 @@ pub async fn get_project_meta(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::PROJECT_READ]),
Scopes::PROJECT_READ,
)
.await?;
@@ -234,7 +234,7 @@ pub async fn set_project_meta(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::PROJECT_READ]),
Scopes::PROJECT_READ,
)
.await?;

8
apps/labrinth/src/routes/internal/pats.rs
View File

@@ -39,7 +39,7 @@ pub async fn get_pats(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::PAT_READ]),
Scopes::PAT_READ,
)
.await?
.1;
@@ -99,7 +99,7 @@ pub async fn create_pat(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::PAT_CREATE]),
Scopes::PAT_CREATE,
)
.await?
.1;
@@ -174,7 +174,7 @@ pub async fn edit_pat(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::PAT_WRITE]),
Scopes::PAT_WRITE,
)
.await?
.1;
@@ -266,7 +266,7 @@ pub async fn delete_pat(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::PAT_DELETE]),
Scopes::PAT_DELETE,
)
.await?
.1;

17
apps/labrinth/src/routes/internal/session.rs
View File

@@ -141,7 +141,7 @@ pub async fn list(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_READ]),
Scopes::SESSION_READ,
)
.await?
.1;
@@ -178,7 +178,7 @@ pub async fn delete(
&**pool,
&redis,
&session_queue,
Some(&[Scopes::SESSION_DELETE]),
Scopes::SESSION_DELETE,
)
.await?
.1;
@@ -212,10 +212,15 @@ pub async fn refresh(
redis: Data<RedisPool>,
session_queue: Data<AuthQueue>,
) -> Result<HttpResponse, ApiError> {
let current_user =
get_user_from_headers(&req, &**pool, &redis, &session_queue, None)
.await?
.1;
let current_user = get_user_from_headers(
&req,
&**pool,
&redis,
&session_queue,
Scopes::empty(),
)
.await?
.1;
let session = req
.headers()
.get(AUTHORIZATION)