Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(payment_methods_session_v2): update flow of Payment Method Session #7157

Open
wants to merge 5 commits into
base: payment_methods_session
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: run formatter
  • Loading branch information
hyperswitch-bot[bot] committed Jan 31, 2025
commit 52277a17db323068cc987b2860e960efa3cc082b
1 change: 0 additions & 1 deletion crates/api_models/src/payment_methods.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2416,7 +2416,6 @@ pub struct PaymentMethodsSessionUpdateRequest {
/// The network tokenization configuration if applicable
#[schema(value_type = Option<NetworkTokenization>)]
pub network_tokenization: Option<common_types::payment_methods::NetworkTokenization>,

}

#[cfg(feature = "v2")]
Expand Down
3 changes: 1 addition & 2 deletions crates/diesel_models/src/payment_methods_session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ pub struct PaymentMethodsSession {
pub expires_at: time::PrimitiveDateTime,
}


#[cfg(feature = "v2")]
#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
pub struct PaymentMethodsSessionUpdate {
pub id: common_utils::id_type::GlobalPaymentMethodSessionId,
pub billing: Option<common_utils::encryption::Encryption>,
pub psp_tokenization: Option<common_types::payment_methods::PspTokenization>,
pub network_tokeinzation: Option<common_types::payment_methods::NetworkTokenization>,
}
}
12 changes: 7 additions & 5 deletions crates/hyperswitch_domain_models/src/payment_methods.rs
Original file line number Diff line number Diff line change
Expand Up @@ -634,11 +634,13 @@ impl super::behaviour::Conversion for PaymentMethodsSessionUpdate {
let decrypted_data = crypto_operation(
state,
type_name!(Self::DstType),
CryptoOperation::BatchDecrypt(EncryptedPaymentMethodsSessionUpdate::to_encryptable(
EncryptedPaymentMethodsSessionUpdate {
billing: storage_model.billing,
},
)),
CryptoOperation::BatchDecrypt(
EncryptedPaymentMethodsSessionUpdate::to_encryptable(
EncryptedPaymentMethodsSessionUpdate {
billing: storage_model.billing,
},
),
),
key_manager_identifier,
key.peek(),
)
Expand Down
55 changes: 31 additions & 24 deletions crates/router/src/core/payment_methods.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1940,7 +1940,7 @@ pub async fn payment_methods_session_update(
message: "payment methods session does not exist or has expired".to_string(),
})
.attach_printable("Failed to retrieve payment methods session from db")?;

let encrypted_data = request
.encrypt_data(key_manager_state, &key_store)
.await
Expand All @@ -1956,32 +1956,37 @@ pub async fn payment_methods_session_update(
})
.transpose()
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Unable to decode billing address")?;
.attach_printable("Unable to decode billing address")?;

let payment_method_session_domain_model = hyperswitch_domain_models::payment_methods::PaymentMethodsSessionUpdate {
id: payment_method_session_id.clone(),
billing,
psp_tokenization: request.psp_tokenization,
network_tokenization: request.network_tokenization,
};
let payment_method_session_domain_model =
hyperswitch_domain_models::payment_methods::PaymentMethodsSessionUpdate {
id: payment_method_session_id.clone(),
billing,
psp_tokenization: request.psp_tokenization,
network_tokenization: request.network_tokenization,
};

let update_state_change = payment_method_session_update_to_current_state(
payment_method_session_domain_model,
payment_method_session_state
).await;
let update_state_change = payment_method_session_update_to_current_state(
payment_method_session_domain_model,
payment_method_session_state,
)
.await;

db.update_payment_method_session( key_manager_state, &key_store, &payment_method_session_id, update_state_change.clone() )
.await
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed to update payment methods session in db")?;
db.update_payment_method_session(
key_manager_state,
&key_store,
&payment_method_session_id,
update_state_change.clone(),
)
.await
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed to update payment methods session in db")?;

let response = payment_methods::PaymentMethodsSessionResponse::foreign_from((
update_state_change,
Secret::new("CLIENT_SECRET_REDACTED".to_string()),
));
Ok(services::ApplicationResponse::Json(response))


}
#[cfg(feature = "v2")]
pub async fn payment_methods_session_retrieve(
Expand Down Expand Up @@ -2099,19 +2104,21 @@ impl pm_types::SavedPMLPaymentsInfo {
}
}



