diff --git "a/diffs/pr_6708/a0300e5/diff.json" "b/diffs/pr_6708/a0300e5/diff.json" new file mode 100644--- /dev/null +++ "b/diffs/pr_6708/a0300e5/diff.json" @@ -0,0 +1,1471 @@ +{ + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "pr_number": 6708, + "rust_files": [ + "crates/hyperswitch_domain_models/src/errors/api_error_response.rs", + "crates/router/src/compatibility/stripe/errors.rs", + "crates/router/src/core/user.rs", + "crates/router/src/core/user_role.rs", + "crates/router/src/db/kafka_store.rs", + "crates/router/src/db/user.rs", + "crates/router/src/services/authentication.rs", + "crates/router/src/services/authentication/cookies.rs", + "crates/router/src/services/authorization.rs", + "crates/router/src/services/email/types.rs", + "crates/router/src/types/domain/user.rs", + "crates/router/src/utils/user.rs" + ], + "diffs": [ + { + "id": "crates/router/src/core/user.rs::function::accept_invite_from_email_token_only_flow", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn accept_invite_from_email_token_only_flow(\n state: SessionState,\n user_token: auth::UserFromSinglePurposeToken,\n request: user_api::AcceptInviteFromEmailRequest,\n) -> UserResponse {\n let token = request.token.expose();\n\n let email_token = auth::decode_jwt::(&token, &state)\n .await\n .change_context(UserErrors::LinkInvalid)?;\n\n auth::blacklist::check_email_token_in_blacklist(&state, &token).await?;\n\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(\n &email_token\n .get_email()\n .change_context(UserErrors::InternalServerError)?,\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .into();\n\n if user_from_db.get_user_id() != user_token.user_id {\n return Err(UserErrors::LinkInvalid.into());\n }\n\n let entity = email_token.get_entity().ok_or(UserErrors::LinkInvalid)?;\n\n let (org_id, merchant_id, profile_id) =\n utils::user_role::get_lineage_for_user_id_and_entity_for_accepting_invite(\n &state,\n &user_token.user_id,\n user_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n entity.entity_id.clone(),\n entity.entity_type,\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .ok_or(UserErrors::InternalServerError)?;\n\n let (update_v1_result, update_v2_result) = utils::user_role::update_v1_and_v2_user_roles_in_db(\n &state,\n user_from_db.get_user_id(),\n user_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &org_id,\n merchant_id.as_ref(),\n profile_id.as_ref(),\n UserRoleUpdate::UpdateStatus {\n status: UserStatus::Active,\n modified_by: user_from_db.get_user_id().to_owned(),\n },\n )\n .await;\n\n if update_v1_result\n .as_ref()\n .is_err_and(|err| !err.current_context().is_db_not_found())\n || update_v2_result\n .as_ref()\n .is_err_and(|err| !err.current_context().is_db_not_found())\n {\n return Err(report!(UserErrors::InternalServerError));\n }\n\n if update_v1_result.is_err() && update_v2_result.is_err() {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"User not found in the organization\")?;\n }\n\n if !user_from_db.is_verified() {\n let _ = state\n .global_store\n .update_user_by_user_id(\n user_from_db.get_user_id(),\n storage_user::UserUpdate::VerifyUser,\n )\n .await\n .map_err(|error| logger::error!(?error));\n }\n\n let _ = auth::blacklist::insert_email_token_in_blacklist(&state, &token)\n .await\n .map_err(|error| logger::error!(?error));\n\n let current_flow = domain::CurrentFlow::new(\n user_token,\n domain::SPTFlow::AcceptInvitationFromEmail.into(),\n )?;\n let next_flow = current_flow.next(user_from_db.clone(), &state).await?;\n\n let token = next_flow.get_token(&state).await?;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: next_flow.get_flow().into(),\n };\n auth::cookies::set_cookie_response(response, token)\n}", + "after_code": "pub async fn accept_invite_from_email_token_only_flow(\n state: SessionState,\n user_token: auth::UserFromSinglePurposeToken,\n request: user_api::AcceptInviteFromEmailRequest,\n) -> UserResponse {\n let token = request.token.expose();\n\n let email_token = auth::decode_jwt::(&token, &state)\n .await\n .change_context(UserErrors::LinkInvalid)?;\n\n auth::blacklist::check_email_token_in_blacklist(&state, &token).await?;\n\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&email_token.get_email()?)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into();\n\n if user_from_db.get_user_id() != user_token.user_id {\n return Err(UserErrors::LinkInvalid.into());\n }\n\n let entity = email_token.get_entity().ok_or(UserErrors::LinkInvalid)?;\n\n let (org_id, merchant_id, profile_id) =\n utils::user_role::get_lineage_for_user_id_and_entity_for_accepting_invite(\n &state,\n &user_token.user_id,\n user_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n entity.entity_id.clone(),\n entity.entity_type,\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .ok_or(UserErrors::InternalServerError)?;\n\n let (update_v1_result, update_v2_result) = utils::user_role::update_v1_and_v2_user_roles_in_db(\n &state,\n user_from_db.get_user_id(),\n user_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &org_id,\n merchant_id.as_ref(),\n profile_id.as_ref(),\n UserRoleUpdate::UpdateStatus {\n status: UserStatus::Active,\n modified_by: user_from_db.get_user_id().to_owned(),\n },\n )\n .await;\n\n if update_v1_result\n .as_ref()\n .is_err_and(|err| !err.current_context().is_db_not_found())\n || update_v2_result\n .as_ref()\n .is_err_and(|err| !err.current_context().is_db_not_found())\n {\n return Err(report!(UserErrors::InternalServerError));\n }\n\n if update_v1_result.is_err() && update_v2_result.is_err() {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"User not found in the organization\")?;\n }\n\n if !user_from_db.is_verified() {\n let _ = state\n .global_store\n .update_user_by_user_id(\n user_from_db.get_user_id(),\n storage_user::UserUpdate::VerifyUser,\n )\n .await\n .map_err(|error| logger::error!(?error));\n }\n\n let _ = auth::blacklist::insert_email_token_in_blacklist(&state, &token)\n .await\n .map_err(|error| logger::error!(?error));\n\n let current_flow = domain::CurrentFlow::new(\n user_token,\n domain::SPTFlow::AcceptInvitationFromEmail.into(),\n )?;\n let next_flow = current_flow.next(user_from_db.clone(), &state).await?;\n\n let token = next_flow.get_token(&state).await?;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: next_flow.get_flow().into(),\n };\n auth::cookies::set_cookie_response(response, token)\n}", + "diff_span": { + "before": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(\n &email_token\n .get_email()\n .change_context(UserErrors::InternalServerError)?,\n )\n .await\n .change_context(UserErrors::InternalServerError)?", + "after": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&email_token.get_email()?)\n .await\n .change_context(UserErrors::InternalServerError)?" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/authentication.rs::function::get_cookie_from_header", + "file": "crates/router/src/services/authentication.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub fn get_cookie_from_header(headers: &HeaderMap) -> RouterResult<&str> {\n headers\n .get(cookies::get_cookie_header())\n .and_then(|header_value| header_value.to_str().ok())\n .ok_or(errors::ApiErrorResponse::InvalidCookie.into())\n}", + "after_code": "pub fn get_cookie_from_header(headers: &HeaderMap) -> RouterResult<&str> {\n let cookie = headers\n .get(cookies::get_cookie_header())\n .ok_or(report!(errors::ApiErrorResponse::CookieNotFound))?;\n\n cookie\n .to_str()\n .change_context(errors::ApiErrorResponse::InvalidCookie)\n}", + "diff_span": { + "before": "pub fn get_cookie_from_header(headers: &HeaderMap) -> RouterResult<&str> {\n headers\n .get(cookies::get_cookie_header())\n .and_then(|header_value| header_value.to_str().ok())\n .ok_or(errors::ApiErrorResponse::InvalidCookie.into())\n}", + "after": "pub fn get_cookie_from_header(headers: &HeaderMap) -> RouterResult<&str> {\n let cookie = headers\n .get(cookies::get_cookie_header())\n .ok_or(report!(errors::ApiErrorResponse::CookieNotFound))?;\n\n cookie\n .to_str()\n .change_context(errors::ApiErrorResponse::InvalidCookie)\n}" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use actix_web::http::header::HeaderMap;" + ], + "after_imports": [ + "use actix_web::http::header::HeaderMap;", + "use error_stack::{report, ResultExt};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::impl::Entity", + "file": "crates/router/src/services/email/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl Entity {\n pub fn get_entity_type(&self) -> EntityType {\n self.entity_type\n }\n\n pub fn get_entity_id(&self) -> &str {\n &self.entity_id\n }\n}", + "after_code": "impl Entity {\n pub fn get_entity_type(&self) -> EntityType {\n self.entity_type\n }\n\n pub fn get_entity_id(&self) -> &str {\n &self.entity_id\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use common_enums::EntityType;" + ], + "after_imports": [ + "use common_enums::EntityType;" + ] + }, + { + "id": "crates/router/src/services/authorization.rs::function::get_role_info", + "file": "crates/router/src/services/authorization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_role_info(state: &A, token: &AuthToken) -> RouterResult\nwhere\n A: SessionStateInfo + Sync,\n{\n if let Some(role_info) = roles::predefined_roles::PREDEFINED_ROLES.get(token.role_id.as_str()) {\n return Ok(role_info.clone());\n }\n\n if let Ok(role_info) = get_role_info_from_cache(state, &token.role_id)\n .await\n .map_err(|e| logger::error!(\"Failed to get permissions from cache {e:?}\"))\n {\n return Ok(role_info.clone());\n }\n\n let role_info =\n get_role_info_from_db(state, &token.role_id, &token.merchant_id, &token.org_id).await?;\n\n let token_expiry =\n i64::try_from(token.exp).change_context(ApiErrorResponse::InternalServerError)?;\n let cache_ttl = token_expiry - common_utils::date_time::now_unix_timestamp();\n\n set_role_info_in_cache(state, &token.role_id, &role_info, cache_ttl)\n .await\n .map_err(|e| logger::error!(\"Failed to set role info in cache {e:?}\"))\n .ok();\n Ok(role_info)\n}", + "after_code": "pub async fn get_role_info(state: &A, token: &AuthToken) -> RouterResult\nwhere\n A: SessionStateInfo + Sync,\n{\n if let Some(role_info) = roles::predefined_roles::PREDEFINED_ROLES.get(token.role_id.as_str()) {\n return Ok(role_info.clone());\n }\n\n if let Ok(role_info) = get_role_info_from_cache(state, &token.role_id)\n .await\n .map_err(|e| logger::error!(\"Failed to get permissions from cache {e:?}\"))\n {\n return Ok(role_info.clone());\n }\n\n let role_info =\n get_role_info_from_db(state, &token.role_id, &token.merchant_id, &token.org_id).await?;\n\n let token_expiry =\n i64::try_from(token.exp).change_context(ApiErrorResponse::InternalServerError)?;\n let cache_ttl = token_expiry - common_utils::date_time::now_unix_timestamp();\n\n if cache_ttl > 0 {\n set_role_info_in_cache(state, &token.role_id, &role_info, cache_ttl)\n .await\n .map_err(|e| logger::error!(\"Failed to set role info in cache {e:?}\"))\n .ok();\n }\n Ok(role_info)\n}", + "diff_span": { + "before": " let cache_ttl = token_expiry - common_utils::date_time::now_unix_timestamp();\n\n set_role_info_in_cache(state, &token.role_id, &role_info, cache_ttl)\n .await\n .map_err(|e| logger::error!(\"Failed to set role info in cache {e:?}\"))\n .ok();\n Ok(role_info)\n}", + "after": " let cache_ttl = token_expiry - common_utils::date_time::now_unix_timestamp();\n\n if cache_ttl > 0 {\n set_role_info_in_cache(state, &token.role_id, &role_info, cache_ttl)\n .await\n .map_err(|e| logger::error!(\"Failed to set role info in cache {e:?}\"))\n .ok();\n }\n Ok(role_info)\n}" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/email/types.rs::impl::ResetPassword", + "file": "crates/router/src/services/email/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl EmailData for ResetPassword {\n async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::ResetPassword,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let reset_password_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"set_password\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::Reset {\n link: reset_password_link,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "after_code": "impl EmailData for ResetPassword {\n async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::ResetPassword,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let reset_password_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"set_password\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::Reset {\n link: reset_password_link,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::EmailToken::function::get_email", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub fn get_email(&self) -> CustomResult {\n pii::Email::try_from(self.email.clone())\n }", + "after_code": "pub fn get_email(&self) -> UserResult {\n pii::Email::try_from(self.email.clone())\n .change_context(UserErrors::InternalServerError)\n .and_then(domain::UserEmail::from_pii_email)\n }", + "diff_span": { + "before": "pub fn get_email(&self) -> CustomResult {\n pii::Email::try_from(self.email.clone())\n }", + "after": "pub fn get_email(&self) -> UserResult {\n pii::Email::try_from(self.email.clone())\n .change_context(UserErrors::InternalServerError)\n .and_then(domain::UserEmail::from_pii_email)\n }" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/db/kafka_store.rs::KafkaStore::function::update_user_by_email", + "file": "crates/router/src/db/kafka_store.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n user: storage::UserUpdate,\n ) -> CustomResult {\n self.diesel_store\n .update_user_by_email(user_email, user)\n .await\n }", + "after_code": "async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n user: storage::UserUpdate,\n ) -> CustomResult {\n self.diesel_store\n .update_user_by_email(user_email, user)\n .await\n }", + "diff_span": { + "before": "async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n user: storage::UserUpdate,\n ) -> CustomResult {", + "after": "async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n user: storage::UserUpdate,\n ) -> CustomResult {" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/hyperswitch_domain_models/src/errors/api_error_response.rs::ApiErrorResponse::function::switch", + "file": "crates/hyperswitch_domain_models/src/errors/api_error_response.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn switch(&self) -> api_models::errors::types::ApiErrorResponse {\n use api_models::errors::types::{ApiError, ApiErrorResponse as AER};\n\n match self {\n Self::ExternalConnectorError {\n code,\n message,\n connector,\n reason,\n status_code,\n } => AER::ConnectorError(ApiError::new(\"CE\", 0, format!(\"{code}: {message}\"), Some(Extra {connector: Some(connector.clone()), reason: reason.to_owned().map(Into::into), ..Default::default()})), StatusCode::from_u16(*status_code).unwrap_or(StatusCode::INTERNAL_SERVER_ERROR)),\n Self::PaymentAuthorizationFailed { data } => {\n AER::BadRequest(ApiError::new(\"CE\", 1, \"Payment failed during authorization with connector. Retry payment\", Some(Extra { data: data.clone(), ..Default::default()})))\n }\n Self::PaymentAuthenticationFailed { data } => {\n AER::BadRequest(ApiError::new(\"CE\", 2, \"Payment failed during authentication with connector. Retry payment\", Some(Extra { data: data.clone(), ..Default::default()})))\n }\n Self::PaymentCaptureFailed { data } => {\n AER::BadRequest(ApiError::new(\"CE\", 3, \"Capture attempt failed while processing with connector\", Some(Extra { data: data.clone(), ..Default::default()})))\n }\n Self::InvalidCardData { data } => AER::BadRequest(ApiError::new(\"CE\", 4, \"The card data is invalid\", Some(Extra { data: data.clone(), ..Default::default()}))),\n Self::CardExpired { data } => AER::BadRequest(ApiError::new(\"CE\", 5, \"The card has expired\", Some(Extra { data: data.clone(), ..Default::default()}))),\n Self::RefundFailed { data } => AER::BadRequest(ApiError::new(\"CE\", 6, \"Refund failed while processing with connector. Retry refund\", Some(Extra { data: data.clone(), ..Default::default()}))),\n Self::VerificationFailed { data } => {\n AER::BadRequest(ApiError::new(\"CE\", 7, \"Verification failed while processing with connector. Retry operation\", Some(Extra { data: data.clone(), ..Default::default()})))\n },\n Self::DisputeFailed { data } => {\n AER::BadRequest(ApiError::new(\"CE\", 8, \"Dispute operation failed while processing with connector. Retry operation\", Some(Extra { data: data.clone(), ..Default::default()})))\n }\n\n Self::ResourceBusy => {\n AER::Unprocessable(ApiError::new(\"HE\", 0, \"There was an issue processing the webhook body\", None))\n }\n Self::CurrencyConversionFailed => {\n AER::Unprocessable(ApiError::new(\"HE\", 0, \"Failed to convert currency to minor unit\", None))\n }\n Self::InternalServerError => {\n AER::InternalServerError(ApiError::new(\"HE\", 0, \"Something went wrong\", None))\n },\n Self::HealthCheckError { message,component } => {\n AER::InternalServerError(ApiError::new(\"HE\",0,format!(\"{} health check failed with error: {}\",component,message),None))\n },\n Self::DuplicateRefundRequest => AER::BadRequest(ApiError::new(\"HE\", 1, \"Duplicate refund request. Refund already attempted with the refund ID\", None)),\n Self::DuplicateMandate => AER::BadRequest(ApiError::new(\"HE\", 1, \"Duplicate mandate request. Mandate already attempted with the Mandate ID\", None)),\n Self::DuplicateMerchantAccount => AER::BadRequest(ApiError::new(\"HE\", 1, \"The merchant account with the specified details already exists in our records\", None)),\n Self::DuplicateMerchantConnectorAccount { profile_id, connector_label: connector_name } => {\n AER::BadRequest(ApiError::new(\"HE\", 1, format!(\"The merchant connector account with the specified profile_id '{profile_id}' and connector_label '{connector_name}' already exists in our records\"), None))\n }\n Self::DuplicatePaymentMethod => AER::BadRequest(ApiError::new(\"HE\", 1, \"The payment method with the specified details already exists in our records\", None)),\n Self::DuplicatePayment { payment_id } => {\n AER::BadRequest(ApiError::new(\"HE\", 1, \"The payment with the specified payment_id already exists in our records\", Some(Extra {reason: Some(format!(\"{payment_id:?} already exists\")), ..Default::default()})))\n }\n Self::DuplicatePayout { payout_id } => {\n AER::BadRequest(ApiError::new(\"HE\", 1, format!(\"The payout with the specified payout_id '{payout_id}' already exists in our records\"), None))\n }\n Self::DuplicateConfig => {\n AER::BadRequest(ApiError::new(\"HE\", 1, \"The config with the specified key already exists in our records\", None))\n }\n Self::RefundNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Refund does not exist in our records.\", None))\n }\n Self::PaymentLinkNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Payment Link does not exist in our records\", None))\n }\n Self::CustomerNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Customer does not exist in our records\", None))\n }\n Self::ConfigNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Config key does not exist in our records.\", None))\n },\n Self::PaymentNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Payment does not exist in our records\", None))\n }\n Self::PaymentMethodNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Payment method does not exist in our records\", None))\n }\n Self::MerchantAccountNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Merchant account does not exist in our records\", None))\n }\n Self::MerchantConnectorAccountNotFound {id } => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Merchant connector account does not exist in our records\", Some(Extra {reason: Some(format!(\"{id} does not exist\")), ..Default::default()})))\n }\n Self::ProfileNotFound { id } => {\n AER::NotFound(ApiError::new(\"HE\", 2, format!(\"Business profile with the given id {id} does not exist\"), None))\n }\n Self::PollNotFound { .. } => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Poll does not exist in our records\", None))\n },\n Self::ResourceIdNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Resource ID does not exist in our records\", None))\n }\n Self::MandateNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Mandate does not exist in our records\", None))\n }\n Self::AuthenticationNotFound { .. } => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Authentication does not exist in our records\", None))\n },\n Self::MandateUpdateFailed => {\n AER::InternalServerError(ApiError::new(\"HE\", 2, \"Mandate update failed\", None))\n },\n Self::ApiKeyNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"API Key does not exist in our records\", None))\n }\n Self::PayoutNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Payout does not exist in our records\", None))\n }\n Self::EventNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Event does not exist in our records\", None))\n }\n Self::MandateSerializationFailed | Self::MandateDeserializationFailed => {\n AER::InternalServerError(ApiError::new(\"HE\", 3, \"Something went wrong\", None))\n },\n Self::ReturnUrlUnavailable => AER::NotFound(ApiError::new(\"HE\", 3, \"Return URL is not configured and not passed in payments request\", None)),\n Self::RefundNotPossible { connector } => {\n AER::BadRequest(ApiError::new(\"HE\", 3, format!(\"This refund is not possible through Hyperswitch. Please raise the refund through {connector} dashboard\"), None))\n }\n Self::MandateValidationFailed { reason } => {\n AER::BadRequest(ApiError::new(\"HE\", 3, \"Mandate Validation Failed\", Some(Extra { reason: Some(reason.to_owned()), ..Default::default() })))\n }\n Self::PaymentNotSucceeded => AER::BadRequest(ApiError::new(\"HE\", 3, \"The payment has not succeeded yet. Please pass a successful payment to initiate refund\", None)),\n Self::MerchantConnectorAccountDisabled => {\n AER::BadRequest(ApiError::new(\"HE\", 3, \"The selected merchant connector account is disabled\", None))\n }\n Self::PaymentBlockedError {\n message,\n reason,\n ..\n } => AER::DomainError(ApiError::new(\"HE\", 3, message, Some(Extra { reason: Some(reason.clone()), ..Default::default() }))),\n Self::FileValidationFailed { reason } => {\n AER::BadRequest(ApiError::new(\"HE\", 3, format!(\"File validation failed {reason}\"), None))\n }\n Self::DisputeStatusValidationFailed { .. } => {\n AER::BadRequest(ApiError::new(\"HE\", 3, \"Dispute status validation failed\", None))\n }\n Self::SuccessfulPaymentNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"Successful payment not found for the given payment id\", None))\n }\n Self::IncorrectConnectorNameGiven => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"The connector provided in the request is incorrect or not available\", None))\n }\n Self::AddressNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"Address does not exist in our records\", None))\n },\n Self::DisputeNotFound { .. } => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"Dispute does not exist in our records\", None))\n },\n Self::FileNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"File does not exist in our records\", None))\n }\n Self::FileNotAvailable => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"File not available\", None))\n }\n Self::MissingTenantId => {\n AER::InternalServerError(ApiError::new(\"HE\", 5, \"Missing Tenant ID in the request\".to_string(), None))\n }\n Self::InvalidTenant { tenant_id } => {\n AER::InternalServerError(ApiError::new(\"HE\", 5, format!(\"Invalid Tenant {tenant_id}\"), None))\n }\n Self::AmountConversionFailed { amount_type } => {\n AER::InternalServerError(ApiError::new(\"HE\", 6, format!(\"Failed to convert amount to {amount_type} type\"), None))\n }\n\n Self::NotImplemented { message } => {\n AER::NotImplemented(ApiError::new(\"IR\", 0, format!(\"{message:?}\"), None))\n }\n Self::Unauthorized => AER::Unauthorized(ApiError::new(\n \"IR\",\n 1,\n \"API key not provided or invalid API key used\", None\n )),\n Self::InvalidRequestUrl => {\n AER::NotFound(ApiError::new(\"IR\", 2, \"Unrecognized request URL\", None))\n }\n Self::InvalidHttpMethod => AER::MethodNotAllowed(ApiError::new(\n \"IR\",\n 3,\n \"The HTTP method is not applicable for this API\", None\n )),\n Self::MissingRequiredField { field_name } => AER::BadRequest(\n ApiError::new(\"IR\", 4, format!(\"Missing required param: {field_name}\"), None),\n ),\n Self::InvalidDataFormat {\n field_name,\n expected_format,\n } => AER::Unprocessable(ApiError::new(\n \"IR\",\n 5,\n format!(\n \"{field_name} contains invalid data. Expected format is {expected_format}\"\n ), None\n )),\n Self::InvalidRequestData { message } => {\n AER::Unprocessable(ApiError::new(\"IR\", 6, message.to_string(), None))\n }\n Self::InvalidDataValue { field_name } => AER::BadRequest(ApiError::new(\n \"IR\",\n 7,\n format!(\"Invalid value provided: {field_name}\"), None\n )),\n Self::ClientSecretNotGiven => AER::BadRequest(ApiError::new(\n \"IR\",\n 8,\n \"client_secret was not provided\", None\n )),\n Self::ClientSecretExpired => AER::BadRequest(ApiError::new(\n \"IR\",\n 8,\n \"The provided client_secret has expired\", None\n )),\n Self::ClientSecretInvalid => {\n AER::BadRequest(ApiError::new(\"IR\", 9, \"The client_secret provided does not match the client_secret associated with the Payment\", None))\n }\n Self::MandateActive => {\n AER::BadRequest(ApiError::new(\"IR\", 10, \"Customer has active mandate/subsciption\", None))\n }\n Self::CustomerRedacted => {\n AER::BadRequest(ApiError::new(\"IR\", 11, \"Customer has already been redacted\", None))\n }\n Self::MaximumRefundCount => AER::BadRequest(ApiError::new(\"IR\", 12, \"Reached maximum refund attempts\", None)),\n Self::RefundAmountExceedsPaymentAmount => {\n AER::BadRequest(ApiError::new(\"IR\", 13, \"The refund amount exceeds the amount captured\", None))\n }\n Self::PaymentUnexpectedState {\n current_flow,\n field_name,\n current_value,\n states,\n } => AER::BadRequest(ApiError::new(\"IR\", 14, format!(\"This Payment could not be {current_flow} because it has a {field_name} of {current_value}. The expected state is {states}\"), None)),\n Self::InvalidEphemeralKey => AER::Unauthorized(ApiError::new(\"IR\", 15, \"Invalid Ephemeral Key for the customer\", None)),\n Self::PreconditionFailed { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 16, message.to_string(), None))\n }\n Self::InvalidJwtToken => AER::Unauthorized(ApiError::new(\"IR\", 17, \"Access forbidden, invalid JWT token was used\", None)),\n Self::GenericUnauthorized { message } => {\n AER::Unauthorized(ApiError::new(\"IR\", 18, message.to_string(), None))\n },\n Self::NotSupported { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 19, \"Payment method type not supported\", Some(Extra {reason: Some(message.to_owned()), ..Default::default()})))\n },\n Self::FlowNotSupported { flow, connector } => {\n AER::BadRequest(ApiError::new(\"IR\", 20, format!(\"{flow} flow not supported\"), Some(Extra {connector: Some(connector.to_owned()), ..Default::default()}))) //FIXME: error message\n }\n Self::MissingRequiredFields { field_names } => AER::BadRequest(\n ApiError::new(\"IR\", 21, \"Missing required params\".to_string(), Some(Extra {data: Some(serde_json::json!(field_names)), ..Default::default() })),\n ),\n Self::AccessForbidden {resource} => {\n AER::ForbiddenCommonResource(ApiError::new(\"IR\", 22, format!(\"Access forbidden. Not authorized to access this resource {resource}\"), None))\n },\n Self::FileProviderNotSupported { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 23, message.to_string(), None))\n },\n Self::InvalidWalletToken { wallet_name} => AER::Unprocessable(ApiError::new(\n \"IR\",\n 24,\n format!(\"Invalid {wallet_name} wallet token\"), None\n )),\n Self::PaymentMethodDeleteFailed => {\n AER::BadRequest(ApiError::new(\"IR\", 25, \"Cannot delete the default payment method\", None))\n }\n Self::InvalidCookie => {\n AER::BadRequest(ApiError::new(\"IR\", 26, \"Invalid Cookie\", None))\n }\n Self::ExtendedCardInfoNotFound => {\n AER::NotFound(ApiError::new(\"IR\", 27, \"Extended card info does not exist\", None))\n }\n Self::CurrencyNotSupported { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 28, message, None))\n }\n Self::UnprocessableEntity {message} => AER::Unprocessable(ApiError::new(\"IR\", 29, message.to_string(), None)),\n Self::InvalidConnectorConfiguration {config} => {\n AER::BadRequest(ApiError::new(\"IR\", 30, format!(\"Merchant connector account is configured with invalid {config}\"), None))\n }\n Self::InvalidCardIin => AER::BadRequest(ApiError::new(\"IR\", 31, \"The provided card IIN does not exist\", None)),\n Self::InvalidCardIinLength => AER::BadRequest(ApiError::new(\"IR\", 32, \"The provided card IIN length is invalid, please provide an IIN with 6 digits\", None)),\n Self::MissingFile => {\n AER::BadRequest(ApiError::new(\"IR\", 33, \"File not found in the request\", None))\n }\n Self::MissingDisputeId => {\n AER::BadRequest(ApiError::new(\"IR\", 34, \"Dispute id not found in the request\", None))\n }\n Self::MissingFilePurpose => {\n AER::BadRequest(ApiError::new(\"IR\", 35, \"File purpose not found in the request or is invalid\", None))\n }\n Self::MissingFileContentType => {\n AER::BadRequest(ApiError::new(\"IR\", 36, \"File content type not found\", None))\n }\n Self::GenericNotFoundError { message } => {\n AER::NotFound(ApiError::new(\"IR\", 37, message, None))\n },\n Self::GenericDuplicateError { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 38, message, None))\n }\n Self::IncorrectPaymentMethodConfiguration => {\n AER::BadRequest(ApiError::new(\"IR\", 39, \"No eligible connector was found for the current payment method configuration\", None))\n }\n Self::LinkConfigurationError { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 40, message, None))\n },\n Self::PayoutFailed { data } => {\n AER::BadRequest(ApiError::new(\"IR\", 41, \"Payout failed while processing with connector.\", Some(Extra { data: data.clone(), ..Default::default()})))\n },\n\n Self::WebhookAuthenticationFailed => {\n AER::Unauthorized(ApiError::new(\"WE\", 1, \"Webhook authentication failed\", None))\n }\n Self::WebhookBadRequest => {\n AER::BadRequest(ApiError::new(\"WE\", 2, \"Bad request body received\", None))\n }\n Self::WebhookProcessingFailure => {\n AER::InternalServerError(ApiError::new(\"WE\", 3, \"There was an issue processing the webhook\", None))\n },\n Self::WebhookResourceNotFound => {\n AER::NotFound(ApiError::new(\"WE\", 4, \"Webhook resource was not found\", None))\n }\n Self::WebhookUnprocessableEntity => {\n AER::Unprocessable(ApiError::new(\"WE\", 5, \"There was an issue processing the webhook body\", None))\n },\n Self::WebhookInvalidMerchantSecret => {\n AER::BadRequest(ApiError::new(\"WE\", 6, \"Merchant Secret set for webhook source verification is invalid\", None))\n }\n Self::IntegrityCheckFailed {\n reason,\n field_names,\n connector_transaction_id\n } => AER::InternalServerError(ApiError::new(\n \"IE\",\n 0,\n format!(\"{} as data mismatched for {}\", reason, field_names),\n Some(Extra {\n connector_transaction_id: connector_transaction_id.to_owned(),\n ..Default::default()\n })\n )),\n }\n }", + "after_code": "fn switch(&self) -> api_models::errors::types::ApiErrorResponse {\n use api_models::errors::types::{ApiError, ApiErrorResponse as AER};\n\n match self {\n Self::ExternalConnectorError {\n code,\n message,\n connector,\n reason,\n status_code,\n } => AER::ConnectorError(ApiError::new(\"CE\", 0, format!(\"{code}: {message}\"), Some(Extra {connector: Some(connector.clone()), reason: reason.to_owned().map(Into::into), ..Default::default()})), StatusCode::from_u16(*status_code).unwrap_or(StatusCode::INTERNAL_SERVER_ERROR)),\n Self::PaymentAuthorizationFailed { data } => {\n AER::BadRequest(ApiError::new(\"CE\", 1, \"Payment failed during authorization with connector. Retry payment\", Some(Extra { data: data.clone(), ..Default::default()})))\n }\n Self::PaymentAuthenticationFailed { data } => {\n AER::BadRequest(ApiError::new(\"CE\", 2, \"Payment failed during authentication with connector. Retry payment\", Some(Extra { data: data.clone(), ..Default::default()})))\n }\n Self::PaymentCaptureFailed { data } => {\n AER::BadRequest(ApiError::new(\"CE\", 3, \"Capture attempt failed while processing with connector\", Some(Extra { data: data.clone(), ..Default::default()})))\n }\n Self::InvalidCardData { data } => AER::BadRequest(ApiError::new(\"CE\", 4, \"The card data is invalid\", Some(Extra { data: data.clone(), ..Default::default()}))),\n Self::CardExpired { data } => AER::BadRequest(ApiError::new(\"CE\", 5, \"The card has expired\", Some(Extra { data: data.clone(), ..Default::default()}))),\n Self::RefundFailed { data } => AER::BadRequest(ApiError::new(\"CE\", 6, \"Refund failed while processing with connector. Retry refund\", Some(Extra { data: data.clone(), ..Default::default()}))),\n Self::VerificationFailed { data } => {\n AER::BadRequest(ApiError::new(\"CE\", 7, \"Verification failed while processing with connector. Retry operation\", Some(Extra { data: data.clone(), ..Default::default()})))\n },\n Self::DisputeFailed { data } => {\n AER::BadRequest(ApiError::new(\"CE\", 8, \"Dispute operation failed while processing with connector. Retry operation\", Some(Extra { data: data.clone(), ..Default::default()})))\n }\n\n Self::ResourceBusy => {\n AER::Unprocessable(ApiError::new(\"HE\", 0, \"There was an issue processing the webhook body\", None))\n }\n Self::CurrencyConversionFailed => {\n AER::Unprocessable(ApiError::new(\"HE\", 0, \"Failed to convert currency to minor unit\", None))\n }\n Self::InternalServerError => {\n AER::InternalServerError(ApiError::new(\"HE\", 0, \"Something went wrong\", None))\n },\n Self::HealthCheckError { message,component } => {\n AER::InternalServerError(ApiError::new(\"HE\",0,format!(\"{} health check failed with error: {}\",component,message),None))\n },\n Self::DuplicateRefundRequest => AER::BadRequest(ApiError::new(\"HE\", 1, \"Duplicate refund request. Refund already attempted with the refund ID\", None)),\n Self::DuplicateMandate => AER::BadRequest(ApiError::new(\"HE\", 1, \"Duplicate mandate request. Mandate already attempted with the Mandate ID\", None)),\n Self::DuplicateMerchantAccount => AER::BadRequest(ApiError::new(\"HE\", 1, \"The merchant account with the specified details already exists in our records\", None)),\n Self::DuplicateMerchantConnectorAccount { profile_id, connector_label: connector_name } => {\n AER::BadRequest(ApiError::new(\"HE\", 1, format!(\"The merchant connector account with the specified profile_id '{profile_id}' and connector_label '{connector_name}' already exists in our records\"), None))\n }\n Self::DuplicatePaymentMethod => AER::BadRequest(ApiError::new(\"HE\", 1, \"The payment method with the specified details already exists in our records\", None)),\n Self::DuplicatePayment { payment_id } => {\n AER::BadRequest(ApiError::new(\"HE\", 1, \"The payment with the specified payment_id already exists in our records\", Some(Extra {reason: Some(format!(\"{payment_id:?} already exists\")), ..Default::default()})))\n }\n Self::DuplicatePayout { payout_id } => {\n AER::BadRequest(ApiError::new(\"HE\", 1, format!(\"The payout with the specified payout_id '{payout_id}' already exists in our records\"), None))\n }\n Self::DuplicateConfig => {\n AER::BadRequest(ApiError::new(\"HE\", 1, \"The config with the specified key already exists in our records\", None))\n }\n Self::RefundNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Refund does not exist in our records.\", None))\n }\n Self::PaymentLinkNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Payment Link does not exist in our records\", None))\n }\n Self::CustomerNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Customer does not exist in our records\", None))\n }\n Self::ConfigNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Config key does not exist in our records.\", None))\n },\n Self::PaymentNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Payment does not exist in our records\", None))\n }\n Self::PaymentMethodNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Payment method does not exist in our records\", None))\n }\n Self::MerchantAccountNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Merchant account does not exist in our records\", None))\n }\n Self::MerchantConnectorAccountNotFound {id } => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Merchant connector account does not exist in our records\", Some(Extra {reason: Some(format!(\"{id} does not exist\")), ..Default::default()})))\n }\n Self::ProfileNotFound { id } => {\n AER::NotFound(ApiError::new(\"HE\", 2, format!(\"Business profile with the given id {id} does not exist\"), None))\n }\n Self::PollNotFound { .. } => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Poll does not exist in our records\", None))\n },\n Self::ResourceIdNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Resource ID does not exist in our records\", None))\n }\n Self::MandateNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Mandate does not exist in our records\", None))\n }\n Self::AuthenticationNotFound { .. } => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Authentication does not exist in our records\", None))\n },\n Self::MandateUpdateFailed => {\n AER::InternalServerError(ApiError::new(\"HE\", 2, \"Mandate update failed\", None))\n },\n Self::ApiKeyNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"API Key does not exist in our records\", None))\n }\n Self::PayoutNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Payout does not exist in our records\", None))\n }\n Self::EventNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 2, \"Event does not exist in our records\", None))\n }\n Self::MandateSerializationFailed | Self::MandateDeserializationFailed => {\n AER::InternalServerError(ApiError::new(\"HE\", 3, \"Something went wrong\", None))\n },\n Self::ReturnUrlUnavailable => AER::NotFound(ApiError::new(\"HE\", 3, \"Return URL is not configured and not passed in payments request\", None)),\n Self::RefundNotPossible { connector } => {\n AER::BadRequest(ApiError::new(\"HE\", 3, format!(\"This refund is not possible through Hyperswitch. Please raise the refund through {connector} dashboard\"), None))\n }\n Self::MandateValidationFailed { reason } => {\n AER::BadRequest(ApiError::new(\"HE\", 3, \"Mandate Validation Failed\", Some(Extra { reason: Some(reason.to_owned()), ..Default::default() })))\n }\n Self::PaymentNotSucceeded => AER::BadRequest(ApiError::new(\"HE\", 3, \"The payment has not succeeded yet. Please pass a successful payment to initiate refund\", None)),\n Self::MerchantConnectorAccountDisabled => {\n AER::BadRequest(ApiError::new(\"HE\", 3, \"The selected merchant connector account is disabled\", None))\n }\n Self::PaymentBlockedError {\n message,\n reason,\n ..\n } => AER::DomainError(ApiError::new(\"HE\", 3, message, Some(Extra { reason: Some(reason.clone()), ..Default::default() }))),\n Self::FileValidationFailed { reason } => {\n AER::BadRequest(ApiError::new(\"HE\", 3, format!(\"File validation failed {reason}\"), None))\n }\n Self::DisputeStatusValidationFailed { .. } => {\n AER::BadRequest(ApiError::new(\"HE\", 3, \"Dispute status validation failed\", None))\n }\n Self::SuccessfulPaymentNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"Successful payment not found for the given payment id\", None))\n }\n Self::IncorrectConnectorNameGiven => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"The connector provided in the request is incorrect or not available\", None))\n }\n Self::AddressNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"Address does not exist in our records\", None))\n },\n Self::DisputeNotFound { .. } => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"Dispute does not exist in our records\", None))\n },\n Self::FileNotFound => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"File does not exist in our records\", None))\n }\n Self::FileNotAvailable => {\n AER::NotFound(ApiError::new(\"HE\", 4, \"File not available\", None))\n }\n Self::MissingTenantId => {\n AER::InternalServerError(ApiError::new(\"HE\", 5, \"Missing Tenant ID in the request\".to_string(), None))\n }\n Self::InvalidTenant { tenant_id } => {\n AER::InternalServerError(ApiError::new(\"HE\", 5, format!(\"Invalid Tenant {tenant_id}\"), None))\n }\n Self::AmountConversionFailed { amount_type } => {\n AER::InternalServerError(ApiError::new(\"HE\", 6, format!(\"Failed to convert amount to {amount_type} type\"), None))\n }\n\n Self::NotImplemented { message } => {\n AER::NotImplemented(ApiError::new(\"IR\", 0, format!(\"{message:?}\"), None))\n }\n Self::Unauthorized => AER::Unauthorized(ApiError::new(\n \"IR\",\n 1,\n \"API key not provided or invalid API key used\", None\n )),\n Self::InvalidRequestUrl => {\n AER::NotFound(ApiError::new(\"IR\", 2, \"Unrecognized request URL\", None))\n }\n Self::InvalidHttpMethod => AER::MethodNotAllowed(ApiError::new(\n \"IR\",\n 3,\n \"The HTTP method is not applicable for this API\", None\n )),\n Self::MissingRequiredField { field_name } => AER::BadRequest(\n ApiError::new(\"IR\", 4, format!(\"Missing required param: {field_name}\"), None),\n ),\n Self::InvalidDataFormat {\n field_name,\n expected_format,\n } => AER::Unprocessable(ApiError::new(\n \"IR\",\n 5,\n format!(\n \"{field_name} contains invalid data. Expected format is {expected_format}\"\n ), None\n )),\n Self::InvalidRequestData { message } => {\n AER::Unprocessable(ApiError::new(\"IR\", 6, message.to_string(), None))\n }\n Self::InvalidDataValue { field_name } => AER::BadRequest(ApiError::new(\n \"IR\",\n 7,\n format!(\"Invalid value provided: {field_name}\"), None\n )),\n Self::ClientSecretNotGiven => AER::BadRequest(ApiError::new(\n \"IR\",\n 8,\n \"client_secret was not provided\", None\n )),\n Self::ClientSecretExpired => AER::BadRequest(ApiError::new(\n \"IR\",\n 8,\n \"The provided client_secret has expired\", None\n )),\n Self::ClientSecretInvalid => {\n AER::BadRequest(ApiError::new(\"IR\", 9, \"The client_secret provided does not match the client_secret associated with the Payment\", None))\n }\n Self::MandateActive => {\n AER::BadRequest(ApiError::new(\"IR\", 10, \"Customer has active mandate/subsciption\", None))\n }\n Self::CustomerRedacted => {\n AER::BadRequest(ApiError::new(\"IR\", 11, \"Customer has already been redacted\", None))\n }\n Self::MaximumRefundCount => AER::BadRequest(ApiError::new(\"IR\", 12, \"Reached maximum refund attempts\", None)),\n Self::RefundAmountExceedsPaymentAmount => {\n AER::BadRequest(ApiError::new(\"IR\", 13, \"The refund amount exceeds the amount captured\", None))\n }\n Self::PaymentUnexpectedState {\n current_flow,\n field_name,\n current_value,\n states,\n } => AER::BadRequest(ApiError::new(\"IR\", 14, format!(\"This Payment could not be {current_flow} because it has a {field_name} of {current_value}. The expected state is {states}\"), None)),\n Self::InvalidEphemeralKey => AER::Unauthorized(ApiError::new(\"IR\", 15, \"Invalid Ephemeral Key for the customer\", None)),\n Self::PreconditionFailed { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 16, message.to_string(), None))\n }\n Self::InvalidJwtToken => AER::Unauthorized(ApiError::new(\"IR\", 17, \"Access forbidden, invalid JWT token was used\", None)),\n Self::GenericUnauthorized { message } => {\n AER::Unauthorized(ApiError::new(\"IR\", 18, message.to_string(), None))\n },\n Self::NotSupported { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 19, \"Payment method type not supported\", Some(Extra {reason: Some(message.to_owned()), ..Default::default()})))\n },\n Self::FlowNotSupported { flow, connector } => {\n AER::BadRequest(ApiError::new(\"IR\", 20, format!(\"{flow} flow not supported\"), Some(Extra {connector: Some(connector.to_owned()), ..Default::default()}))) //FIXME: error message\n }\n Self::MissingRequiredFields { field_names } => AER::BadRequest(\n ApiError::new(\"IR\", 21, \"Missing required params\".to_string(), Some(Extra {data: Some(serde_json::json!(field_names)), ..Default::default() })),\n ),\n Self::AccessForbidden {resource} => {\n AER::ForbiddenCommonResource(ApiError::new(\"IR\", 22, format!(\"Access forbidden. Not authorized to access this resource {resource}\"), None))\n },\n Self::FileProviderNotSupported { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 23, message.to_string(), None))\n },\n Self::InvalidWalletToken { wallet_name} => AER::Unprocessable(ApiError::new(\n \"IR\",\n 24,\n format!(\"Invalid {wallet_name} wallet token\"), None\n )),\n Self::PaymentMethodDeleteFailed => {\n AER::BadRequest(ApiError::new(\"IR\", 25, \"Cannot delete the default payment method\", None))\n }\n Self::InvalidCookie => {\n AER::BadRequest(ApiError::new(\"IR\", 26, \"Invalid Cookie\", None))\n }\n Self::ExtendedCardInfoNotFound => {\n AER::NotFound(ApiError::new(\"IR\", 27, \"Extended card info does not exist\", None))\n }\n Self::CurrencyNotSupported { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 28, message, None))\n }\n Self::UnprocessableEntity {message} => AER::Unprocessable(ApiError::new(\"IR\", 29, message.to_string(), None)),\n Self::InvalidConnectorConfiguration {config} => {\n AER::BadRequest(ApiError::new(\"IR\", 30, format!(\"Merchant connector account is configured with invalid {config}\"), None))\n }\n Self::InvalidCardIin => AER::BadRequest(ApiError::new(\"IR\", 31, \"The provided card IIN does not exist\", None)),\n Self::InvalidCardIinLength => AER::BadRequest(ApiError::new(\"IR\", 32, \"The provided card IIN length is invalid, please provide an IIN with 6 digits\", None)),\n Self::MissingFile => {\n AER::BadRequest(ApiError::new(\"IR\", 33, \"File not found in the request\", None))\n }\n Self::MissingDisputeId => {\n AER::BadRequest(ApiError::new(\"IR\", 34, \"Dispute id not found in the request\", None))\n }\n Self::MissingFilePurpose => {\n AER::BadRequest(ApiError::new(\"IR\", 35, \"File purpose not found in the request or is invalid\", None))\n }\n Self::MissingFileContentType => {\n AER::BadRequest(ApiError::new(\"IR\", 36, \"File content type not found\", None))\n }\n Self::GenericNotFoundError { message } => {\n AER::NotFound(ApiError::new(\"IR\", 37, message, None))\n },\n Self::GenericDuplicateError { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 38, message, None))\n }\n Self::IncorrectPaymentMethodConfiguration => {\n AER::BadRequest(ApiError::new(\"IR\", 39, \"No eligible connector was found for the current payment method configuration\", None))\n }\n Self::LinkConfigurationError { message } => {\n AER::BadRequest(ApiError::new(\"IR\", 40, message, None))\n },\n Self::PayoutFailed { data } => {\n AER::BadRequest(ApiError::new(\"IR\", 41, \"Payout failed while processing with connector.\", Some(Extra { data: data.clone(), ..Default::default()})))\n },\n Self::CookieNotFound => {\n AER::Unauthorized(ApiError::new(\"IR\", 42, \"Cookies are not found in the request\", None))\n },\n\n Self::WebhookAuthenticationFailed => {\n AER::Unauthorized(ApiError::new(\"WE\", 1, \"Webhook authentication failed\", None))\n }\n Self::WebhookBadRequest => {\n AER::BadRequest(ApiError::new(\"WE\", 2, \"Bad request body received\", None))\n }\n Self::WebhookProcessingFailure => {\n AER::InternalServerError(ApiError::new(\"WE\", 3, \"There was an issue processing the webhook\", None))\n },\n Self::WebhookResourceNotFound => {\n AER::NotFound(ApiError::new(\"WE\", 4, \"Webhook resource was not found\", None))\n }\n Self::WebhookUnprocessableEntity => {\n AER::Unprocessable(ApiError::new(\"WE\", 5, \"There was an issue processing the webhook body\", None))\n },\n Self::WebhookInvalidMerchantSecret => {\n AER::BadRequest(ApiError::new(\"WE\", 6, \"Merchant Secret set for webhook source verification is invalid\", None))\n }\n Self::IntegrityCheckFailed {\n reason,\n field_names,\n connector_transaction_id\n } => AER::InternalServerError(ApiError::new(\n \"IE\",\n 0,\n format!(\"{} as data mismatched for {}\", reason, field_names),\n Some(Extra {\n connector_transaction_id: connector_transaction_id.to_owned(),\n ..Default::default()\n })\n )),\n }\n }", + "diff_span": { + "before": "", + "after": " AER::BadRequest(ApiError::new(\"IR\", 41, \"Payout failed while processing with connector.\", Some(Extra { data: data.clone(), ..Default::default()})))\n },\n Self::CookieNotFound => {\n AER::Unauthorized(ApiError::new(\"IR\", 42, \"Cookies are not found in the request\", None))\n },\n\n Self::WebhookAuthenticationFailed => {" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/hyperswitch_domain_models/src/errors/api_error_response.rs::enum::ApiErrorResponse", + "file": "crates/hyperswitch_domain_models/src/errors/api_error_response.rs", + "kind": "enum_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub enum ApiErrorResponse {\n #[error(error_type = ErrorType::ConnectorError, code = \"CE_00\", message = \"{code}: {message}\", ignore = \"status_code\")]\n ExternalConnectorError {\n code: String,\n message: String,\n connector: String,\n status_code: u16,\n reason: Option,\n },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_01\", message = \"Payment failed during authorization with connector. Retry payment\")]\n PaymentAuthorizationFailed { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_02\", message = \"Payment failed during authentication with connector. Retry payment\")]\n PaymentAuthenticationFailed { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_03\", message = \"Capture attempt failed while processing with connector\")]\n PaymentCaptureFailed { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_04\", message = \"The card data is invalid\")]\n InvalidCardData { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_05\", message = \"The card has expired\")]\n CardExpired { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_06\", message = \"Refund failed while processing with connector. Retry refund\")]\n RefundFailed { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_07\", message = \"Verification failed while processing with connector. Retry operation\")]\n VerificationFailed { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_08\", message = \"Dispute operation failed while processing with connector. Retry operation\")]\n DisputeFailed { data: Option },\n\n #[error(error_type = ErrorType::LockTimeout, code = \"HE_00\", message = \"Resource is busy. Please try again later.\")]\n ResourceBusy,\n #[error(error_type = ErrorType::ServerNotAvailable, code = \"HE_00\", message = \"Something went wrong\")]\n InternalServerError,\n #[error(error_type = ErrorType::ServerNotAvailable, code= \"HE_00\", message = \"{component} health check is failing with error: {message}\")]\n HealthCheckError {\n component: &'static str,\n message: String,\n },\n #[error(error_type = ErrorType::ValidationError, code = \"HE_00\", message = \"Failed to convert currency to minor unit\")]\n CurrencyConversionFailed,\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"Duplicate refund request. Refund already attempted with the refund ID\")]\n DuplicateRefundRequest,\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"Duplicate mandate request. Mandate already attempted with the Mandate ID\")]\n DuplicateMandate,\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The merchant account with the specified details already exists in our records\")]\n DuplicateMerchantAccount,\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The merchant connector account with the specified profile_id '{profile_id}' and connector_label '{connector_label}' already exists in our records\")]\n DuplicateMerchantConnectorAccount {\n profile_id: String,\n connector_label: String,\n },\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The payment method with the specified details already exists in our records\")]\n DuplicatePaymentMethod,\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The payment with the specified payment_id already exists in our records\")]\n DuplicatePayment {\n payment_id: common_utils::id_type::PaymentId,\n },\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The payout with the specified payout_id '{payout_id}' already exists in our records\")]\n DuplicatePayout { payout_id: String },\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The config with the specified key already exists in our records\")]\n DuplicateConfig,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Refund does not exist in our records\")]\n RefundNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Payment Link does not exist in our records\")]\n PaymentLinkNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Customer does not exist in our records\")]\n CustomerNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Config key does not exist in our records.\")]\n ConfigNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Payment does not exist in our records\")]\n PaymentNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Payment method does not exist in our records\")]\n PaymentMethodNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Merchant account does not exist in our records\")]\n MerchantAccountNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Merchant connector account does not exist in our records\")]\n MerchantConnectorAccountNotFound { id: String },\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Business profile with the given id '{id}' does not exist in our records\")]\n ProfileNotFound { id: String },\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Poll with the given id '{id}' does not exist in our records\")]\n PollNotFound { id: String },\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Resource ID does not exist in our records\")]\n ResourceIdNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Mandate does not exist in our records\")]\n MandateNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Authentication does not exist in our records\")]\n AuthenticationNotFound { id: String },\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Failed to update mandate\")]\n MandateUpdateFailed,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"API Key does not exist in our records\")]\n ApiKeyNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Payout does not exist in our records\")]\n PayoutNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Event does not exist in our records\")]\n EventNotFound,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"Invalid mandate id passed from connector\")]\n MandateSerializationFailed,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"Unable to parse the mandate identifier passed from connector\")]\n MandateDeserializationFailed,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"Return URL is not configured and not passed in payments request\")]\n ReturnUrlUnavailable,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"This refund is not possible through Hyperswitch. Please raise the refund through {connector} dashboard\")]\n RefundNotPossible { connector: String },\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"Mandate Validation Failed\" )]\n MandateValidationFailed { reason: String },\n #[error(error_type= ErrorType::ValidationError, code = \"HE_03\", message = \"The payment has not succeeded yet. Please pass a successful payment to initiate refund\")]\n PaymentNotSucceeded,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"The specified merchant connector account is disabled\")]\n MerchantConnectorAccountDisabled,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"{code}: {message}\")]\n PaymentBlockedError {\n code: u16,\n message: String,\n status: String,\n reason: String,\n },\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"File validation failed\")]\n FileValidationFailed { reason: String },\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"Dispute status validation failed\")]\n DisputeStatusValidationFailed { reason: String },\n #[error(error_type= ErrorType::ObjectNotFound, code = \"HE_04\", message = \"Successful payment not found for the given payment id\")]\n SuccessfulPaymentNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_04\", message = \"The connector provided in the request is incorrect or not available\")]\n IncorrectConnectorNameGiven,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_04\", message = \"Address does not exist in our records\")]\n AddressNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_04\", message = \"Dispute does not exist in our records\")]\n DisputeNotFound { dispute_id: String },\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_04\", message = \"File does not exist in our records\")]\n FileNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_04\", message = \"File not available\")]\n FileNotAvailable,\n #[error(error_type = ErrorType::ProcessingError, code = \"HE_05\", message = \"Missing tenant id\")]\n MissingTenantId,\n #[error(error_type = ErrorType::ProcessingError, code = \"HE_05\", message = \"Invalid tenant id: {tenant_id}\")]\n InvalidTenant { tenant_id: String },\n #[error(error_type = ErrorType::ValidationError, code = \"HE_06\", message = \"Failed to convert amount to {amount_type} type\")]\n AmountConversionFailed { amount_type: &'static str },\n #[error(error_type = ErrorType::ServerNotAvailable, code = \"IR_00\", message = \"{message:?}\")]\n NotImplemented { message: NotImplementedMessage },\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_01\",\n message = \"API key not provided or invalid API key used\"\n )]\n Unauthorized,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_02\", message = \"Unrecognized request URL\")]\n InvalidRequestUrl,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_03\", message = \"The HTTP method is not applicable for this API\")]\n InvalidHttpMethod,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_04\", message = \"Missing required param: {field_name}\")]\n MissingRequiredField { field_name: &'static str },\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_05\",\n message = \"{field_name} contains invalid data. Expected format is {expected_format}\"\n )]\n InvalidDataFormat {\n field_name: String,\n expected_format: String,\n },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_06\", message = \"{message}\")]\n InvalidRequestData { message: String },\n /// Typically used when a field has invalid value, or deserialization of the value contained in a field fails.\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_07\", message = \"Invalid value provided: {field_name}\")]\n InvalidDataValue { field_name: &'static str },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_08\", message = \"Client secret was not provided\")]\n ClientSecretNotGiven,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_08\", message = \"Client secret has expired\")]\n ClientSecretExpired,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_09\", message = \"The client_secret provided does not match the client_secret associated with the Payment\")]\n ClientSecretInvalid,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_10\", message = \"Customer has active mandate/subsciption\")]\n MandateActive,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_11\", message = \"Customer has already been redacted\")]\n CustomerRedacted,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_12\", message = \"Reached maximum refund attempts\")]\n MaximumRefundCount,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_13\", message = \"The refund amount exceeds the amount captured\")]\n RefundAmountExceedsPaymentAmount,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_14\", message = \"This Payment could not be {current_flow} because it has a {field_name} of {current_value}. The expected state is {states}\")]\n PaymentUnexpectedState {\n current_flow: String,\n field_name: String,\n current_value: String,\n states: String,\n },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_15\", message = \"Invalid Ephemeral Key for the customer\")]\n InvalidEphemeralKey,\n /// Typically used when information involving multiple fields or previously provided information doesn't satisfy a condition.\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_16\", message = \"{message}\")]\n PreconditionFailed { message: String },\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_17\",\n message = \"Access forbidden, invalid JWT token was used\"\n )]\n InvalidJwtToken,\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_18\",\n message = \"{message}\",\n )]\n GenericUnauthorized { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_19\", message = \"{message}\")]\n NotSupported { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_20\", message = \"{flow} flow not supported by the {connector} connector\")]\n FlowNotSupported { flow: String, connector: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_21\", message = \"Missing required params\")]\n MissingRequiredFields { field_names: Vec<&'static str> },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_22\", message = \"Access forbidden. Not authorized to access this resource {resource}\")]\n AccessForbidden { resource: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_23\", message = \"{message}\")]\n FileProviderNotSupported { message: String },\n #[error(\n error_type = ErrorType::ProcessingError, code = \"IR_24\",\n message = \"Invalid {wallet_name} wallet token\"\n )]\n InvalidWalletToken { wallet_name: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_25\", message = \"Cannot delete the default payment method\")]\n PaymentMethodDeleteFailed,\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_26\",\n message = \"Invalid Cookie\"\n )]\n InvalidCookie,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_27\", message = \"Extended card info does not exist\")]\n ExtendedCardInfoNotFound,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_28\", message = \"{message}\")]\n CurrencyNotSupported { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_29\", message = \"{message}\")]\n UnprocessableEntity { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_30\", message = \"Merchant connector account is configured with invalid {config}\")]\n InvalidConnectorConfiguration { config: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_31\", message = \"Card with the provided iin does not exist\")]\n InvalidCardIin,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_32\", message = \"The provided card IIN length is invalid, please provide an iin with 6 or 8 digits\")]\n InvalidCardIinLength,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_33\", message = \"File not found / valid in the request\")]\n MissingFile,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_34\", message = \"Dispute id not found in the request\")]\n MissingDisputeId,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_35\", message = \"File purpose not found in the request or is invalid\")]\n MissingFilePurpose,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_36\", message = \"File content type not found / valid\")]\n MissingFileContentType,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_37\", message = \"{message}\")]\n GenericNotFoundError { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_38\", message = \"{message}\")]\n GenericDuplicateError { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_39\", message = \"required payment method is not configured or configured incorrectly for all configured connectors\")]\n IncorrectPaymentMethodConfiguration,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_40\", message = \"{message}\")]\n LinkConfigurationError { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_41\", message = \"Payout validation failed\")]\n PayoutFailed { data: Option },\n\n #[error(error_type = ErrorType::InvalidRequestError, code = \"WE_01\", message = \"Failed to authenticate the webhook\")]\n WebhookAuthenticationFailed,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"WE_02\", message = \"Bad request received in webhook\")]\n WebhookBadRequest,\n #[error(error_type = ErrorType::RouterError, code = \"WE_03\", message = \"There was some issue processing the webhook\")]\n WebhookProcessingFailure,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"WE_04\", message = \"Webhook resource not found\")]\n WebhookResourceNotFound,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"WE_05\", message = \"Unable to process the webhook body\")]\n WebhookUnprocessableEntity,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"WE_06\", message = \"Merchant Secret set my merchant for webhook source verification is invalid\")]\n WebhookInvalidMerchantSecret,\n #[error(error_type = ErrorType::ServerNotAvailable, code = \"IE\", message = \"{reason} as data mismatched for {field_names}\")]\n IntegrityCheckFailed {\n reason: String,\n field_names: String,\n connector_transaction_id: Option,\n },\n}", + "after_code": "pub enum ApiErrorResponse {\n #[error(error_type = ErrorType::ConnectorError, code = \"CE_00\", message = \"{code}: {message}\", ignore = \"status_code\")]\n ExternalConnectorError {\n code: String,\n message: String,\n connector: String,\n status_code: u16,\n reason: Option,\n },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_01\", message = \"Payment failed during authorization with connector. Retry payment\")]\n PaymentAuthorizationFailed { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_02\", message = \"Payment failed during authentication with connector. Retry payment\")]\n PaymentAuthenticationFailed { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_03\", message = \"Capture attempt failed while processing with connector\")]\n PaymentCaptureFailed { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_04\", message = \"The card data is invalid\")]\n InvalidCardData { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_05\", message = \"The card has expired\")]\n CardExpired { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_06\", message = \"Refund failed while processing with connector. Retry refund\")]\n RefundFailed { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_07\", message = \"Verification failed while processing with connector. Retry operation\")]\n VerificationFailed { data: Option },\n #[error(error_type = ErrorType::ProcessingError, code = \"CE_08\", message = \"Dispute operation failed while processing with connector. Retry operation\")]\n DisputeFailed { data: Option },\n\n #[error(error_type = ErrorType::LockTimeout, code = \"HE_00\", message = \"Resource is busy. Please try again later.\")]\n ResourceBusy,\n #[error(error_type = ErrorType::ServerNotAvailable, code = \"HE_00\", message = \"Something went wrong\")]\n InternalServerError,\n #[error(error_type = ErrorType::ServerNotAvailable, code= \"HE_00\", message = \"{component} health check is failing with error: {message}\")]\n HealthCheckError {\n component: &'static str,\n message: String,\n },\n #[error(error_type = ErrorType::ValidationError, code = \"HE_00\", message = \"Failed to convert currency to minor unit\")]\n CurrencyConversionFailed,\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"Duplicate refund request. Refund already attempted with the refund ID\")]\n DuplicateRefundRequest,\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"Duplicate mandate request. Mandate already attempted with the Mandate ID\")]\n DuplicateMandate,\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The merchant account with the specified details already exists in our records\")]\n DuplicateMerchantAccount,\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The merchant connector account with the specified profile_id '{profile_id}' and connector_label '{connector_label}' already exists in our records\")]\n DuplicateMerchantConnectorAccount {\n profile_id: String,\n connector_label: String,\n },\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The payment method with the specified details already exists in our records\")]\n DuplicatePaymentMethod,\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The payment with the specified payment_id already exists in our records\")]\n DuplicatePayment {\n payment_id: common_utils::id_type::PaymentId,\n },\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The payout with the specified payout_id '{payout_id}' already exists in our records\")]\n DuplicatePayout { payout_id: String },\n #[error(error_type = ErrorType::DuplicateRequest, code = \"HE_01\", message = \"The config with the specified key already exists in our records\")]\n DuplicateConfig,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Refund does not exist in our records\")]\n RefundNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Payment Link does not exist in our records\")]\n PaymentLinkNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Customer does not exist in our records\")]\n CustomerNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Config key does not exist in our records.\")]\n ConfigNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Payment does not exist in our records\")]\n PaymentNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Payment method does not exist in our records\")]\n PaymentMethodNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Merchant account does not exist in our records\")]\n MerchantAccountNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Merchant connector account does not exist in our records\")]\n MerchantConnectorAccountNotFound { id: String },\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Business profile with the given id '{id}' does not exist in our records\")]\n ProfileNotFound { id: String },\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Poll with the given id '{id}' does not exist in our records\")]\n PollNotFound { id: String },\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Resource ID does not exist in our records\")]\n ResourceIdNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Mandate does not exist in our records\")]\n MandateNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Authentication does not exist in our records\")]\n AuthenticationNotFound { id: String },\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Failed to update mandate\")]\n MandateUpdateFailed,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"API Key does not exist in our records\")]\n ApiKeyNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Payout does not exist in our records\")]\n PayoutNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_02\", message = \"Event does not exist in our records\")]\n EventNotFound,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"Invalid mandate id passed from connector\")]\n MandateSerializationFailed,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"Unable to parse the mandate identifier passed from connector\")]\n MandateDeserializationFailed,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"Return URL is not configured and not passed in payments request\")]\n ReturnUrlUnavailable,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"This refund is not possible through Hyperswitch. Please raise the refund through {connector} dashboard\")]\n RefundNotPossible { connector: String },\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"Mandate Validation Failed\" )]\n MandateValidationFailed { reason: String },\n #[error(error_type= ErrorType::ValidationError, code = \"HE_03\", message = \"The payment has not succeeded yet. Please pass a successful payment to initiate refund\")]\n PaymentNotSucceeded,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"The specified merchant connector account is disabled\")]\n MerchantConnectorAccountDisabled,\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"{code}: {message}\")]\n PaymentBlockedError {\n code: u16,\n message: String,\n status: String,\n reason: String,\n },\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"File validation failed\")]\n FileValidationFailed { reason: String },\n #[error(error_type = ErrorType::ValidationError, code = \"HE_03\", message = \"Dispute status validation failed\")]\n DisputeStatusValidationFailed { reason: String },\n #[error(error_type= ErrorType::ObjectNotFound, code = \"HE_04\", message = \"Successful payment not found for the given payment id\")]\n SuccessfulPaymentNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_04\", message = \"The connector provided in the request is incorrect or not available\")]\n IncorrectConnectorNameGiven,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_04\", message = \"Address does not exist in our records\")]\n AddressNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_04\", message = \"Dispute does not exist in our records\")]\n DisputeNotFound { dispute_id: String },\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_04\", message = \"File does not exist in our records\")]\n FileNotFound,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"HE_04\", message = \"File not available\")]\n FileNotAvailable,\n #[error(error_type = ErrorType::ProcessingError, code = \"HE_05\", message = \"Missing tenant id\")]\n MissingTenantId,\n #[error(error_type = ErrorType::ProcessingError, code = \"HE_05\", message = \"Invalid tenant id: {tenant_id}\")]\n InvalidTenant { tenant_id: String },\n #[error(error_type = ErrorType::ValidationError, code = \"HE_06\", message = \"Failed to convert amount to {amount_type} type\")]\n AmountConversionFailed { amount_type: &'static str },\n #[error(error_type = ErrorType::ServerNotAvailable, code = \"IR_00\", message = \"{message:?}\")]\n NotImplemented { message: NotImplementedMessage },\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_01\",\n message = \"API key not provided or invalid API key used\"\n )]\n Unauthorized,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_02\", message = \"Unrecognized request URL\")]\n InvalidRequestUrl,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_03\", message = \"The HTTP method is not applicable for this API\")]\n InvalidHttpMethod,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_04\", message = \"Missing required param: {field_name}\")]\n MissingRequiredField { field_name: &'static str },\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_05\",\n message = \"{field_name} contains invalid data. Expected format is {expected_format}\"\n )]\n InvalidDataFormat {\n field_name: String,\n expected_format: String,\n },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_06\", message = \"{message}\")]\n InvalidRequestData { message: String },\n /// Typically used when a field has invalid value, or deserialization of the value contained in a field fails.\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_07\", message = \"Invalid value provided: {field_name}\")]\n InvalidDataValue { field_name: &'static str },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_08\", message = \"Client secret was not provided\")]\n ClientSecretNotGiven,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_08\", message = \"Client secret has expired\")]\n ClientSecretExpired,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_09\", message = \"The client_secret provided does not match the client_secret associated with the Payment\")]\n ClientSecretInvalid,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_10\", message = \"Customer has active mandate/subsciption\")]\n MandateActive,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_11\", message = \"Customer has already been redacted\")]\n CustomerRedacted,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_12\", message = \"Reached maximum refund attempts\")]\n MaximumRefundCount,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_13\", message = \"The refund amount exceeds the amount captured\")]\n RefundAmountExceedsPaymentAmount,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_14\", message = \"This Payment could not be {current_flow} because it has a {field_name} of {current_value}. The expected state is {states}\")]\n PaymentUnexpectedState {\n current_flow: String,\n field_name: String,\n current_value: String,\n states: String,\n },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_15\", message = \"Invalid Ephemeral Key for the customer\")]\n InvalidEphemeralKey,\n /// Typically used when information involving multiple fields or previously provided information doesn't satisfy a condition.\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_16\", message = \"{message}\")]\n PreconditionFailed { message: String },\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_17\",\n message = \"Access forbidden, invalid JWT token was used\"\n )]\n InvalidJwtToken,\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_18\",\n message = \"{message}\",\n )]\n GenericUnauthorized { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_19\", message = \"{message}\")]\n NotSupported { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_20\", message = \"{flow} flow not supported by the {connector} connector\")]\n FlowNotSupported { flow: String, connector: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_21\", message = \"Missing required params\")]\n MissingRequiredFields { field_names: Vec<&'static str> },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_22\", message = \"Access forbidden. Not authorized to access this resource {resource}\")]\n AccessForbidden { resource: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_23\", message = \"{message}\")]\n FileProviderNotSupported { message: String },\n #[error(\n error_type = ErrorType::ProcessingError, code = \"IR_24\",\n message = \"Invalid {wallet_name} wallet token\"\n )]\n InvalidWalletToken { wallet_name: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_25\", message = \"Cannot delete the default payment method\")]\n PaymentMethodDeleteFailed,\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_26\",\n message = \"Invalid Cookie\"\n )]\n InvalidCookie,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_27\", message = \"Extended card info does not exist\")]\n ExtendedCardInfoNotFound,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_28\", message = \"{message}\")]\n CurrencyNotSupported { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_29\", message = \"{message}\")]\n UnprocessableEntity { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_30\", message = \"Merchant connector account is configured with invalid {config}\")]\n InvalidConnectorConfiguration { config: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_31\", message = \"Card with the provided iin does not exist\")]\n InvalidCardIin,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_32\", message = \"The provided card IIN length is invalid, please provide an iin with 6 or 8 digits\")]\n InvalidCardIinLength,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_33\", message = \"File not found / valid in the request\")]\n MissingFile,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_34\", message = \"Dispute id not found in the request\")]\n MissingDisputeId,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_35\", message = \"File purpose not found in the request or is invalid\")]\n MissingFilePurpose,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_36\", message = \"File content type not found / valid\")]\n MissingFileContentType,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_37\", message = \"{message}\")]\n GenericNotFoundError { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_38\", message = \"{message}\")]\n GenericDuplicateError { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_39\", message = \"required payment method is not configured or configured incorrectly for all configured connectors\")]\n IncorrectPaymentMethodConfiguration,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_40\", message = \"{message}\")]\n LinkConfigurationError { message: String },\n #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_41\", message = \"Payout validation failed\")]\n PayoutFailed { data: Option },\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_42\",\n message = \"Cookies are not found in the request\"\n )]\n CookieNotFound,\n\n #[error(error_type = ErrorType::InvalidRequestError, code = \"WE_01\", message = \"Failed to authenticate the webhook\")]\n WebhookAuthenticationFailed,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"WE_02\", message = \"Bad request received in webhook\")]\n WebhookBadRequest,\n #[error(error_type = ErrorType::RouterError, code = \"WE_03\", message = \"There was some issue processing the webhook\")]\n WebhookProcessingFailure,\n #[error(error_type = ErrorType::ObjectNotFound, code = \"WE_04\", message = \"Webhook resource not found\")]\n WebhookResourceNotFound,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"WE_05\", message = \"Unable to process the webhook body\")]\n WebhookUnprocessableEntity,\n #[error(error_type = ErrorType::InvalidRequestError, code = \"WE_06\", message = \"Merchant Secret set my merchant for webhook source verification is invalid\")]\n WebhookInvalidMerchantSecret,\n #[error(error_type = ErrorType::ServerNotAvailable, code = \"IE\", message = \"{reason} as data mismatched for {field_names}\")]\n IntegrityCheckFailed {\n reason: String,\n field_names: String,\n connector_transaction_id: Option,\n },\n}", + "diff_span": { + "before": "", + "after": " #[error(error_type = ErrorType::InvalidRequestError, code = \"IR_41\", message = \"Payout validation failed\")]\n PayoutFailed { data: Option },\n #[error(\n error_type = ErrorType::InvalidRequestError, code = \"IR_42\",\n message = \"Cookies are not found in the request\"\n )]\n CookieNotFound,\n\n #[error(error_type = ErrorType::InvalidRequestError, code = \"WE_01\", message = \"Failed to authenticate the webhook\")]" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/core/user.rs::function::resend_invite", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn resend_invite(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n request: user_api::ReInviteUserRequest,\n auth_id: Option,\n) -> UserResponse<()> {\n let invitee_email = domain::UserEmail::from_pii_email(request.email)?;\n let user: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&invitee_email.clone().into_inner())\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::InvalidRoleOperation)\n .attach_printable(\"User not found in the records\")\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?\n .into();\n\n let user_role = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(err) => {\n if err.current_context().is_db_not_found() {\n None\n } else {\n return Err(report!(UserErrors::InternalServerError));\n }\n }\n };\n\n let user_role = match user_role {\n Some(user_role) => user_role,\n None => state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperationWithMessage(\n \"User not found in records\".to_string(),\n ))?,\n };\n\n if !matches!(user_role.status, UserStatus::InvitationSent) {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"User status is not InvitationSent\".to_string());\n }\n\n let (entity_id, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n\n let email_contents = email_types::InviteUser {\n recipient_email: invitee_email,\n user_name: domain::UserName::new(user.get_name())?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_INVITATION,\n entity: email_types::Entity {\n entity_id,\n entity_type,\n },\n auth_id: auth_id.clone(),\n };\n\n state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "after_code": "pub async fn resend_invite(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n request: user_api::ReInviteUserRequest,\n auth_id: Option,\n) -> UserResponse<()> {\n let invitee_email = domain::UserEmail::from_pii_email(request.email)?;\n let user: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&invitee_email)\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::InvalidRoleOperation)\n .attach_printable(\"User not found in the records\")\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?\n .into();\n\n let user_role = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(err) => {\n if err.current_context().is_db_not_found() {\n None\n } else {\n return Err(report!(UserErrors::InternalServerError));\n }\n }\n };\n\n let user_role = match user_role {\n Some(user_role) => user_role,\n None => state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperationWithMessage(\n \"User not found in records\".to_string(),\n ))?,\n };\n\n if !matches!(user_role.status, UserStatus::InvitationSent) {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"User status is not InvitationSent\".to_string());\n }\n\n let (entity_id, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n\n let email_contents = email_types::InviteUser {\n recipient_email: invitee_email,\n user_name: domain::UserName::new(user.get_name())?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_INVITATION,\n entity: email_types::Entity {\n entity_id,\n entity_type,\n },\n auth_id: auth_id.clone(),\n };\n\n state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "diff_span": { + "before": " let user: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&invitee_email.clone().into_inner())\n .await\n .map_err(|e| {", + "after": " let user: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&invitee_email)\n .await\n .map_err(|e| {" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/db/user.rs::trait::UserInterface", + "file": "crates/router/src/db/user.rs", + "kind": "trait_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub trait UserInterface {\n async fn insert_user(\n &self,\n user_data: storage::UserNew,\n ) -> CustomResult;\n\n async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult;\n\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult;\n\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n user: storage::UserUpdate,\n ) -> CustomResult;\n\n async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n user: storage::UserUpdate,\n ) -> CustomResult;\n\n async fn delete_user_by_user_id(\n &self,\n user_id: &str,\n ) -> CustomResult;\n\n async fn find_users_by_user_ids(\n &self,\n user_ids: Vec,\n ) -> CustomResult, errors::StorageError>;\n}", + "after_code": "pub trait UserInterface {\n async fn insert_user(\n &self,\n user_data: storage::UserNew,\n ) -> CustomResult;\n\n async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult;\n\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult;\n\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n user: storage::UserUpdate,\n ) -> CustomResult;\n\n async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n user: storage::UserUpdate,\n ) -> CustomResult;\n\n async fn delete_user_by_user_id(\n &self,\n user_id: &str,\n ) -> CustomResult;\n\n async fn find_users_by_user_ids(\n &self,\n user_ids: Vec,\n ) -> CustomResult, errors::StorageError>;\n}", + "diff_span": { + "before": " async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult;\n\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult;\n\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n user: storage::UserUpdate,\n ) -> CustomResult;\n\n async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n user: storage::UserUpdate,\n ) -> CustomResult;", + "after": " async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult;\n\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult;\n\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n user: storage::UserUpdate,\n ) -> CustomResult;\n\n async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n user: storage::UserUpdate,\n ) -> CustomResult;" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [], + "after_imports": [ + "use super::{domain, MockDb};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::ResetPassword::function::get_email_data", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::ResetPassword,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let reset_password_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"set_password\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::Reset {\n link: reset_password_link,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "after_code": "async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::ResetPassword,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let reset_password_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"set_password\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::Reset {\n link: reset_password_link,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::impl::VerifyEmail", + "file": "crates/router/src/services/email/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl EmailData for VerifyEmail {\n async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::VerifyEmail,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let verify_email_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"verify_email\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::Verify {\n link: verify_email_link,\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "after_code": "impl EmailData for VerifyEmail {\n async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::VerifyEmail,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let verify_email_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"verify_email\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::Verify {\n link: verify_email_link,\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::ProFeatureRequest::function::get_email_data", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_email_data(&self) -> CustomResult {\n let recipient = self.recipient_email.clone().into_inner();\n\n let body = html::get_html_body(EmailBody::ProFeatureRequest {\n user_name: self.user_name.clone().get_secret().expose(),\n feature_name: self.feature_name.clone(),\n merchant_id: self.merchant_id.clone(),\n user_email: self.user_email.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.clone(),\n body: external_services::email::IntermediateString::new(body),\n recipient,\n })\n }", + "after_code": "async fn get_email_data(&self) -> CustomResult {\n let recipient = self.recipient_email.clone().into_inner();\n\n let body = html::get_html_body(EmailBody::ProFeatureRequest {\n user_name: self.user_name.clone().get_secret().expose(),\n feature_name: self.feature_name.clone(),\n merchant_id: self.merchant_id.clone(),\n user_email: self.user_email.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.clone(),\n body: external_services::email::IntermediateString::new(body),\n recipient,\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::impl::WelcomeToCommunity", + "file": "crates/router/src/services/email/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl EmailData for WelcomeToCommunity {\n async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::WelcomeToCommunity);\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "after_code": "impl EmailData for WelcomeToCommunity {\n async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::WelcomeToCommunity);\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::struct::BizEmailProd", + "file": "crates/router/src/services/email/types.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct BizEmailProd {\n pub recipient_email: domain::UserEmail,\n pub user_name: Secret,\n pub poc_email: Secret,\n pub legal_business_name: String,\n pub business_location: String,\n pub business_website: String,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n}", + "after_code": "pub struct BizEmailProd {\n pub recipient_email: domain::UserEmail,\n pub user_name: Secret,\n pub poc_email: Secret,\n pub legal_business_name: String,\n pub business_location: String,\n pub business_website: String,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use masking::{ExposeInterface, Secret};" + ], + "after_imports": [ + "use masking::{ExposeInterface, Secret};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::mod::html", + "file": "crates/router/src/services/email/types.rs", + "kind": "mod_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub mod html {\n use crate::services::email::types::EmailBody;\n\n pub fn get_html_body(email_body: EmailBody) -> String {\n match email_body {\n EmailBody::Verify { link } => {\n format!(include_str!(\"assets/verify.html\"), link = link)\n }\n EmailBody::Reset { link, user_name } => {\n format!(\n include_str!(\"assets/reset.html\"),\n link = link,\n username = user_name\n )\n }\n EmailBody::MagicLink { link, user_name } => {\n format!(\n include_str!(\"assets/magic_link.html\"),\n username = user_name,\n link = link\n )\n }\n EmailBody::InviteUser { link, user_name } => {\n format!(\n include_str!(\"assets/invite.html\"),\n username = user_name,\n link = link\n )\n }\n // TODO: Change the linked html for accept invite from email\n EmailBody::AcceptInviteFromEmail { link, user_name } => {\n format!(\n include_str!(\"assets/invite.html\"),\n username = user_name,\n link = link\n )\n }\n EmailBody::ReconActivation { user_name } => {\n format!(\n include_str!(\"assets/recon_activation.html\"),\n username = user_name,\n )\n }\n EmailBody::BizEmailProd {\n user_name,\n poc_email,\n legal_business_name,\n business_location,\n business_website,\n } => {\n format!(\n include_str!(\"assets/bizemailprod.html\"),\n poc_email = poc_email,\n legal_business_name = legal_business_name,\n business_location = business_location,\n business_website = business_website,\n username = user_name,\n )\n }\n EmailBody::ProFeatureRequest {\n feature_name,\n merchant_id,\n user_name,\n user_email,\n } => format!(\n \"Dear Hyperswitch Support Team,\n\nDashboard Pro Feature Request,\nFeature name : {feature_name}\nMerchant ID : {}\nMerchant Name : {user_name}\nEmail : {user_email}\n\n(note: This is an auto generated email. Use merchant email for any further communications)\",\n merchant_id.get_string_repr()\n ),\n EmailBody::ApiKeyExpiryReminder {\n expires_in,\n api_key_name,\n prefix,\n } => format!(\n include_str!(\"assets/api_key_expiry_reminder.html\"),\n api_key_name = api_key_name,\n prefix = prefix,\n expires_in = expires_in,\n ),\n EmailBody::WelcomeToCommunity => {\n include_str!(\"assets/welcome_to_community.html\").to_string()\n }\n }\n }\n}", + "after_code": "pub mod html {\n use crate::services::email::types::EmailBody;\n\n pub fn get_html_body(email_body: EmailBody) -> String {\n match email_body {\n EmailBody::Verify { link } => {\n format!(include_str!(\"assets/verify.html\"), link = link)\n }\n EmailBody::Reset { link, user_name } => {\n format!(\n include_str!(\"assets/reset.html\"),\n link = link,\n username = user_name\n )\n }\n EmailBody::MagicLink { link, user_name } => {\n format!(\n include_str!(\"assets/magic_link.html\"),\n username = user_name,\n link = link\n )\n }\n EmailBody::InviteUser { link, user_name } => {\n format!(\n include_str!(\"assets/invite.html\"),\n username = user_name,\n link = link\n )\n }\n // TODO: Change the linked html for accept invite from email\n EmailBody::AcceptInviteFromEmail { link, user_name } => {\n format!(\n include_str!(\"assets/invite.html\"),\n username = user_name,\n link = link\n )\n }\n EmailBody::ReconActivation { user_name } => {\n format!(\n include_str!(\"assets/recon_activation.html\"),\n username = user_name,\n )\n }\n EmailBody::BizEmailProd {\n user_name,\n poc_email,\n legal_business_name,\n business_location,\n business_website,\n } => {\n format!(\n include_str!(\"assets/bizemailprod.html\"),\n poc_email = poc_email,\n legal_business_name = legal_business_name,\n business_location = business_location,\n business_website = business_website,\n username = user_name,\n )\n }\n EmailBody::ProFeatureRequest {\n feature_name,\n merchant_id,\n user_name,\n user_email,\n } => format!(\n \"Dear Hyperswitch Support Team,\n\nDashboard Pro Feature Request,\nFeature name : {feature_name}\nMerchant ID : {}\nMerchant Name : {user_name}\nEmail : {user_email}\n\n(note: This is an auto generated email. Use merchant email for any further communications)\",\n merchant_id.get_string_repr()\n ),\n EmailBody::ApiKeyExpiryReminder {\n expires_in,\n api_key_name,\n prefix,\n } => format!(\n include_str!(\"assets/api_key_expiry_reminder.html\"),\n api_key_name = api_key_name,\n prefix = prefix,\n expires_in = expires_in,\n ),\n EmailBody::WelcomeToCommunity => {\n include_str!(\"assets/welcome_to_community.html\").to_string()\n }\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::WelcomeToCommunity::function::get_email_data", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::WelcomeToCommunity);\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "after_code": "async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::WelcomeToCommunity);\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::BizEmailProd::function::get_email_data", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::BizEmailProd {\n user_name: self.user_name.clone().expose(),\n poc_email: self.poc_email.clone().expose(),\n legal_business_name: self.legal_business_name.clone(),\n business_location: self.business_location.clone(),\n business_website: self.business_website.clone(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "after_code": "async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::BizEmailProd {\n user_name: self.user_name.clone().expose(),\n poc_email: self.poc_email.clone().expose(),\n legal_business_name: self.legal_business_name.clone(),\n business_location: self.business_location.clone(),\n business_website: self.business_website.clone(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::MagicLink::function::get_email_data", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::MagicLink,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let magic_link_login = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"verify_email\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::MagicLink {\n link: magic_link_login,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "after_code": "async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::MagicLink,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let magic_link_login = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"verify_email\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::MagicLink {\n link: magic_link_login,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::impl::ReconActivation", + "file": "crates/router/src/services/email/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl EmailData for ReconActivation {\n async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::ReconActivation {\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "after_code": "impl EmailData for ReconActivation {\n async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::ReconActivation {\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::enum::EmailBody", + "file": "crates/router/src/services/email/types.rs", + "kind": "enum_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub enum EmailBody {\n Verify {\n link: String,\n },\n Reset {\n link: String,\n user_name: String,\n },\n MagicLink {\n link: String,\n user_name: String,\n },\n InviteUser {\n link: String,\n user_name: String,\n },\n AcceptInviteFromEmail {\n link: String,\n user_name: String,\n },\n BizEmailProd {\n user_name: String,\n poc_email: String,\n legal_business_name: String,\n business_location: String,\n business_website: String,\n },\n ReconActivation {\n user_name: String,\n },\n ProFeatureRequest {\n feature_name: String,\n merchant_id: common_utils::id_type::MerchantId,\n user_name: String,\n user_email: String,\n },\n ApiKeyExpiryReminder {\n expires_in: u8,\n api_key_name: String,\n prefix: String,\n },\n WelcomeToCommunity,\n}", + "after_code": "pub enum EmailBody {\n Verify {\n link: String,\n },\n Reset {\n link: String,\n user_name: String,\n },\n MagicLink {\n link: String,\n user_name: String,\n },\n InviteUser {\n link: String,\n user_name: String,\n },\n AcceptInviteFromEmail {\n link: String,\n user_name: String,\n },\n BizEmailProd {\n user_name: String,\n poc_email: String,\n legal_business_name: String,\n business_location: String,\n business_website: String,\n },\n ReconActivation {\n user_name: String,\n },\n ProFeatureRequest {\n feature_name: String,\n merchant_id: common_utils::id_type::MerchantId,\n user_name: String,\n user_email: String,\n },\n ApiKeyExpiryReminder {\n expires_in: u8,\n api_key_name: String,\n prefix: String,\n },\n WelcomeToCommunity,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::EmailToken::function::new_token", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub async fn new_token(\n email: domain::UserEmail,\n entity: Option,\n flow: domain::Origin,\n settings: &configs::Settings,\n ) -> CustomResult {\n let expiration_duration = std::time::Duration::from_secs(consts::EMAIL_TOKEN_TIME_IN_SECS);\n let exp = jwt::generate_exp(expiration_duration)?.as_secs();\n let token_payload = Self {\n email: email.get_secret().expose(),\n flow,\n exp,\n entity,\n };\n jwt::generate_jwt(&token_payload, settings).await\n }", + "after_code": "pub async fn new_token(\n email: domain::UserEmail,\n entity: Option,\n flow: domain::Origin,\n settings: &configs::Settings,\n ) -> UserResult {\n let expiration_duration = std::time::Duration::from_secs(consts::EMAIL_TOKEN_TIME_IN_SECS);\n let exp = jwt::generate_exp(expiration_duration)?.as_secs();\n let token_payload = Self {\n email: email.get_secret().expose(),\n flow,\n exp,\n entity,\n };\n jwt::generate_jwt(&token_payload, settings).await\n }", + "diff_span": { + "before": " flow: domain::Origin,\n settings: &configs::Settings,\n ) -> CustomResult {\n let expiration_duration = std::time::Duration::from_secs(consts::EMAIL_TOKEN_TIME_IN_SECS);\n let exp = jwt::generate_exp(expiration_duration)?.as_secs();", + "after": " flow: domain::Origin,\n settings: &configs::Settings,\n ) -> UserResult {\n let expiration_duration = std::time::Duration::from_secs(consts::EMAIL_TOKEN_TIME_IN_SECS);\n let exp = jwt::generate_exp(expiration_duration)?.as_secs();" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/services/email/types.rs::impl::BizEmailProd", + "file": "crates/router/src/services/email/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl EmailData for BizEmailProd {\n async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::BizEmailProd {\n user_name: self.user_name.clone().expose(),\n poc_email: self.poc_email.clone().expose(),\n legal_business_name: self.legal_business_name.clone(),\n business_location: self.business_location.clone(),\n business_website: self.business_website.clone(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "after_code": "impl EmailData for BizEmailProd {\n async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::BizEmailProd {\n user_name: self.user_name.clone().expose(),\n poc_email: self.poc_email.clone().expose(),\n legal_business_name: self.legal_business_name.clone(),\n business_location: self.business_location.clone(),\n business_website: self.business_website.clone(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::BizEmailProd::function::new", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn new(state: &SessionState, data: ProdIntent) -> UserResult {\n Ok(Self {\n recipient_email: domain::UserEmail::from_pii_email(\n state.conf.email.prod_intent_recipient_email.clone(),\n )?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_NEW_PROD_INTENT,\n user_name: data.poc_name.unwrap_or_default().into(),\n poc_email: data.poc_email.unwrap_or_default().into(),\n legal_business_name: data.legal_business_name.unwrap_or_default(),\n business_location: data\n .business_location\n .unwrap_or(common_enums::CountryAlpha2::AD)\n .to_string(),\n business_website: data.business_website.unwrap_or_default(),\n })\n }", + "after_code": "pub fn new(state: &SessionState, data: ProdIntent) -> UserResult {\n Ok(Self {\n recipient_email: domain::UserEmail::from_pii_email(\n state.conf.email.prod_intent_recipient_email.clone(),\n )?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_NEW_PROD_INTENT,\n user_name: data.poc_name.unwrap_or_default().into(),\n poc_email: data.poc_email.unwrap_or_default().into(),\n legal_business_name: data.legal_business_name.unwrap_or_default(),\n business_location: data\n .business_location\n .unwrap_or(common_enums::CountryAlpha2::AD)\n .to_string(),\n business_website: data.business_website.unwrap_or_default(),\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use api_models::user::dashboard_metadata::ProdIntent;" + ], + "after_imports": [ + "use api_models::user::dashboard_metadata::ProdIntent;" + ] + }, + { + "id": "crates/router/src/core/user_role.rs::function::delete_user_role", + "file": "crates/router/src/core/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn delete_user_role(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n request: user_role_api::DeleteUserRoleRequest,\n _req_state: ReqState,\n) -> UserResponse<()> {\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&domain::UserEmail::from_pii_email(request.email)?.into_inner())\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::InvalidRoleOperation)\n .attach_printable(\"User not found in our records\")\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?\n .into();\n\n if user_from_db.get_user_id() == user_from_token.user_id {\n return Err(report!(UserErrors::InvalidDeleteOperation))\n .attach_printable(\"User deleting himself\");\n }\n\n let deletion_requestor_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let mut user_role_deleted_flag = false;\n\n // Find in V2\n let user_role_v2 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v2 {\n let target_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_to_be_deleted.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !target_role_info.is_deletable() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, role_id = {} is not deletable\",\n role_to_be_deleted.role_id\n ));\n }\n\n if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n deletion_requestor_role_info.get_entity_type(),\n target_role_info.get_entity_type()\n ));\n }\n\n user_role_deleted_flag = true;\n state\n .global_store\n .delete_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user role\")?;\n }\n\n // Find in V1\n let user_role_v1 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v1 {\n let target_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_to_be_deleted.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !target_role_info.is_deletable() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, role_id = {} is not deletable\",\n role_to_be_deleted.role_id\n ));\n }\n\n if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n deletion_requestor_role_info.get_entity_type(),\n target_role_info.get_entity_type()\n ));\n }\n\n user_role_deleted_flag = true;\n state\n .global_store\n .delete_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user role\")?;\n }\n\n if !user_role_deleted_flag {\n return Err(report!(UserErrors::InvalidDeleteOperation))\n .attach_printable(\"User is not associated with the merchant\");\n }\n\n // Check if user has any more role associations\n let remaining_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_db.get_user_id(),\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n\n org_id: None,\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n // If user has no more role associated with him then deleting user\n if remaining_roles.is_empty() {\n state\n .global_store\n .delete_user_by_user_id(user_from_db.get_user_id())\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user entry\")?;\n }\n\n auth::blacklist::insert_user_in_blacklist(&state, user_from_db.get_user_id()).await?;\n Ok(ApplicationResponse::StatusOk)\n}", + "after_code": "pub async fn delete_user_role(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n request: user_role_api::DeleteUserRoleRequest,\n _req_state: ReqState,\n) -> UserResponse<()> {\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&domain::UserEmail::from_pii_email(request.email)?)\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::InvalidRoleOperation)\n .attach_printable(\"User not found in our records\")\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?\n .into();\n\n if user_from_db.get_user_id() == user_from_token.user_id {\n return Err(report!(UserErrors::InvalidDeleteOperation))\n .attach_printable(\"User deleting himself\");\n }\n\n let deletion_requestor_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let mut user_role_deleted_flag = false;\n\n // Find in V2\n let user_role_v2 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v2 {\n let target_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_to_be_deleted.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !target_role_info.is_deletable() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, role_id = {} is not deletable\",\n role_to_be_deleted.role_id\n ));\n }\n\n if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n deletion_requestor_role_info.get_entity_type(),\n target_role_info.get_entity_type()\n ));\n }\n\n user_role_deleted_flag = true;\n state\n .global_store\n .delete_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user role\")?;\n }\n\n // Find in V1\n let user_role_v1 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v1 {\n let target_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_to_be_deleted.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !target_role_info.is_deletable() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, role_id = {} is not deletable\",\n role_to_be_deleted.role_id\n ));\n }\n\n if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n deletion_requestor_role_info.get_entity_type(),\n target_role_info.get_entity_type()\n ));\n }\n\n user_role_deleted_flag = true;\n state\n .global_store\n .delete_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user role\")?;\n }\n\n if !user_role_deleted_flag {\n return Err(report!(UserErrors::InvalidDeleteOperation))\n .attach_printable(\"User is not associated with the merchant\");\n }\n\n // Check if user has any more role associations\n let remaining_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_db.get_user_id(),\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n\n org_id: None,\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n // If user has no more role associated with him then deleting user\n if remaining_roles.is_empty() {\n state\n .global_store\n .delete_user_by_user_id(user_from_db.get_user_id())\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user entry\")?;\n }\n\n auth::blacklist::insert_user_in_blacklist(&state, user_from_db.get_user_id()).await?;\n Ok(ApplicationResponse::StatusOk)\n}", + "diff_span": { + "before": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&domain::UserEmail::from_pii_email(request.email)?.into_inner())\n .await\n .map_err(|e| {", + "after": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&domain::UserEmail::from_pii_email(request.email)?)\n .await\n .map_err(|e| {" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/email/types.rs::struct::ResetPassword", + "file": "crates/router/src/services/email/types.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct ResetPassword {\n pub recipient_email: domain::UserEmail,\n pub user_name: domain::UserName,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n pub auth_id: Option,\n}", + "after_code": "pub struct ResetPassword {\n pub recipient_email: domain::UserEmail,\n pub user_name: domain::UserName,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n pub auth_id: Option,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/services/email/types.rs::struct::InviteUser", + "file": "crates/router/src/services/email/types.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct InviteUser {\n pub recipient_email: domain::UserEmail,\n pub user_name: domain::UserName,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n pub entity: Entity,\n pub auth_id: Option,\n}", + "after_code": "pub struct InviteUser {\n pub recipient_email: domain::UserEmail,\n pub user_name: domain::UserName,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n pub entity: Entity,\n pub auth_id: Option,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/services/email/types.rs::EmailToken::function::get_entity", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_entity(&self) -> Option<&Entity> {\n self.entity.as_ref()\n }", + "after_code": "pub fn get_entity(&self) -> Option<&Entity> {\n self.entity.as_ref()\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/services/email/types.rs::struct::Entity", + "file": "crates/router/src/services/email/types.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct Entity {\n pub entity_id: String,\n pub entity_type: EntityType,\n}", + "after_code": "pub struct Entity {\n pub entity_id: String,\n pub entity_type: EntityType,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use common_enums::EntityType;" + ], + "after_imports": [ + "use common_enums::EntityType;" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::impl::EmailToken", + "file": "crates/router/src/services/email/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "impl EmailToken {\n pub async fn new_token(\n email: domain::UserEmail,\n entity: Option,\n flow: domain::Origin,\n settings: &configs::Settings,\n ) -> CustomResult {\n let expiration_duration = std::time::Duration::from_secs(consts::EMAIL_TOKEN_TIME_IN_SECS);\n let exp = jwt::generate_exp(expiration_duration)?.as_secs();\n let token_payload = Self {\n email: email.get_secret().expose(),\n flow,\n exp,\n entity,\n };\n jwt::generate_jwt(&token_payload, settings).await\n }\n\n pub fn get_email(&self) -> CustomResult {\n pii::Email::try_from(self.email.clone())\n }\n\n pub fn get_entity(&self) -> Option<&Entity> {\n self.entity.as_ref()\n }\n\n pub fn get_flow(&self) -> domain::Origin {\n self.flow.clone()\n }\n}", + "after_code": "impl EmailToken {\n pub async fn new_token(\n email: domain::UserEmail,\n entity: Option,\n flow: domain::Origin,\n settings: &configs::Settings,\n ) -> UserResult {\n let expiration_duration = std::time::Duration::from_secs(consts::EMAIL_TOKEN_TIME_IN_SECS);\n let exp = jwt::generate_exp(expiration_duration)?.as_secs();\n let token_payload = Self {\n email: email.get_secret().expose(),\n flow,\n exp,\n entity,\n };\n jwt::generate_jwt(&token_payload, settings).await\n }\n\n pub fn get_email(&self) -> UserResult {\n pii::Email::try_from(self.email.clone())\n .change_context(UserErrors::InternalServerError)\n .and_then(domain::UserEmail::from_pii_email)\n }\n\n pub fn get_entity(&self) -> Option<&Entity> {\n self.entity.as_ref()\n }\n\n pub fn get_flow(&self) -> domain::Origin {\n self.flow.clone()\n }\n}", + "diff_span": { + "before": " flow: domain::Origin,\n settings: &configs::Settings,\n ) -> CustomResult {\n let expiration_duration = std::time::Duration::from_secs(consts::EMAIL_TOKEN_TIME_IN_SECS);\n let exp = jwt::generate_exp(expiration_duration)?.as_secs();\n let token_payload = Self {\n email: email.get_secret().expose(),\n flow,\n exp,\n entity,\n };\n jwt::generate_jwt(&token_payload, settings).await\n }\n\n pub fn get_email(&self) -> CustomResult {\n pii::Email::try_from(self.email.clone())\n }", + "after": " flow: domain::Origin,\n settings: &configs::Settings,\n ) -> UserResult {\n let expiration_duration = std::time::Duration::from_secs(consts::EMAIL_TOKEN_TIME_IN_SECS);\n let exp = jwt::generate_exp(expiration_duration)?.as_secs();\n let token_payload = Self {\n email: email.get_secret().expose(),\n flow,\n exp,\n entity,\n };\n jwt::generate_jwt(&token_payload, settings).await\n }\n\n pub fn get_email(&self) -> UserResult {\n pii::Email::try_from(self.email.clone())\n .change_context(UserErrors::InternalServerError)\n .and_then(domain::UserEmail::from_pii_email)\n }\n" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/user.rs::function::reset_password_token_only_flow", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn reset_password_token_only_flow(\n state: SessionState,\n user_token: auth::UserFromSinglePurposeToken,\n request: user_api::ResetPasswordRequest,\n) -> UserResponse<()> {\n let token = request.token.expose();\n let email_token = auth::decode_jwt::(&token, &state)\n .await\n .change_context(UserErrors::LinkInvalid)?;\n\n auth::blacklist::check_email_token_in_blacklist(&state, &token).await?;\n\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(\n &email_token\n .get_email()\n .change_context(UserErrors::InternalServerError)?,\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .into();\n\n if user_from_db.get_user_id() != user_token.user_id {\n return Err(UserErrors::LinkInvalid.into());\n }\n\n let password = domain::UserPassword::new(request.password)?;\n let hash_password = utils::user::password::generate_password_hash(password.get_secret())?;\n\n let user = state\n .global_store\n .update_user_by_user_id(\n user_from_db.get_user_id(),\n storage_user::UserUpdate::PasswordUpdate {\n password: hash_password,\n },\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !user_from_db.is_verified() {\n let _ = state\n .global_store\n .update_user_by_user_id(\n user_from_db.get_user_id(),\n storage_user::UserUpdate::VerifyUser,\n )\n .await\n .map_err(|error| logger::error!(?error));\n }\n\n let _ = auth::blacklist::insert_email_token_in_blacklist(&state, &token)\n .await\n .map_err(|error| logger::error!(?error));\n let _ = auth::blacklist::insert_user_in_blacklist(&state, &user.user_id)\n .await\n .map_err(|error| logger::error!(?error));\n\n auth::cookies::remove_cookie_response()\n}", + "after_code": "pub async fn reset_password_token_only_flow(\n state: SessionState,\n user_token: auth::UserFromSinglePurposeToken,\n request: user_api::ResetPasswordRequest,\n) -> UserResponse<()> {\n let token = request.token.expose();\n let email_token = auth::decode_jwt::(&token, &state)\n .await\n .change_context(UserErrors::LinkInvalid)?;\n\n auth::blacklist::check_email_token_in_blacklist(&state, &token).await?;\n\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&email_token.get_email()?)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into();\n\n if user_from_db.get_user_id() != user_token.user_id {\n return Err(UserErrors::LinkInvalid.into());\n }\n\n let password = domain::UserPassword::new(request.password)?;\n let hash_password = utils::user::password::generate_password_hash(password.get_secret())?;\n\n let user = state\n .global_store\n .update_user_by_user_id(\n user_from_db.get_user_id(),\n storage_user::UserUpdate::PasswordUpdate {\n password: hash_password,\n },\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !user_from_db.is_verified() {\n let _ = state\n .global_store\n .update_user_by_user_id(\n user_from_db.get_user_id(),\n storage_user::UserUpdate::VerifyUser,\n )\n .await\n .map_err(|error| logger::error!(?error));\n }\n\n let _ = auth::blacklist::insert_email_token_in_blacklist(&state, &token)\n .await\n .map_err(|error| logger::error!(?error));\n let _ = auth::blacklist::insert_user_in_blacklist(&state, &user.user_id)\n .await\n .map_err(|error| logger::error!(?error));\n\n auth::cookies::remove_cookie_response()\n}", + "diff_span": { + "before": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(\n &email_token\n .get_email()\n .change_context(UserErrors::InternalServerError)?,\n )\n .await\n .change_context(UserErrors::InternalServerError)?", + "after": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&email_token.get_email()?)\n .await\n .change_context(UserErrors::InternalServerError)?" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/db/user.rs::Store::function::find_user_by_email", + "file": "crates/router/src/db/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_email(&conn, user_email)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }", + "after_code": "async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_email(&conn, user_email.get_inner())\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }", + "diff_span": { + "before": "async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_email(&conn, user_email)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))", + "after": "async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_email(&conn, user_email.get_inner())\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use error_stack::report;" + ], + "after_imports": [ + "use error_stack::report;", + "use super::{domain, MockDb};" + ] + }, + { + "id": "crates/router/src/core/user.rs::function::connect_account", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn connect_account(\n state: SessionState,\n request: user_api::ConnectAccountRequest,\n auth_id: Option,\n) -> UserResponse {\n let find_user = state.global_store.find_user_by_email(&request.email).await;\n\n if let Ok(found_user) = find_user {\n let user_from_db: domain::UserFromStorage = found_user.into();\n\n let email_contents = email_types::MagicLink {\n recipient_email: domain::UserEmail::from_pii_email(user_from_db.get_email())?,\n settings: state.conf.clone(),\n user_name: domain::UserName::new(user_from_db.get_name())?,\n subject: consts::user::EMAIL_SUBJECT_MAGIC_LINK,\n auth_id,\n };\n\n let send_email_result = state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await;\n logger::info!(?send_email_result);\n\n return Ok(ApplicationResponse::Json(\n user_api::ConnectAccountResponse {\n is_email_sent: send_email_result.is_ok(),\n user_id: user_from_db.get_user_id().to_string(),\n },\n ));\n } else if find_user\n .as_ref()\n .map_err(|e| e.current_context().is_db_not_found())\n .err()\n .unwrap_or(false)\n {\n if matches!(env::which(), env::Env::Production) {\n return Err(report!(UserErrors::InvalidCredentials));\n }\n\n let new_user = domain::NewUser::try_from(request)?;\n let _ = new_user\n .get_new_merchant()\n .get_new_organization()\n .insert_org_in_db(state.clone())\n .await?;\n let user_from_db = new_user\n .insert_user_and_merchant_in_db(state.clone())\n .await?;\n let _user_role = new_user\n .insert_org_level_user_role_in_db(\n state.clone(),\n common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN.to_string(),\n UserStatus::Active,\n )\n .await?;\n\n let magic_link_email = email_types::VerifyEmail {\n recipient_email: domain::UserEmail::from_pii_email(user_from_db.get_email())?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_SIGNUP,\n auth_id,\n };\n\n let magic_link_result = state\n .email_client\n .compose_and_send_email(\n Box::new(magic_link_email),\n state.conf.proxy.https_url.as_ref(),\n )\n .await;\n\n logger::info!(?magic_link_result);\n\n let welcome_to_community_email = email_types::WelcomeToCommunity {\n recipient_email: domain::UserEmail::from_pii_email(user_from_db.get_email())?,\n subject: consts::user::EMAIL_SUBJECT_WELCOME_TO_COMMUNITY,\n };\n\n let welcome_email_result = state\n .email_client\n .compose_and_send_email(\n Box::new(welcome_to_community_email),\n state.conf.proxy.https_url.as_ref(),\n )\n .await;\n\n logger::info!(?welcome_email_result);\n\n return Ok(ApplicationResponse::Json(\n user_api::ConnectAccountResponse {\n is_email_sent: magic_link_result.is_ok(),\n user_id: user_from_db.get_user_id().to_string(),\n },\n ));\n } else {\n Err(find_user\n .err()\n .map(|e| e.change_context(UserErrors::InternalServerError))\n .unwrap_or(UserErrors::InternalServerError.into()))\n }\n}", + "after_code": "pub async fn connect_account(\n state: SessionState,\n request: user_api::ConnectAccountRequest,\n auth_id: Option,\n) -> UserResponse {\n let find_user = state\n .global_store\n .find_user_by_email(&domain::UserEmail::from_pii_email(request.email.clone())?)\n .await;\n\n if let Ok(found_user) = find_user {\n let user_from_db: domain::UserFromStorage = found_user.into();\n\n let email_contents = email_types::MagicLink {\n recipient_email: domain::UserEmail::from_pii_email(user_from_db.get_email())?,\n settings: state.conf.clone(),\n user_name: domain::UserName::new(user_from_db.get_name())?,\n subject: consts::user::EMAIL_SUBJECT_MAGIC_LINK,\n auth_id,\n };\n\n let send_email_result = state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await;\n logger::info!(?send_email_result);\n\n return Ok(ApplicationResponse::Json(\n user_api::ConnectAccountResponse {\n is_email_sent: send_email_result.is_ok(),\n user_id: user_from_db.get_user_id().to_string(),\n },\n ));\n } else if find_user\n .as_ref()\n .map_err(|e| e.current_context().is_db_not_found())\n .err()\n .unwrap_or(false)\n {\n if matches!(env::which(), env::Env::Production) {\n return Err(report!(UserErrors::InvalidCredentials));\n }\n\n let new_user = domain::NewUser::try_from(request)?;\n let _ = new_user\n .get_new_merchant()\n .get_new_organization()\n .insert_org_in_db(state.clone())\n .await?;\n let user_from_db = new_user\n .insert_user_and_merchant_in_db(state.clone())\n .await?;\n let _user_role = new_user\n .insert_org_level_user_role_in_db(\n state.clone(),\n common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN.to_string(),\n UserStatus::Active,\n )\n .await?;\n\n let magic_link_email = email_types::VerifyEmail {\n recipient_email: domain::UserEmail::from_pii_email(user_from_db.get_email())?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_SIGNUP,\n auth_id,\n };\n\n let magic_link_result = state\n .email_client\n .compose_and_send_email(\n Box::new(magic_link_email),\n state.conf.proxy.https_url.as_ref(),\n )\n .await;\n\n logger::info!(?magic_link_result);\n\n let welcome_to_community_email = email_types::WelcomeToCommunity {\n recipient_email: domain::UserEmail::from_pii_email(user_from_db.get_email())?,\n subject: consts::user::EMAIL_SUBJECT_WELCOME_TO_COMMUNITY,\n };\n\n let welcome_email_result = state\n .email_client\n .compose_and_send_email(\n Box::new(welcome_to_community_email),\n state.conf.proxy.https_url.as_ref(),\n )\n .await;\n\n logger::info!(?welcome_email_result);\n\n return Ok(ApplicationResponse::Json(\n user_api::ConnectAccountResponse {\n is_email_sent: magic_link_result.is_ok(),\n user_id: user_from_db.get_user_id().to_string(),\n },\n ));\n } else {\n Err(find_user\n .err()\n .map(|e| e.change_context(UserErrors::InternalServerError))\n .unwrap_or(UserErrors::InternalServerError.into()))\n }\n}", + "diff_span": { + "before": " auth_id: Option,\n) -> UserResponse {\n let find_user = state.global_store.find_user_by_email(&request.email).await;\n\n if let Ok(found_user) = find_user {", + "after": " auth_id: Option,\n) -> UserResponse {\n let find_user = state\n .global_store\n .find_user_by_email(&domain::UserEmail::from_pii_email(request.email.clone())?)\n .await;\n\n if let Ok(found_user) = find_user {" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/email/types.rs::impl::ProFeatureRequest", + "file": "crates/router/src/services/email/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl EmailData for ProFeatureRequest {\n async fn get_email_data(&self) -> CustomResult {\n let recipient = self.recipient_email.clone().into_inner();\n\n let body = html::get_html_body(EmailBody::ProFeatureRequest {\n user_name: self.user_name.clone().get_secret().expose(),\n feature_name: self.feature_name.clone(),\n merchant_id: self.merchant_id.clone(),\n user_email: self.user_email.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.clone(),\n body: external_services::email::IntermediateString::new(body),\n recipient,\n })\n }\n}", + "after_code": "impl EmailData for ProFeatureRequest {\n async fn get_email_data(&self) -> CustomResult {\n let recipient = self.recipient_email.clone().into_inner();\n\n let body = html::get_html_body(EmailBody::ProFeatureRequest {\n user_name: self.user_name.clone().get_secret().expose(),\n feature_name: self.feature_name.clone(),\n merchant_id: self.merchant_id.clone(),\n user_email: self.user_email.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.clone(),\n body: external_services::email::IntermediateString::new(body),\n recipient,\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::struct::ApiKeyExpiryReminder", + "file": "crates/router/src/services/email/types.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct ApiKeyExpiryReminder {\n pub recipient_email: domain::UserEmail,\n pub subject: &'static str,\n pub expires_in: u8,\n pub api_key_name: String,\n pub prefix: String,\n}", + "after_code": "pub struct ApiKeyExpiryReminder {\n pub recipient_email: domain::UserEmail,\n pub subject: &'static str,\n pub expires_in: u8,\n pub api_key_name: String,\n pub prefix: String,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/services/email/types.rs::struct::ReconActivation", + "file": "crates/router/src/services/email/types.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct ReconActivation {\n pub recipient_email: domain::UserEmail,\n pub user_name: domain::UserName,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n}", + "after_code": "pub struct ReconActivation {\n pub recipient_email: domain::UserEmail,\n pub user_name: domain::UserName,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/services/email/types.rs::VerifyEmail::function::get_email_data", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::VerifyEmail,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let verify_email_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"verify_email\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::Verify {\n link: verify_email_link,\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "after_code": "async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::VerifyEmail,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let verify_email_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"verify_email\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::Verify {\n link: verify_email_link,\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::impl::MagicLink", + "file": "crates/router/src/services/email/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl EmailData for MagicLink {\n async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::MagicLink,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let magic_link_login = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"verify_email\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::MagicLink {\n link: magic_link_login,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "after_code": "impl EmailData for MagicLink {\n async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n None,\n domain::Origin::MagicLink,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let magic_link_login = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"verify_email\",\n &self.auth_id,\n );\n\n let body = html::get_html_body(EmailBody::MagicLink {\n link: magic_link_login,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/db/user.rs::MockDb::function::update_user_by_email", + "file": "crates/router/src/db/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.email.eq(user_email))\n .map(|user| {\n *user = match &update_user {\n storage::UserUpdate::VerifyUser => storage::User {\n is_verified: true,\n ..user.to_owned()\n },\n storage::UserUpdate::AccountUpdate { name, is_verified } => storage::User {\n name: name.clone().map(Secret::new).unwrap_or(user.name.clone()),\n is_verified: is_verified.unwrap_or(user.is_verified),\n ..user.to_owned()\n },\n storage::UserUpdate::TotpUpdate {\n totp_status,\n totp_secret,\n totp_recovery_codes,\n } => storage::User {\n totp_status: totp_status.unwrap_or(user.totp_status),\n totp_secret: totp_secret.clone().or(user.totp_secret.clone()),\n totp_recovery_codes: totp_recovery_codes\n .clone()\n .or(user.totp_recovery_codes.clone()),\n ..user.to_owned()\n },\n storage::UserUpdate::PasswordUpdate { password } => storage::User {\n password: Some(password.clone()),\n last_password_modified_at: Some(common_utils::date_time::now()),\n ..user.to_owned()\n },\n };\n user.to_owned()\n })\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_email = {user_email:?}\"\n ))\n .into(),\n )\n }", + "after_code": "async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.email.eq(user_email.get_inner()))\n .map(|user| {\n *user = match &update_user {\n storage::UserUpdate::VerifyUser => storage::User {\n is_verified: true,\n ..user.to_owned()\n },\n storage::UserUpdate::AccountUpdate { name, is_verified } => storage::User {\n name: name.clone().map(Secret::new).unwrap_or(user.name.clone()),\n is_verified: is_verified.unwrap_or(user.is_verified),\n ..user.to_owned()\n },\n storage::UserUpdate::TotpUpdate {\n totp_status,\n totp_secret,\n totp_recovery_codes,\n } => storage::User {\n totp_status: totp_status.unwrap_or(user.totp_status),\n totp_secret: totp_secret.clone().or(user.totp_secret.clone()),\n totp_recovery_codes: totp_recovery_codes\n .clone()\n .or(user.totp_recovery_codes.clone()),\n ..user.to_owned()\n },\n storage::UserUpdate::PasswordUpdate { password } => storage::User {\n password: Some(password.clone()),\n last_password_modified_at: Some(common_utils::date_time::now()),\n ..user.to_owned()\n },\n };\n user.to_owned()\n })\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_email = {user_email:?}\"\n ))\n .into(),\n )\n }", + "diff_span": { + "before": "async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.email.eq(user_email))\n .map(|user| {\n *user = match &update_user {", + "after": "async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.email.eq(user_email.get_inner()))\n .map(|user| {\n *user = match &update_user {" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use masking::Secret;" + ], + "after_imports": [ + "use masking::Secret;", + "use super::{domain, MockDb};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::function::get_link_with_token", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_link_with_token(\n base_url: impl std::fmt::Display,\n token: impl std::fmt::Display,\n action: impl std::fmt::Display,\n auth_id: &Option,\n) -> String {\n let email_url = format!(\"{base_url}/user/{action}?token={token}\");\n if let Some(auth_id) = auth_id {\n format!(\"{email_url}&auth_id={auth_id}\")\n } else {\n email_url\n }\n}", + "after_code": "pub fn get_link_with_token(\n base_url: impl std::fmt::Display,\n token: impl std::fmt::Display,\n action: impl std::fmt::Display,\n auth_id: &Option,\n) -> String {\n let email_url = format!(\"{base_url}/user/{action}?token={token}\");\n if let Some(auth_id) = auth_id {\n format!(\"{email_url}&auth_id={auth_id}\")\n } else {\n email_url\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/services/email/types.rs::Entity::function::get_entity_type", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_entity_type(&self) -> EntityType {\n self.entity_type\n }", + "after_code": "pub fn get_entity_type(&self) -> EntityType {\n self.entity_type\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use common_enums::EntityType;" + ], + "after_imports": [ + "use common_enums::EntityType;" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::struct::VerifyEmail", + "file": "crates/router/src/services/email/types.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct VerifyEmail {\n pub recipient_email: domain::UserEmail,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n pub auth_id: Option,\n}", + "after_code": "pub struct VerifyEmail {\n pub recipient_email: domain::UserEmail,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n pub auth_id: Option,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/user.rs::function::user_from_email", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn user_from_email(\n state: SessionState,\n req: user_api::UserFromEmailRequest,\n) -> UserResponse {\n let token = req.token.expose();\n let email_token = auth::decode_jwt::(&token, &state)\n .await\n .change_context(UserErrors::LinkInvalid)?;\n\n auth::blacklist::check_email_token_in_blacklist(&state, &token).await?;\n\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(\n &email_token\n .get_email()\n .change_context(UserErrors::InternalServerError)?,\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .into();\n\n let next_flow =\n domain::NextFlow::from_origin(email_token.get_flow(), user_from_db.clone(), &state).await?;\n\n let token = next_flow.get_token(&state).await?;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: next_flow.get_flow().into(),\n };\n auth::cookies::set_cookie_response(response, token)\n}", + "after_code": "pub async fn user_from_email(\n state: SessionState,\n req: user_api::UserFromEmailRequest,\n) -> UserResponse {\n let token = req.token.expose();\n let email_token = auth::decode_jwt::(&token, &state)\n .await\n .change_context(UserErrors::LinkInvalid)?;\n\n auth::blacklist::check_email_token_in_blacklist(&state, &token).await?;\n\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&email_token.get_email()?)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into();\n\n let next_flow =\n domain::NextFlow::from_origin(email_token.get_flow(), user_from_db.clone(), &state).await?;\n\n let token = next_flow.get_token(&state).await?;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: next_flow.get_flow().into(),\n };\n auth::cookies::set_cookie_response(response, token)\n}", + "diff_span": { + "before": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(\n &email_token\n .get_email()\n .change_context(UserErrors::InternalServerError)?,\n )\n .await\n .change_context(UserErrors::InternalServerError)?", + "after": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&email_token.get_email()?)\n .await\n .change_context(UserErrors::InternalServerError)?" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/email/types.rs::struct::WelcomeToCommunity", + "file": "crates/router/src/services/email/types.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct WelcomeToCommunity {\n pub recipient_email: domain::UserEmail,\n pub subject: &'static str,\n}", + "after_code": "pub struct WelcomeToCommunity {\n pub recipient_email: domain::UserEmail,\n pub subject: &'static str,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/services/email/types.rs::html::function::get_html_body", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_html_body(email_body: EmailBody) -> String {\n match email_body {\n EmailBody::Verify { link } => {\n format!(include_str!(\"assets/verify.html\"), link = link)\n }\n EmailBody::Reset { link, user_name } => {\n format!(\n include_str!(\"assets/reset.html\"),\n link = link,\n username = user_name\n )\n }\n EmailBody::MagicLink { link, user_name } => {\n format!(\n include_str!(\"assets/magic_link.html\"),\n username = user_name,\n link = link\n )\n }\n EmailBody::InviteUser { link, user_name } => {\n format!(\n include_str!(\"assets/invite.html\"),\n username = user_name,\n link = link\n )\n }\n // TODO: Change the linked html for accept invite from email\n EmailBody::AcceptInviteFromEmail { link, user_name } => {\n format!(\n include_str!(\"assets/invite.html\"),\n username = user_name,\n link = link\n )\n }\n EmailBody::ReconActivation { user_name } => {\n format!(\n include_str!(\"assets/recon_activation.html\"),\n username = user_name,\n )\n }\n EmailBody::BizEmailProd {\n user_name,\n poc_email,\n legal_business_name,\n business_location,\n business_website,\n } => {\n format!(\n include_str!(\"assets/bizemailprod.html\"),\n poc_email = poc_email,\n legal_business_name = legal_business_name,\n business_location = business_location,\n business_website = business_website,\n username = user_name,\n )\n }\n EmailBody::ProFeatureRequest {\n feature_name,\n merchant_id,\n user_name,\n user_email,\n } => format!(\n \"Dear Hyperswitch Support Team,\n\nDashboard Pro Feature Request,\nFeature name : {feature_name}\nMerchant ID : {}\nMerchant Name : {user_name}\nEmail : {user_email}\n\n(note: This is an auto generated email. Use merchant email for any further communications)\",\n merchant_id.get_string_repr()\n ),\n EmailBody::ApiKeyExpiryReminder {\n expires_in,\n api_key_name,\n prefix,\n } => format!(\n include_str!(\"assets/api_key_expiry_reminder.html\"),\n api_key_name = api_key_name,\n prefix = prefix,\n expires_in = expires_in,\n ),\n EmailBody::WelcomeToCommunity => {\n include_str!(\"assets/welcome_to_community.html\").to_string()\n }\n }\n }", + "after_code": "pub fn get_html_body(email_body: EmailBody) -> String {\n match email_body {\n EmailBody::Verify { link } => {\n format!(include_str!(\"assets/verify.html\"), link = link)\n }\n EmailBody::Reset { link, user_name } => {\n format!(\n include_str!(\"assets/reset.html\"),\n link = link,\n username = user_name\n )\n }\n EmailBody::MagicLink { link, user_name } => {\n format!(\n include_str!(\"assets/magic_link.html\"),\n username = user_name,\n link = link\n )\n }\n EmailBody::InviteUser { link, user_name } => {\n format!(\n include_str!(\"assets/invite.html\"),\n username = user_name,\n link = link\n )\n }\n // TODO: Change the linked html for accept invite from email\n EmailBody::AcceptInviteFromEmail { link, user_name } => {\n format!(\n include_str!(\"assets/invite.html\"),\n username = user_name,\n link = link\n )\n }\n EmailBody::ReconActivation { user_name } => {\n format!(\n include_str!(\"assets/recon_activation.html\"),\n username = user_name,\n )\n }\n EmailBody::BizEmailProd {\n user_name,\n poc_email,\n legal_business_name,\n business_location,\n business_website,\n } => {\n format!(\n include_str!(\"assets/bizemailprod.html\"),\n poc_email = poc_email,\n legal_business_name = legal_business_name,\n business_location = business_location,\n business_website = business_website,\n username = user_name,\n )\n }\n EmailBody::ProFeatureRequest {\n feature_name,\n merchant_id,\n user_name,\n user_email,\n } => format!(\n \"Dear Hyperswitch Support Team,\n\nDashboard Pro Feature Request,\nFeature name : {feature_name}\nMerchant ID : {}\nMerchant Name : {user_name}\nEmail : {user_email}\n\n(note: This is an auto generated email. Use merchant email for any further communications)\",\n merchant_id.get_string_repr()\n ),\n EmailBody::ApiKeyExpiryReminder {\n expires_in,\n api_key_name,\n prefix,\n } => format!(\n include_str!(\"assets/api_key_expiry_reminder.html\"),\n api_key_name = api_key_name,\n prefix = prefix,\n expires_in = expires_in,\n ),\n EmailBody::WelcomeToCommunity => {\n include_str!(\"assets/welcome_to_community.html\").to_string()\n }\n }\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;" + ] + }, + { + "id": "crates/router/src/core/user.rs::function::verify_email_token_only_flow", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn verify_email_token_only_flow(\n state: SessionState,\n user_token: auth::UserFromSinglePurposeToken,\n req: user_api::VerifyEmailRequest,\n) -> UserResponse {\n let token = req.token.clone().expose();\n let email_token = auth::decode_jwt::(&token, &state)\n .await\n .change_context(UserErrors::LinkInvalid)?;\n\n auth::blacklist::check_email_token_in_blacklist(&state, &token).await?;\n\n let user_from_email = state\n .global_store\n .find_user_by_email(\n &email_token\n .get_email()\n .change_context(UserErrors::InternalServerError)?,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if user_from_email.user_id != user_token.user_id {\n return Err(UserErrors::LinkInvalid.into());\n }\n\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .update_user_by_user_id(\n user_from_email.user_id.as_str(),\n storage_user::UserUpdate::VerifyUser,\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .into();\n\n let _ = auth::blacklist::insert_email_token_in_blacklist(&state, &token)\n .await\n .map_err(|error| logger::error!(?error));\n\n let current_flow = domain::CurrentFlow::new(user_token, domain::SPTFlow::VerifyEmail.into())?;\n let next_flow = current_flow.next(user_from_db, &state).await?;\n let token = next_flow.get_token(&state).await?;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: next_flow.get_flow().into(),\n };\n\n auth::cookies::set_cookie_response(response, token)\n}", + "after_code": "pub async fn verify_email_token_only_flow(\n state: SessionState,\n user_token: auth::UserFromSinglePurposeToken,\n req: user_api::VerifyEmailRequest,\n) -> UserResponse {\n let token = req.token.clone().expose();\n let email_token = auth::decode_jwt::(&token, &state)\n .await\n .change_context(UserErrors::LinkInvalid)?;\n\n auth::blacklist::check_email_token_in_blacklist(&state, &token).await?;\n\n let user_from_email = state\n .global_store\n .find_user_by_email(&email_token.get_email()?)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if user_from_email.user_id != user_token.user_id {\n return Err(UserErrors::LinkInvalid.into());\n }\n\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .update_user_by_user_id(\n user_from_email.user_id.as_str(),\n storage_user::UserUpdate::VerifyUser,\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .into();\n\n let _ = auth::blacklist::insert_email_token_in_blacklist(&state, &token)\n .await\n .map_err(|error| logger::error!(?error));\n\n let current_flow = domain::CurrentFlow::new(user_token, domain::SPTFlow::VerifyEmail.into())?;\n let next_flow = current_flow.next(user_from_db, &state).await?;\n let token = next_flow.get_token(&state).await?;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: next_flow.get_flow().into(),\n };\n\n auth::cookies::set_cookie_response(response, token)\n}", + "diff_span": { + "before": " let user_from_email = state\n .global_store\n .find_user_by_email(\n &email_token\n .get_email()\n .change_context(UserErrors::InternalServerError)?,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;", + "after": " let user_from_email = state\n .global_store\n .find_user_by_email(&email_token.get_email()?)\n .await\n .change_context(UserErrors::InternalServerError)?;" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/email/types.rs::struct::MagicLink", + "file": "crates/router/src/services/email/types.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct MagicLink {\n pub recipient_email: domain::UserEmail,\n pub user_name: domain::UserName,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n pub auth_id: Option,\n}", + "after_code": "pub struct MagicLink {\n pub recipient_email: domain::UserEmail,\n pub user_name: domain::UserName,\n pub settings: std::sync::Arc,\n pub subject: &'static str,\n pub auth_id: Option,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/user.rs::function::handle_invitation", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn handle_invitation(\n state: &SessionState,\n user_from_token: &auth::UserFromToken,\n request: &user_api::InviteUserRequest,\n req_state: &ReqState,\n auth_id: &Option,\n) -> UserResult {\n let inviter_user = user_from_token.get_user_from_db(state).await?;\n\n if inviter_user.get_email() == request.email {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User Inviting themselves\".to_string(),\n )\n .into());\n }\n\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n state,\n &request.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if !role_info.is_invitable() {\n return Err(report!(UserErrors::InvalidRoleId))\n .attach_printable(format!(\"role_id = {} is not invitable\", request.role_id));\n }\n\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let invitee_user = state\n .global_store\n .find_user_by_email(&invitee_email.into_inner())\n .await;\n\n if let Ok(invitee_user) = invitee_user {\n handle_existing_user_invitation(\n state,\n user_from_token,\n request,\n invitee_user.into(),\n role_info,\n auth_id,\n )\n .await\n } else if invitee_user\n .as_ref()\n .map_err(|e| e.current_context().is_db_not_found())\n .err()\n .unwrap_or(false)\n {\n handle_new_user_invitation(\n state,\n user_from_token,\n request,\n role_info,\n req_state.clone(),\n auth_id,\n )\n .await\n } else {\n Err(UserErrors::InternalServerError.into())\n }\n}", + "after_code": "async fn handle_invitation(\n state: &SessionState,\n user_from_token: &auth::UserFromToken,\n request: &user_api::InviteUserRequest,\n req_state: &ReqState,\n auth_id: &Option,\n) -> UserResult {\n let inviter_user = user_from_token.get_user_from_db(state).await?;\n\n if inviter_user.get_email() == request.email {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User Inviting themselves\".to_string(),\n )\n .into());\n }\n\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n state,\n &request.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if !role_info.is_invitable() {\n return Err(report!(UserErrors::InvalidRoleId))\n .attach_printable(format!(\"role_id = {} is not invitable\", request.role_id));\n }\n\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let invitee_user = state.global_store.find_user_by_email(&invitee_email).await;\n\n if let Ok(invitee_user) = invitee_user {\n handle_existing_user_invitation(\n state,\n user_from_token,\n request,\n invitee_user.into(),\n role_info,\n auth_id,\n )\n .await\n } else if invitee_user\n .as_ref()\n .map_err(|e| e.current_context().is_db_not_found())\n .err()\n .unwrap_or(false)\n {\n handle_new_user_invitation(\n state,\n user_from_token,\n request,\n role_info,\n req_state.clone(),\n auth_id,\n )\n .await\n } else {\n Err(UserErrors::InternalServerError.into())\n }\n}", + "diff_span": { + "before": "\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let invitee_user = state\n .global_store\n .find_user_by_email(&invitee_email.into_inner())\n .await;\n\n if let Ok(invitee_user) = invitee_user {", + "after": "\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let invitee_user = state.global_store.find_user_by_email(&invitee_email).await;\n\n if let Ok(invitee_user) = invitee_user {" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/db/kafka_store.rs::KafkaStore::function::find_user_by_email", + "file": "crates/router/src/db/kafka_store.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult {\n self.diesel_store.find_user_by_email(user_email).await\n }", + "after_code": "async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult {\n self.diesel_store.find_user_by_email(user_email).await\n }", + "diff_span": { + "before": "async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult {\n self.diesel_store.find_user_by_email(user_email).await", + "after": "async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult {\n self.diesel_store.find_user_by_email(user_email).await" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/email/types.rs::EmailToken::function::get_flow", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_flow(&self) -> domain::Origin {\n self.flow.clone()\n }", + "after_code": "pub fn get_flow(&self) -> domain::Origin {\n self.flow.clone()\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/services/email/types.rs::impl::InviteUser", + "file": "crates/router/src/services/email/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl EmailData for InviteUser {\n async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n Some(self.entity.clone()),\n domain::Origin::AcceptInvitationFromEmail,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let invite_user_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"accept_invite_from_email\",\n &self.auth_id,\n );\n let body = html::get_html_body(EmailBody::AcceptInviteFromEmail {\n link: invite_user_link,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "after_code": "impl EmailData for InviteUser {\n async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n Some(self.entity.clone()),\n domain::Origin::AcceptInvitationFromEmail,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let invite_user_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"accept_invite_from_email\",\n &self.auth_id,\n );\n let body = html::get_html_body(EmailBody::AcceptInviteFromEmail {\n link: invite_user_link,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/authentication.rs::function::parse_jwt_payload", + "file": "crates/router/src/services/authentication.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn parse_jwt_payload(headers: &HeaderMap, state: &A) -> RouterResult\nwhere\n T: serde::de::DeserializeOwned,\n A: SessionStateInfo + Sync,\n{\n let cookie_token_result = get_cookie_from_header(headers).and_then(cookies::parse_cookie);\n let auth_header_token_result = get_jwt_from_authorization_header(headers);\n let force_cookie = state.conf().user.force_cookies;\n\n logger::info!(\n user_agent = ?headers.get(headers::USER_AGENT),\n header_names = ?headers.keys().collect::>(),\n is_token_equal =\n auth_header_token_result.as_deref().ok() == cookie_token_result.as_deref().ok(),\n cookie_error = ?cookie_token_result.as_ref().err(),\n token_error = ?auth_header_token_result.as_ref().err(),\n force_cookie,\n );\n\n let final_token = if force_cookie {\n cookie_token_result?\n } else {\n auth_header_token_result?.to_owned()\n };\n\n decode_jwt(&final_token, state).await\n}", + "after_code": "pub async fn parse_jwt_payload(headers: &HeaderMap, state: &A) -> RouterResult\nwhere\n T: serde::de::DeserializeOwned,\n A: SessionStateInfo + Sync,\n{\n let cookie_token_result =\n get_cookie_from_header(headers).and_then(cookies::get_jwt_from_cookies);\n let auth_header_token_result = get_jwt_from_authorization_header(headers);\n let force_cookie = state.conf().user.force_cookies;\n\n logger::info!(\n user_agent = ?headers.get(headers::USER_AGENT),\n header_names = ?headers.keys().collect::>(),\n is_token_equal =\n auth_header_token_result.as_deref().ok() == cookie_token_result.as_deref().ok(),\n cookie_error = ?cookie_token_result.as_ref().err(),\n token_error = ?auth_header_token_result.as_ref().err(),\n force_cookie,\n );\n\n let final_token = if force_cookie {\n cookie_token_result?\n } else {\n auth_header_token_result?.to_owned()\n };\n\n decode_jwt(&final_token, state).await\n}", + "diff_span": { + "before": " A: SessionStateInfo + Sync,\n{\n let cookie_token_result = get_cookie_from_header(headers).and_then(cookies::parse_cookie);\n let auth_header_token_result = get_jwt_from_authorization_header(headers);\n let force_cookie = state.conf().user.force_cookies;", + "after": " A: SessionStateInfo + Sync,\n{\n let cookie_token_result =\n get_cookie_from_header(headers).and_then(cookies::get_jwt_from_cookies);\n let auth_header_token_result = get_jwt_from_authorization_header(headers);\n let force_cookie = state.conf().user.force_cookies;" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/email/types.rs::InviteUser::function::get_email_data", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n Some(self.entity.clone()),\n domain::Origin::AcceptInvitationFromEmail,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let invite_user_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"accept_invite_from_email\",\n &self.auth_id,\n );\n let body = html::get_html_body(EmailBody::AcceptInviteFromEmail {\n link: invite_user_link,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "after_code": "async fn get_email_data(&self) -> CustomResult {\n let token = EmailToken::new_token(\n self.recipient_email.clone(),\n Some(self.entity.clone()),\n domain::Origin::AcceptInvitationFromEmail,\n &self.settings,\n )\n .await\n .change_context(EmailError::TokenGenerationFailure)?;\n\n let invite_user_link = get_link_with_token(\n &self.settings.user.base_url,\n token,\n \"accept_invite_from_email\",\n &self.auth_id,\n );\n let body = html::get_html_body(EmailBody::AcceptInviteFromEmail {\n link: invite_user_link,\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::ApiKeyExpiryReminder::function::get_email_data", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_email_data(&self) -> CustomResult {\n let recipient = self.recipient_email.clone().into_inner();\n\n let body = html::get_html_body(EmailBody::ApiKeyExpiryReminder {\n expires_in: self.expires_in,\n api_key_name: self.api_key_name.clone(),\n prefix: self.prefix.clone(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient,\n })\n }", + "after_code": "async fn get_email_data(&self) -> CustomResult {\n let recipient = self.recipient_email.clone().into_inner();\n\n let body = html::get_html_body(EmailBody::ApiKeyExpiryReminder {\n expires_in: self.expires_in,\n api_key_name: self.api_key_name.clone(),\n prefix: self.prefix.clone(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient,\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/db/user.rs::impl::MockDb", + "file": "crates/router/src/db/user.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "impl UserInterface for MockDb {\n async fn insert_user(\n &self,\n user_data: storage::UserNew,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n if users\n .iter()\n .any(|user| user.email == user_data.email || user.user_id == user_data.user_id)\n {\n Err(errors::StorageError::DuplicateValue {\n entity: \"email or user_id\",\n key: None,\n })?\n }\n let time_now = common_utils::date_time::now();\n let user = storage::User {\n user_id: user_data.user_id,\n email: user_data.email,\n name: user_data.name,\n password: user_data.password,\n is_verified: user_data.is_verified,\n created_at: user_data.created_at.unwrap_or(time_now),\n last_modified_at: user_data.created_at.unwrap_or(time_now),\n totp_status: user_data.totp_status,\n totp_secret: user_data.totp_secret,\n totp_recovery_codes: user_data.totp_recovery_codes,\n last_password_modified_at: user_data.last_password_modified_at,\n };\n users.push(user.clone());\n Ok(user)\n }\n\n async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.email.eq(user_email))\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for email = {user_email:?}\"\n ))\n .into(),\n )\n }\n\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.user_id == user_id)\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_id = {user_id}\"\n ))\n .into(),\n )\n }\n\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.user_id == user_id)\n .map(|user| {\n *user = match &update_user {\n storage::UserUpdate::VerifyUser => storage::User {\n is_verified: true,\n ..user.to_owned()\n },\n storage::UserUpdate::AccountUpdate { name, is_verified } => storage::User {\n name: name.clone().map(Secret::new).unwrap_or(user.name.clone()),\n is_verified: is_verified.unwrap_or(user.is_verified),\n ..user.to_owned()\n },\n storage::UserUpdate::TotpUpdate {\n totp_status,\n totp_secret,\n totp_recovery_codes,\n } => storage::User {\n totp_status: totp_status.unwrap_or(user.totp_status),\n totp_secret: totp_secret.clone().or(user.totp_secret.clone()),\n totp_recovery_codes: totp_recovery_codes\n .clone()\n .or(user.totp_recovery_codes.clone()),\n ..user.to_owned()\n },\n storage::UserUpdate::PasswordUpdate { password } => storage::User {\n password: Some(password.clone()),\n last_password_modified_at: Some(common_utils::date_time::now()),\n ..user.to_owned()\n },\n };\n user.to_owned()\n })\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_id = {user_id}\"\n ))\n .into(),\n )\n }\n\n async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.email.eq(user_email))\n .map(|user| {\n *user = match &update_user {\n storage::UserUpdate::VerifyUser => storage::User {\n is_verified: true,\n ..user.to_owned()\n },\n storage::UserUpdate::AccountUpdate { name, is_verified } => storage::User {\n name: name.clone().map(Secret::new).unwrap_or(user.name.clone()),\n is_verified: is_verified.unwrap_or(user.is_verified),\n ..user.to_owned()\n },\n storage::UserUpdate::TotpUpdate {\n totp_status,\n totp_secret,\n totp_recovery_codes,\n } => storage::User {\n totp_status: totp_status.unwrap_or(user.totp_status),\n totp_secret: totp_secret.clone().or(user.totp_secret.clone()),\n totp_recovery_codes: totp_recovery_codes\n .clone()\n .or(user.totp_recovery_codes.clone()),\n ..user.to_owned()\n },\n storage::UserUpdate::PasswordUpdate { password } => storage::User {\n password: Some(password.clone()),\n last_password_modified_at: Some(common_utils::date_time::now()),\n ..user.to_owned()\n },\n };\n user.to_owned()\n })\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_email = {user_email:?}\"\n ))\n .into(),\n )\n }\n\n async fn delete_user_by_user_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n let user_index = users\n .iter()\n .position(|user| user.user_id == user_id)\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"No user available for user_id = {user_id}\"\n )))?;\n users.remove(user_index);\n Ok(true)\n }\n\n async fn find_users_by_user_ids(\n &self,\n _user_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n Err(errors::StorageError::MockDbError)?\n }\n}", + "after_code": "impl UserInterface for MockDb {\n async fn insert_user(\n &self,\n user_data: storage::UserNew,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n if users\n .iter()\n .any(|user| user.email == user_data.email || user.user_id == user_data.user_id)\n {\n Err(errors::StorageError::DuplicateValue {\n entity: \"email or user_id\",\n key: None,\n })?\n }\n let time_now = common_utils::date_time::now();\n let user = storage::User {\n user_id: user_data.user_id,\n email: user_data.email,\n name: user_data.name,\n password: user_data.password,\n is_verified: user_data.is_verified,\n created_at: user_data.created_at.unwrap_or(time_now),\n last_modified_at: user_data.created_at.unwrap_or(time_now),\n totp_status: user_data.totp_status,\n totp_secret: user_data.totp_secret,\n totp_recovery_codes: user_data.totp_recovery_codes,\n last_password_modified_at: user_data.last_password_modified_at,\n };\n users.push(user.clone());\n Ok(user)\n }\n\n async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.email.eq(user_email.get_inner()))\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for email = {user_email:?}\"\n ))\n .into(),\n )\n }\n\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.user_id == user_id)\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_id = {user_id}\"\n ))\n .into(),\n )\n }\n\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.user_id == user_id)\n .map(|user| {\n *user = match &update_user {\n storage::UserUpdate::VerifyUser => storage::User {\n is_verified: true,\n ..user.to_owned()\n },\n storage::UserUpdate::AccountUpdate { name, is_verified } => storage::User {\n name: name.clone().map(Secret::new).unwrap_or(user.name.clone()),\n is_verified: is_verified.unwrap_or(user.is_verified),\n ..user.to_owned()\n },\n storage::UserUpdate::TotpUpdate {\n totp_status,\n totp_secret,\n totp_recovery_codes,\n } => storage::User {\n totp_status: totp_status.unwrap_or(user.totp_status),\n totp_secret: totp_secret.clone().or(user.totp_secret.clone()),\n totp_recovery_codes: totp_recovery_codes\n .clone()\n .or(user.totp_recovery_codes.clone()),\n ..user.to_owned()\n },\n storage::UserUpdate::PasswordUpdate { password } => storage::User {\n password: Some(password.clone()),\n last_password_modified_at: Some(common_utils::date_time::now()),\n ..user.to_owned()\n },\n };\n user.to_owned()\n })\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_id = {user_id}\"\n ))\n .into(),\n )\n }\n\n async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.email.eq(user_email.get_inner()))\n .map(|user| {\n *user = match &update_user {\n storage::UserUpdate::VerifyUser => storage::User {\n is_verified: true,\n ..user.to_owned()\n },\n storage::UserUpdate::AccountUpdate { name, is_verified } => storage::User {\n name: name.clone().map(Secret::new).unwrap_or(user.name.clone()),\n is_verified: is_verified.unwrap_or(user.is_verified),\n ..user.to_owned()\n },\n storage::UserUpdate::TotpUpdate {\n totp_status,\n totp_secret,\n totp_recovery_codes,\n } => storage::User {\n totp_status: totp_status.unwrap_or(user.totp_status),\n totp_secret: totp_secret.clone().or(user.totp_secret.clone()),\n totp_recovery_codes: totp_recovery_codes\n .clone()\n .or(user.totp_recovery_codes.clone()),\n ..user.to_owned()\n },\n storage::UserUpdate::PasswordUpdate { password } => storage::User {\n password: Some(password.clone()),\n last_password_modified_at: Some(common_utils::date_time::now()),\n ..user.to_owned()\n },\n };\n user.to_owned()\n })\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_email = {user_email:?}\"\n ))\n .into(),\n )\n }\n\n async fn delete_user_by_user_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n let user_index = users\n .iter()\n .position(|user| user.user_id == user_id)\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"No user available for user_id = {user_id}\"\n )))?;\n users.remove(user_index);\n Ok(true)\n }\n\n async fn find_users_by_user_ids(\n &self,\n _user_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n Err(errors::StorageError::MockDbError)?\n }\n}", + "diff_span": { + "before": " async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.email.eq(user_email))\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for email = {user_email:?}\"\n ))\n .into(),\n )\n }\n\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.user_id == user_id)\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_id = {user_id}\"\n ))\n .into(),\n )\n }\n\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.user_id == user_id)\n .map(|user| {\n *user = match &update_user {\n storage::UserUpdate::VerifyUser => storage::User {\n is_verified: true,\n ..user.to_owned()\n },\n storage::UserUpdate::AccountUpdate { name, is_verified } => storage::User {\n name: name.clone().map(Secret::new).unwrap_or(user.name.clone()),\n is_verified: is_verified.unwrap_or(user.is_verified),\n ..user.to_owned()\n },\n storage::UserUpdate::TotpUpdate {\n totp_status,\n totp_secret,\n totp_recovery_codes,\n } => storage::User {\n totp_status: totp_status.unwrap_or(user.totp_status),\n totp_secret: totp_secret.clone().or(user.totp_secret.clone()),\n totp_recovery_codes: totp_recovery_codes\n .clone()\n .or(user.totp_recovery_codes.clone()),\n ..user.to_owned()\n },\n storage::UserUpdate::PasswordUpdate { password } => storage::User {\n password: Some(password.clone()),\n last_password_modified_at: Some(common_utils::date_time::now()),\n ..user.to_owned()\n },\n };\n user.to_owned()\n })\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_id = {user_id}\"\n ))\n .into(),\n )\n }\n\n async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.email.eq(user_email))\n .map(|user| {\n *user = match &update_user {", + "after": " async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.email.eq(user_email.get_inner()))\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for email = {user_email:?}\"\n ))\n .into(),\n )\n }\n\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.user_id == user_id)\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_id = {user_id}\"\n ))\n .into(),\n )\n }\n\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.user_id == user_id)\n .map(|user| {\n *user = match &update_user {\n storage::UserUpdate::VerifyUser => storage::User {\n is_verified: true,\n ..user.to_owned()\n },\n storage::UserUpdate::AccountUpdate { name, is_verified } => storage::User {\n name: name.clone().map(Secret::new).unwrap_or(user.name.clone()),\n is_verified: is_verified.unwrap_or(user.is_verified),\n ..user.to_owned()\n },\n storage::UserUpdate::TotpUpdate {\n totp_status,\n totp_secret,\n totp_recovery_codes,\n } => storage::User {\n totp_status: totp_status.unwrap_or(user.totp_status),\n totp_secret: totp_secret.clone().or(user.totp_secret.clone()),\n totp_recovery_codes: totp_recovery_codes\n .clone()\n .or(user.totp_recovery_codes.clone()),\n ..user.to_owned()\n },\n storage::UserUpdate::PasswordUpdate { password } => storage::User {\n password: Some(password.clone()),\n last_password_modified_at: Some(common_utils::date_time::now()),\n ..user.to_owned()\n },\n };\n user.to_owned()\n })\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for user_id = {user_id}\"\n ))\n .into(),\n )\n }\n\n async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n update_user: storage::UserUpdate,\n ) -> CustomResult {\n let mut users = self.users.lock().await;\n users\n .iter_mut()\n .find(|user| user.email.eq(user_email.get_inner()))\n .map(|user| {\n *user = match &update_user {" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use masking::Secret;", + "use super::MockDb;" + ], + "after_imports": [ + "use masking::Secret;", + "use super::{domain, MockDb};" + ] + }, + { + "id": "crates/router/src/utils/user.rs::function::get_user_from_db_by_email", + "file": "crates/router/src/utils/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_user_from_db_by_email(\n state: &SessionState,\n email: domain::UserEmail,\n) -> CustomResult {\n state\n .global_store\n .find_user_by_email(&email.into_inner())\n .await\n .map(UserFromStorage::from)\n}", + "after_code": "pub async fn get_user_from_db_by_email(\n state: &SessionState,\n email: domain::UserEmail,\n) -> CustomResult {\n state\n .global_store\n .find_user_by_email(&email)\n .await\n .map(UserFromStorage::from)\n}", + "diff_span": { + "before": " state\n .global_store\n .find_user_by_email(&email.into_inner())\n .await\n .map(UserFromStorage::from)", + "after": " state\n .global_store\n .find_user_by_email(&email)\n .await\n .map(UserFromStorage::from)" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/email/types.rs::ReconActivation::function::get_email_data", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::ReconActivation {\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "after_code": "async fn get_email_data(&self) -> CustomResult {\n let body = html::get_html_body(EmailBody::ReconActivation {\n user_name: self.user_name.clone().get_secret().expose(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient: self.recipient_email.clone().into_inner(),\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/core/user.rs::function::signin_token_only_flow", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn signin_token_only_flow(\n state: SessionState,\n request: user_api::SignInRequest,\n) -> UserResponse {\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&request.email)\n .await\n .to_not_found_response(UserErrors::InvalidCredentials)?\n .into();\n\n user_from_db.compare_password(&request.password)?;\n\n let next_flow =\n domain::NextFlow::from_origin(domain::Origin::SignIn, user_from_db.clone(), &state).await?;\n\n let token = next_flow.get_token(&state).await?;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: next_flow.get_flow().into(),\n };\n auth::cookies::set_cookie_response(response, token)\n}", + "after_code": "pub async fn signin_token_only_flow(\n state: SessionState,\n request: user_api::SignInRequest,\n) -> UserResponse {\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&domain::UserEmail::from_pii_email(request.email)?)\n .await\n .to_not_found_response(UserErrors::InvalidCredentials)?\n .into();\n\n user_from_db.compare_password(&request.password)?;\n\n let next_flow =\n domain::NextFlow::from_origin(domain::Origin::SignIn, user_from_db.clone(), &state).await?;\n\n let token = next_flow.get_token(&state).await?;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: next_flow.get_flow().into(),\n };\n auth::cookies::set_cookie_response(response, token)\n}", + "diff_span": { + "before": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&request.email)\n .await\n .to_not_found_response(UserErrors::InvalidCredentials)?", + "after": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&domain::UserEmail::from_pii_email(request.email)?)\n .await\n .to_not_found_response(UserErrors::InvalidCredentials)?" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/email/types.rs::Entity::function::get_entity_id", + "file": "crates/router/src/services/email/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_entity_id(&self) -> &str {\n &self.entity_id\n }", + "after_code": "pub fn get_entity_id(&self) -> &str {\n &self.entity_id\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/db/user.rs::impl::Store", + "file": "crates/router/src/db/user.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "impl UserInterface for Store {\n #[instrument(skip_all)]\n async fn insert_user(\n &self,\n user_data: storage::UserNew,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n user_data\n .insert(&conn)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_email(&conn, user_email)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_id(&conn, user_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_id(&conn, user_id, user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_email(&conn, user_email, user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn delete_user_by_user_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::delete_by_user_id(&conn, user_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n async fn find_users_by_user_ids(\n &self,\n user_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_users_by_user_ids(&conn, user_ids)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n}", + "after_code": "impl UserInterface for Store {\n #[instrument(skip_all)]\n async fn insert_user(\n &self,\n user_data: storage::UserNew,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n user_data\n .insert(&conn)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_email(&conn, user_email.get_inner())\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_id(&conn, user_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_id(&conn, user_id, user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_email(&conn, user_email.get_inner(), user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn delete_user_by_user_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::delete_by_user_id(&conn, user_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n async fn find_users_by_user_ids(\n &self,\n user_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_users_by_user_ids(&conn, user_ids)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n}", + "diff_span": { + "before": " async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_email(&conn, user_email)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_id(&conn, user_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_id(&conn, user_id, user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_email(&conn, user_email, user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))", + "after": " async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_email(&conn, user_email.get_inner())\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_user_by_id(\n &self,\n user_id: &str,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::User::find_by_user_id(&conn, user_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn update_user_by_user_id(\n &self,\n user_id: &str,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_id(&conn, user_id, user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_email(&conn, user_email.get_inner(), user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use router_env::{instrument, tracing};", + "use error_stack::report;" + ], + "after_imports": [ + "use router_env::{instrument, tracing};", + "use error_stack::report;", + "use super::{domain, MockDb};" + ] + }, + { + "id": "crates/router/src/db/user.rs::MockDb::function::find_user_by_email", + "file": "crates/router/src/db/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.email.eq(user_email))\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for email = {user_email:?}\"\n ))\n .into(),\n )\n }", + "after_code": "async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.email.eq(user_email.get_inner()))\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No user available for email = {user_email:?}\"\n ))\n .into(),\n )\n }", + "diff_span": { + "before": "async fn find_user_by_email(\n &self,\n user_email: &pii::Email,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.email.eq(user_email))\n .cloned()\n .ok_or(", + "after": "async fn find_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n ) -> CustomResult {\n let users = self.users.lock().await;\n users\n .iter()\n .find(|user| user.email.eq(user_email.get_inner()))\n .cloned()\n .ok_or(" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [], + "after_imports": [ + "use super::{domain, MockDb};" + ] + }, + { + "id": "crates/router/src/services/authentication.rs::function::is_jwt_auth", + "file": "crates/router/src/services/authentication.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub fn is_jwt_auth(headers: &HeaderMap) -> bool {\n headers.get(headers::AUTHORIZATION).is_some()\n || get_cookie_from_header(headers)\n .and_then(cookies::parse_cookie)\n .is_ok()\n}", + "after_code": "pub fn is_jwt_auth(headers: &HeaderMap) -> bool {\n headers.get(headers::AUTHORIZATION).is_some()\n || get_cookie_from_header(headers)\n .and_then(cookies::get_jwt_from_cookies)\n .is_ok()\n}", + "diff_span": { + "before": " headers.get(headers::AUTHORIZATION).is_some()\n || get_cookie_from_header(headers)\n .and_then(cookies::parse_cookie)\n .is_ok()\n}", + "after": " headers.get(headers::AUTHORIZATION).is_some()\n || get_cookie_from_header(headers)\n .and_then(cookies::get_jwt_from_cookies)\n .is_ok()\n}" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/db/user.rs::MockDb::function::find_users_by_user_ids", + "file": "crates/router/src/db/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn find_users_by_user_ids(\n &self,\n _user_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n Err(errors::StorageError::MockDbError)?\n }", + "after_code": "async fn find_users_by_user_ids(\n &self,\n _user_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n Err(errors::StorageError::MockDbError)?\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use super::MockDb;" + ], + "after_imports": [ + "use super::{domain, MockDb};" + ] + }, + { + "id": "crates/router/src/types/domain/user.rs::NewUser::function::check_if_already_exists_in_db", + "file": "crates/router/src/types/domain/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn check_if_already_exists_in_db(&self, state: SessionState) -> UserResult<()> {\n if state\n .global_store\n .find_user_by_email(&self.get_email().into_inner())\n .await\n .is_ok()\n {\n return Err(report!(UserErrors::UserExists));\n }\n Ok(())\n }", + "after_code": "pub async fn check_if_already_exists_in_db(&self, state: SessionState) -> UserResult<()> {\n if state\n .global_store\n .find_user_by_email(&self.get_email())\n .await\n .is_ok()\n {\n return Err(report!(UserErrors::UserExists));\n }\n Ok(())\n }", + "diff_span": { + "before": " if state\n .global_store\n .find_user_by_email(&self.get_email().into_inner())\n .await\n .is_ok()", + "after": " if state\n .global_store\n .find_user_by_email(&self.get_email())\n .await\n .is_ok()" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/core/user.rs::function::send_verification_mail", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn send_verification_mail(\n state: SessionState,\n req: user_api::SendVerifyEmailRequest,\n auth_id: Option,\n) -> UserResponse<()> {\n let user_email = domain::UserEmail::try_from(req.email)?;\n let user = state\n .global_store\n .find_user_by_email(&user_email.into_inner())\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::UserNotFound)\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?;\n\n if user.is_verified {\n return Err(UserErrors::UserAlreadyVerified.into());\n }\n\n let email_contents = email_types::VerifyEmail {\n recipient_email: domain::UserEmail::from_pii_email(user.email)?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_SIGNUP,\n auth_id,\n };\n\n state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "after_code": "pub async fn send_verification_mail(\n state: SessionState,\n req: user_api::SendVerifyEmailRequest,\n auth_id: Option,\n) -> UserResponse<()> {\n let user_email = domain::UserEmail::try_from(req.email)?;\n let user = state\n .global_store\n .find_user_by_email(&user_email)\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::UserNotFound)\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?;\n\n if user.is_verified {\n return Err(UserErrors::UserAlreadyVerified.into());\n }\n\n let email_contents = email_types::VerifyEmail {\n recipient_email: domain::UserEmail::from_pii_email(user.email)?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_SIGNUP,\n auth_id,\n };\n\n state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "diff_span": { + "before": " let user = state\n .global_store\n .find_user_by_email(&user_email.into_inner())\n .await\n .map_err(|e| {", + "after": " let user = state\n .global_store\n .find_user_by_email(&user_email)\n .await\n .map_err(|e| {" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/db/user.rs::Store::function::update_user_by_email", + "file": "crates/router/src/db/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_email(&conn, user_email, user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }", + "after_code": "async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_email(&conn, user_email.get_inner(), user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }", + "diff_span": { + "before": "async fn update_user_by_email(\n &self,\n user_email: &pii::Email,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_email(&conn, user_email, user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))", + "after": "async fn update_user_by_email(\n &self,\n user_email: &domain::UserEmail,\n user: storage::UserUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::User::update_by_user_email(&conn, user_email.get_inner(), user)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use error_stack::report;" + ], + "after_imports": [ + "use error_stack::report;", + "use super::{domain, MockDb};" + ] + }, + { + "id": "crates/router/src/core/user.rs::function::forgot_password", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn forgot_password(\n state: SessionState,\n request: user_api::ForgotPasswordRequest,\n auth_id: Option,\n) -> UserResponse<()> {\n let user_email = domain::UserEmail::from_pii_email(request.email)?;\n\n let user_from_db = state\n .global_store\n .find_user_by_email(&user_email.into_inner())\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::UserNotFound)\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })\n .map(domain::UserFromStorage::from)?;\n\n let email_contents = email_types::ResetPassword {\n recipient_email: domain::UserEmail::from_pii_email(user_from_db.get_email())?,\n settings: state.conf.clone(),\n user_name: domain::UserName::new(user_from_db.get_name())?,\n subject: consts::user::EMAIL_SUBJECT_RESET_PASSWORD,\n auth_id,\n };\n\n state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await\n .map_err(|e| e.change_context(UserErrors::InternalServerError))?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "after_code": "pub async fn forgot_password(\n state: SessionState,\n request: user_api::ForgotPasswordRequest,\n auth_id: Option,\n) -> UserResponse<()> {\n let user_email = domain::UserEmail::from_pii_email(request.email)?;\n\n let user_from_db = state\n .global_store\n .find_user_by_email(&user_email)\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::UserNotFound)\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })\n .map(domain::UserFromStorage::from)?;\n\n let email_contents = email_types::ResetPassword {\n recipient_email: domain::UserEmail::from_pii_email(user_from_db.get_email())?,\n settings: state.conf.clone(),\n user_name: domain::UserName::new(user_from_db.get_name())?,\n subject: consts::user::EMAIL_SUBJECT_RESET_PASSWORD,\n auth_id,\n };\n\n state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await\n .map_err(|e| e.change_context(UserErrors::InternalServerError))?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "diff_span": { + "before": " let user_from_db = state\n .global_store\n .find_user_by_email(&user_email.into_inner())\n .await\n .map_err(|e| {", + "after": " let user_from_db = state\n .global_store\n .find_user_by_email(&user_email)\n .await\n .map_err(|e| {" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/core/user.rs::function::sso_sign", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn sso_sign(\n state: SessionState,\n request: user_api::SsoSignInRequest,\n user_from_single_purpose_token: Option,\n) -> UserResponse {\n let authentication_method_id =\n utils::user::get_sso_id_from_redis(&state, request.state.clone()).await?;\n\n let user_authentication_method = state\n .store\n .get_user_authentication_method_by_id(&authentication_method_id)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let open_id_private_config = utils::user::decrypt_oidc_private_config(\n &state,\n user_authentication_method.private_config,\n authentication_method_id,\n )\n .await?;\n\n let open_id_public_config = serde_json::from_value::(\n user_authentication_method\n .public_config\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"Public config not present\")?,\n )\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Unable to parse OpenIdConnectPublicConfig\")?;\n\n let redirect_url =\n utils::user::get_oidc_sso_redirect_url(&state, &open_id_public_config.name.to_string());\n let email = openidconnect::get_user_email_from_oidc_provider(\n &state,\n redirect_url,\n request.state,\n open_id_private_config.base_url.into(),\n open_id_private_config.client_id,\n request.code,\n open_id_private_config.client_secret,\n )\n .await?;\n\n // TODO: Use config to handle not found error\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&email.into_inner())\n .await\n .map(Into::into)\n .to_not_found_response(UserErrors::UserNotFound)?;\n\n if !user_from_db.is_verified() {\n state\n .global_store\n .update_user_by_user_id(\n user_from_db.get_user_id(),\n storage_user::UserUpdate::VerifyUser,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n }\n\n let next_flow = if let Some(user_from_single_purpose_token) = user_from_single_purpose_token {\n let current_flow =\n domain::CurrentFlow::new(user_from_single_purpose_token, domain::SPTFlow::SSO.into())?;\n current_flow.next(user_from_db, &state).await?\n } else {\n domain::NextFlow::from_origin(domain::Origin::SignInWithSSO, user_from_db, &state).await?\n };\n\n let token = next_flow.get_token(&state).await?;\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: next_flow.get_flow().into(),\n };\n\n auth::cookies::set_cookie_response(response, token)\n}", + "after_code": "pub async fn sso_sign(\n state: SessionState,\n request: user_api::SsoSignInRequest,\n user_from_single_purpose_token: Option,\n) -> UserResponse {\n let authentication_method_id =\n utils::user::get_sso_id_from_redis(&state, request.state.clone()).await?;\n\n let user_authentication_method = state\n .store\n .get_user_authentication_method_by_id(&authentication_method_id)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let open_id_private_config = utils::user::decrypt_oidc_private_config(\n &state,\n user_authentication_method.private_config,\n authentication_method_id,\n )\n .await?;\n\n let open_id_public_config = serde_json::from_value::(\n user_authentication_method\n .public_config\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"Public config not present\")?,\n )\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Unable to parse OpenIdConnectPublicConfig\")?;\n\n let redirect_url =\n utils::user::get_oidc_sso_redirect_url(&state, &open_id_public_config.name.to_string());\n let email = openidconnect::get_user_email_from_oidc_provider(\n &state,\n redirect_url,\n request.state,\n open_id_private_config.base_url.into(),\n open_id_private_config.client_id,\n request.code,\n open_id_private_config.client_secret,\n )\n .await?;\n\n // TODO: Use config to handle not found error\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&email)\n .await\n .map(Into::into)\n .to_not_found_response(UserErrors::UserNotFound)?;\n\n if !user_from_db.is_verified() {\n state\n .global_store\n .update_user_by_user_id(\n user_from_db.get_user_id(),\n storage_user::UserUpdate::VerifyUser,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n }\n\n let next_flow = if let Some(user_from_single_purpose_token) = user_from_single_purpose_token {\n let current_flow =\n domain::CurrentFlow::new(user_from_single_purpose_token, domain::SPTFlow::SSO.into())?;\n current_flow.next(user_from_db, &state).await?\n } else {\n domain::NextFlow::from_origin(domain::Origin::SignInWithSSO, user_from_db, &state).await?\n };\n\n let token = next_flow.get_token(&state).await?;\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: next_flow.get_flow().into(),\n };\n\n auth::cookies::set_cookie_response(response, token)\n}", + "diff_span": { + "before": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&email.into_inner())\n .await\n .map(Into::into)", + "after": " let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&email)\n .await\n .map(Into::into)" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/email/types.rs::struct::ProFeatureRequest", + "file": "crates/router/src/services/email/types.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct ProFeatureRequest {\n pub recipient_email: domain::UserEmail,\n pub feature_name: String,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub user_name: domain::UserName,\n pub user_email: domain::UserEmail,\n pub settings: std::sync::Arc,\n pub subject: String,\n}", + "after_code": "pub struct ProFeatureRequest {\n pub recipient_email: domain::UserEmail,\n pub feature_name: String,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub user_name: domain::UserName,\n pub user_email: domain::UserEmail,\n pub settings: std::sync::Arc,\n pub subject: String,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/services/email/types.rs::impl::ApiKeyExpiryReminder", + "file": "crates/router/src/services/email/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl EmailData for ApiKeyExpiryReminder {\n async fn get_email_data(&self) -> CustomResult {\n let recipient = self.recipient_email.clone().into_inner();\n\n let body = html::get_html_body(EmailBody::ApiKeyExpiryReminder {\n expires_in: self.expires_in,\n api_key_name: self.api_key_name.clone(),\n prefix: self.prefix.clone(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient,\n })\n }\n}", + "after_code": "impl EmailData for ApiKeyExpiryReminder {\n async fn get_email_data(&self) -> CustomResult {\n let recipient = self.recipient_email.clone().into_inner();\n\n let body = html::get_html_body(EmailBody::ApiKeyExpiryReminder {\n expires_in: self.expires_in,\n api_key_name: self.api_key_name.clone(),\n prefix: self.prefix.clone(),\n });\n\n Ok(EmailContents {\n subject: self.subject.to_string(),\n body: external_services::email::IntermediateString::new(body),\n recipient,\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};", + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ], + "after_imports": [ + "use crate::services::email::types::EmailBody;", + "use external_services::email::{EmailContents, EmailData, EmailError};" + ] + }, + { + "id": "crates/router/src/services/email/types.rs::struct::EmailToken", + "file": "crates/router/src/services/email/types.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct EmailToken {\n email: String,\n flow: domain::Origin,\n exp: u64,\n entity: Option,\n}", + "after_code": "pub struct EmailToken {\n email: String,\n flow: domain::Origin,\n exp: u64,\n entity: Option,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e", + "before_imports": [ + "use common_utils::{\n errors::{self, CustomResult},\n pii,\n};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/services/authentication/cookies.rs::function::get_jwt_from_cookies", + "file": "crates/router/src/services/authentication/cookies.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub fn get_jwt_from_cookies(cookies: &str) -> RouterResult {\n Cookie::split_parse(cookies)\n .find_map(|cookie| {\n cookie\n .ok()\n .filter(|parsed_cookie| parsed_cookie.name() == JWT_TOKEN_COOKIE_NAME)\n .map(|parsed_cookie| parsed_cookie.value().to_owned())\n })\n .ok_or(report!(ApiErrorResponse::InvalidJwtToken))\n .attach_printable(\"Unable to find JWT token in cookies\")\n}", + "diff_span": null, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/types/domain/user.rs::UserEmail::function::get_inner", + "file": "crates/router/src/types/domain/user.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub fn get_inner(&self) -> &pii::Email {\n &self.0\n }", + "diff_span": null, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + }, + { + "id": "crates/router/src/services/authentication/cookies.rs::function::parse_cookie", + "file": "crates/router/src/services/authentication/cookies.rs", + "kind": "function_item", + "status": "removed", + "before_code": "pub fn parse_cookie(cookies: &str) -> RouterResult {\n Cookie::split_parse(cookies)\n .find_map(|cookie| {\n cookie\n .ok()\n .filter(|parsed_cookie| parsed_cookie.name() == JWT_TOKEN_COOKIE_NAME)\n .map(|parsed_cookie| parsed_cookie.value().to_owned())\n })\n .ok_or(report!(ApiErrorResponse::InvalidCookie))\n .attach_printable(\"Cookie Parsing Failed\")\n}", + "after_code": null, + "diff_span": null, + "commit_sha": "a0300e5377a7e0806a48c07de6ac5c68da0ce63e" + } + ] +} \ No newline at end of file