rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-10-29 00:49:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(services): make AppState impl generic using AppStateInfo (#805)

Browse Source
This commit is contained in:
Abhishek
2023-03-28 00:20:17 +05:30
committed by GitHub
parent 01a5e0a0c9
commit 642c3f3a45
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/router/src/services/authentication.rs
View File

@ -12,7 +12,7 @@ use crate::{
errors::{self, RouterResult}, errors::{self, RouterResult},
}, },
db::StorageInterface, db::StorageInterface,
routes::{app::AppStateInfo, AppState}, routes::app::AppStateInfo,
services::api, services::api,
types::storage, types::storage,
utils::OptionExt, utils::OptionExt,
@ -124,14 +124,17 @@ where
pub struct MerchantIdAuth(pub String); pub struct MerchantIdAuth(pub String);
#[async_trait] #[async_trait]
impl AuthenticateAndFetch<storage::MerchantAccount, AppState> for MerchantIdAuth { impl<A> AuthenticateAndFetch<storage::MerchantAccount, A> for MerchantIdAuth
where
A: AppStateInfo + Sync,
{
async fn authenticate_and_fetch( async fn authenticate_and_fetch(
&self, &self,
_request_headers: &HeaderMap, _request_headers: &HeaderMap,
state: &AppState, state: &A,
) -> RouterResult<storage::MerchantAccount> { ) -> RouterResult<storage::MerchantAccount> {
state state
.store .store()
.find_merchant_account_by_merchant_id(self.0.as_ref()) .find_merchant_account_by_merchant_id(self.0.as_ref())
.await .await
.map_err(|e| { .map_err(|e| {
@ -148,16 +151,19 @@ impl AuthenticateAndFetch<storage::MerchantAccount, AppState> for MerchantIdAuth
pub struct PublishableKeyAuth; pub struct PublishableKeyAuth;
#[async_trait] #[async_trait]
impl AuthenticateAndFetch<storage::MerchantAccount, AppState> for PublishableKeyAuth { impl<A> AuthenticateAndFetch<storage::MerchantAccount, A> for PublishableKeyAuth
where
A: AppStateInfo + Sync,
{
async fn authenticate_and_fetch( async fn authenticate_and_fetch(
&self, &self,
request_headers: &HeaderMap, request_headers: &HeaderMap,
state: &AppState, state: &A,
) -> RouterResult<storage::MerchantAccount> { ) -> RouterResult<storage::MerchantAccount> {
let publishable_key = let publishable_key =
get_api_key(request_headers).change_context(errors::ApiErrorResponse::Unauthorized)?; get_api_key(request_headers).change_context(errors::ApiErrorResponse::Unauthorized)?;
state state
.store .store()
.find_merchant_account_by_publishable_key(publishable_key) .find_merchant_account_by_publishable_key(publishable_key)
.await .await
.map_err(|e| { .map_err(|e| {
@ -250,10 +256,10 @@ where
Box::new(default_auth) Box::new(default_auth)
} }
pub fn get_auth_type_and_flow( pub fn get_auth_type_and_flow<A: AppStateInfo + Sync>(
headers: &HeaderMap, headers: &HeaderMap,
) -> RouterResult<( ) -> RouterResult<(
Box<dyn AuthenticateAndFetch<storage::MerchantAccount, AppState>>, Box<dyn AuthenticateAndFetch<storage::MerchantAccount, A>>,
api::AuthFlow, api::AuthFlow,
)> { )> {
let api_key = get_api_key(headers)?; let api_key = get_api_key(headers)?;
@ -298,11 +304,11 @@ where
Ok((Box::new(ApiKeyAuth), api::AuthFlow::Merchant)) Ok((Box::new(ApiKeyAuth), api::AuthFlow::Merchant))
} }
pub async fn is_ephemeral_auth( pub async fn is_ephemeral_auth<A: AppStateInfo + Sync>(
headers: &HeaderMap, headers: &HeaderMap,
db: &dyn StorageInterface, db: &dyn StorageInterface,
customer_id: &str, customer_id: &str,
) -> RouterResult<Box<dyn AuthenticateAndFetch<storage::MerchantAccount, AppState>>> { ) -> RouterResult<Box<dyn AuthenticateAndFetch<storage::MerchantAccount, A>>> {
let api_key = get_api_key(headers)?; let api_key = get_api_key(headers)?;
if !api_key.starts_with("epk") { if !api_key.starts_with("epk") {