liyunjia/chuanyue-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

格式化源代码，移除无用的引用

Browse Source
This commit is contained in:
李运家 2024-05-01 17:28:31 +08:00
parent da939160f8
commit 8523e5cbb0
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/controller/feedback.rs
View File

@ -23,7 +23,7 @@ pub async fn add_feedback(
/// 获取反馈信息列表 /// 获取反馈信息列表
pub async fn get_feedback_list_by_page( pub async fn get_feedback_list_by_page(
Query(pageParams): Query<PageParams> Query(page_params): Query<PageParams>
) -> ResResult<ResOK<Pageable<feedback::Model>>> { ) -> ResResult<ResOK<Pageable<feedback::Model>>> {
service::feedback::get_feedback_list_by_page(pageParams.page, pageParams.page_size).await service::feedback::get_feedback_list_by_page(page_params.page, page_params.page_size).await
} }

7
auth/src/firebase_admin.rs
View File

@ -1,14 +1,11 @@
use std::sync::OnceLock; use std::sync::OnceLock;
use error_stack::Report;
use futures_executor::block_on; use futures_executor::block_on;
use rs_firebase_admin_sdk::{ use rs_firebase_admin_sdk::{
auth::{FirebaseAuthService, UserIdentifiers}, auth::{FirebaseAuthService, UserIdentifiers},
client::ApiHttpClient,
App, AuthenticationManager, App, AuthenticationManager,
}; };
use rs_firebase_admin_sdk::auth::token::{LiveTokenVerifier, TokenVerifier}; use rs_firebase_admin_sdk::auth::token::{LiveTokenVerifier, TokenVerifier};
use rs_firebase_admin_sdk::auth::token::cache::{HttpCache, PubKeys}; use rs_firebase_admin_sdk::auth::token::cache::{HttpCache, PubKeys};
use rs_firebase_admin_sdk::auth::token::error::TokenVerificationError;
use rs_firebase_admin_sdk::auth::token::jwt::JWToken; use rs_firebase_admin_sdk::auth::token::jwt::JWToken;
static LIVE_APP: OnceLock<App<AuthenticationManager>> = OnceLock::new(); static LIVE_APP: OnceLock<App<AuthenticationManager>> = OnceLock::new();
@ -30,8 +27,8 @@ fn get_id_token_verifier() -> &'static LiveTokenVerifier<HttpCache<reqwest::Clie
pub async fn verify_user_id_token(id_token: &str) -> Result<JWToken, String> { pub async fn verify_user_id_token(id_token: &str) -> Result<JWToken, String> {
match get_id_token_verifier().verify_token(id_token).await { match get_id_token_verifier().verify_token(id_token).await {
Ok(jwtToken) => { Ok(jwt_token) => {
Ok(jwtToken) Ok(jwt_token)
} }
Err(error) => { Err(error) => {
tracing::error!("校验id token失败: {:?}", error); tracing::error!("校验id token失败: {:?}", error);

1
domain/src/dto/feedback.rs
View File

@ -1,4 +1,3 @@
use sea_orm::prelude::DateTime;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use validator::Validate; use validator::Validate;

2
domain/src/dto/player_info.rs
View File

@ -14,5 +14,5 @@ pub struct PlayerInfoRegister {
#[validate(required(message = "用户所属区域不能为空"), length(min = 1, message = "用户所属区域不能为空"))] #[validate(required(message = "用户所属区域不能为空"), length(min = 1, message = "用户所属区域不能为空"))]
pub country_code: Option<String>, pub country_code: Option<String>,
#[validate(required(message = "用户ID Token不能为空"), length(min = 1, message = "用户ID Token不能为空"))] #[validate(required(message = "用户ID Token不能为空"), length(min = 1, message = "用户ID Token不能为空"))]
pub idToken: Option<String> pub id_token: Option<String>,
} }

2
service/src/player_info.rs
View File

@ -24,7 +24,7 @@ pub async fn register(req: PlayerInfoRegister) -> ResResult<ResOK<()>> {
} }
} }
let verified_token = match firebase_admin::verify_user_id_token(req.idToken.unwrap().as_str()).await { let verified_token = match firebase_admin::verify_user_id_token(req.id_token.unwrap().as_str()).await {
Ok(token) => token, Ok(token) => token,
Err(err) => { Err(err) => {
tracing::error!(error = ?err, "校验用户id token失败"); tracing::error!(error = ?err, "校验用户id token失败");