#[cfg(feature = "v2")]
pub async fn payment_method_session_update_to_current_state(
update_state: hyperswitch_domain_models::payment_methods::PaymentMethodsSessionUpdate,
current_state: hyperswitch_domain_models::payment_methods::PaymentMethodsSession
current_state: hyperswitch_domain_models::payment_methods::PaymentMethodsSession,
) -> hyperswitch_domain_models::payment_methods::PaymentMethodsSession {
hyperswitch_domain_models::payment_methods::PaymentMethodsSession {
id: current_state.id,
customer_id: current_state.customer_id,
billing: update_state.billing.or(current_state.billing),
psp_tokenization: update_state.psp_tokenization.or(current_state.psp_tokenization),
network_tokenization: update_state.network_tokenization.or(current_state.network_tokenization),
psp_tokenization: update_state
.psp_tokenization
.or(current_state.psp_tokenization),
network_tokenization: update_state
.network_tokenization
.or(current_state.network_tokenization),
expires_at: current_state.expires_at,
}
}
}
2 changes: 1 addition & 1 deletion crates/router/src/db/kafka_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3931,7 +3931,7 @@ impl db::payment_method_session::PaymentMethodsSessionInterface for KafkaStore {
key_store: &hyperswitch_domain_models::merchant_key_store::MerchantKeyStore,
id: &id_type::GlobalPaymentMethodSessionId,
payment_methods_session: hyperswitch_domain_models::payment_methods::PaymentMethodsSession,
) -> CustomResult< (), errors::StorageError, > {
) -> CustomResult<(), errors::StorageError> {
self.diesel_store
.update_payment_method_session(state, key_store, id, payment_methods_session)
.await
Expand Down
16 changes: 3 additions & 13 deletions crates/router/src/db/payment_method_session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ pub trait PaymentMethodsSessionInterface {
key_store: &hyperswitch_domain_models::merchant_key_store::MerchantKeyStore,
id: &common_utils::id_type::GlobalPaymentMethodSessionId,
payment_methods_session: hyperswitch_domain_models::payment_methods::PaymentMethodsSession,
) -> CustomResult<
(),
errors::StorageError,
>;
) -> CustomResult<(), errors::StorageError>;

async fn get_payment_methods_session(
&self,
Expand Down Expand Up @@ -121,10 +118,7 @@ mod storage {
key_store: &hyperswitch_domain_models::merchant_key_store::MerchantKeyStore,
session_id: &common_utils::id_type::GlobalPaymentMethodSessionId,
update_request: hyperswitch_domain_models::payment_methods::PaymentMethodsSession,
) -> CustomResult<
(),
errors::StorageError,
> {
) -> CustomResult<(), errors::StorageError> {
let redis_key = session_id.get_redis_key();

let db_model = update_request
Expand All @@ -141,7 +135,6 @@ mod storage {
.await
.change_context(errors::StorageError::KVError)
.attach_printable("Failed to insert payment methods session to redis")

}
}
}
Expand All @@ -164,10 +157,7 @@ impl PaymentMethodsSessionInterface for MockDb {
key_store: &hyperswitch_domain_models::merchant_key_store::MerchantKeyStore,
id: &common_utils::id_type::GlobalPaymentMethodSessionId,
payment_methods_session: hyperswitch_domain_models::payment_methods::PaymentMethodsSession,
) -> CustomResult<
(),
errors::StorageError
> {
) -> CustomResult<(), errors::StorageError> {
Err(errors::StorageError::MockDbError)?
}

Expand Down
29 changes: 14 additions & 15 deletions crates/router/src/routes/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1254,24 +1254,23 @@ impl PaymentMethodsSession {
.route(web::post().to(payment_methods::payment_methods_session_create)),
);

route = route.service(
web::scope("/{payment_method_session_id}")
.service(
web::resource("")
.route(web::get().to(payment_methods::payment_methods_session_retrieve))
.route(web::put().to(payment_methods::payment_methods_session_update)),
)
.service(web::resource("/list-payment-methods").route(
web::get().to(payment_methods::payment_method_session_list_payment_methods),
))
.service(
web::resource("/update-saved-payment-method").route(
route =
route.service(
web::scope("/{payment_method_session_id}")
.service(
web::resource("")
.route(web::get().to(payment_methods::payment_methods_session_retrieve))
.route(web::put().to(payment_methods::payment_methods_session_update)),
)
.service(web::resource("/list-payment-methods").route(
web::get().to(payment_methods::payment_method_session_list_payment_methods),
))
.service(web::resource("/update-saved-payment-method").route(
web::put().to(
payment_methods::payment_method_session_update_saved_payment_method,
),
),
),
);
)),
);

route
}
Expand Down
2 changes: 1 addition & 1 deletion crates/router/src/routes/lock_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ impl From<Flow> for ApiIdentifier {

Flow::PaymentMethodSessionCreate
| Flow::PaymentMethodSessionRetrieve
| Flow::PaymentMethodSessionUpdateSavedPaymentMethod
| Flow::PaymentMethodSessionUpdateSavedPaymentMethod
| Flow::PaymentMethodSessionUpdate => Self::PaymentMethodsSession,
}
}
Expand Down
19 changes: 10 additions & 9 deletions crates/router/src/routes/payment_methods.rs
Original file line number Diff line number Diff line change
Expand Up @@ -937,15 +937,16 @@ pub async fn payment_methods_session_update(
|state, auth: auth::AuthenticationData, req, _| {
let value = payment_method_session_id.clone();
async move {
payment_methods_routes::payment_methods_session_update(
state,
auth.merchant_account,
auth.key_store,
value.clone(),
req,
)
.await
}},
payment_methods_routes::payment_methods_session_update(
state,
auth.merchant_account,
auth.key_store,
value.clone(),
req,
)
.await
}
},
&vec![
auth::V2Auth::ApiKeyAuth,
auth::V2Auth::ClientAuth(diesel_models::ResourceId::PaymentMethodSession(
Expand Down
Loading