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

Labrinth ID cleanup (#3681)

Browse Source 
* Put all ID types in the labrinth::models::ids, and reduce code duplication with them

* Rewrite labrinth::database::models::ids and rename most DB interface ID structs to be prefixed with DB

* Run sqlx prepare

---------

Co-authored-by: Alejandro González <7822554+AlexTMjugador@users.noreply.github.com>
This commit is contained in:
Josiah Glosson
2025-05-22 03:34:36 -05:00
committed by GitHub
parent c6022ad977
commit 9e527ff141
111 changed files with 1477 additions and 1965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/labrinth/src/auth/oauth/mod.rs
View File

@@ -6,7 +6,7 @@ use crate::database::models::oauth_client_authorization_item::OAuthClientAuthori
use crate::database::models::oauth_client_item::OAuthClient as DBOAuthClient;
use crate::database::models::oauth_token_item::OAuthAccessToken;
use crate::database::models::{
OAuthClientAuthorizationId, generate_oauth_access_token_id,
DBOAuthClientAuthorizationId, generate_oauth_access_token_id,
generate_oauth_client_authorization_id,
};
use crate::database::redis::RedisPool;
@@ -417,9 +417,9 @@ fn generate_access_token() -> String {
}
async fn init_oauth_code_flow(
user_id: crate::database::models::UserId,
user_id: crate::database::models::DBUserId,
client_id: OAuthClientId,
authorization_id: OAuthClientAuthorizationId,
authorization_id: DBOAuthClientAuthorizationId,
scopes: Scopes,
redirect_uris: OAuthRedirectUris,
state: Option<String>,