Merge branch 'main' into nexixpay-card-mandates

crates/api_models/src/enums.rs

@@ -446,3 +446,20 @@ pub enum StripeChargeType {
 pub fn convert_frm_connector(connector_name: &str) -> Option<FrmConnectors> {
     FrmConnectors::from_str(connector_name).ok()
 }
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, serde::Serialize, Hash)]
+pub enum ReconPermissionScope {
+    #[serde(rename = "R")]
+    Read = 0,
+    #[serde(rename = "RW")]
+    Write = 1,
+}
+
+impl From<PermissionScope> for ReconPermissionScope {
+    fn from(scope: PermissionScope) -> Self {
+        match scope {
+            PermissionScope::Read => Self::Read,
+            PermissionScope::Write => Self::Write,
+        }
+    }
+}

crates/api_models/src/events/recon.rs

@@ -1,6 +1,9 @@
 use common_utils::events::{ApiEventMetric, ApiEventsType};
+use masking::PeekInterface;
 
-use crate::recon::{ReconStatusResponse, ReconTokenResponse, ReconUpdateMerchantRequest};
+use crate::recon::{
+    ReconStatusResponse, ReconTokenResponse, ReconUpdateMerchantRequest, VerifyTokenResponse,
+};
 
 impl ApiEventMetric for ReconUpdateMerchantRequest {
     fn get_api_event_type(&self) -> Option<ApiEventsType> {
@@ -19,3 +22,11 @@ impl ApiEventMetric for ReconStatusResponse {
         Some(ApiEventsType::Recon)
     }
 }
+
+impl ApiEventMetric for VerifyTokenResponse {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::User {
+            user_id: self.user_email.peek().to_string(),
+        })
+    }
+}

crates/api_models/src/events/user.rs

@@ -1,11 +1,7 @@
 use common_utils::events::{ApiEventMetric, ApiEventsType};
-#[cfg(feature = "recon")]
-use masking::PeekInterface;
 
 #[cfg(feature = "dummy_connector")]
 use crate::user::sample_data::SampleDataRequest;
-#[cfg(feature = "recon")]
-use crate::user::VerifyTokenResponse;
 use crate::user::{
     dashboard_metadata::{
         GetMetaDataRequest, GetMetaDataResponse, GetMultipleMetaDataPayload, SetMetaDataRequest,
@@ -23,15 +19,6 @@ use crate::user::{
     VerifyTotpRequest,
 };
 
-#[cfg(feature = "recon")]
-impl ApiEventMetric for VerifyTokenResponse {
-    fn get_api_event_type(&self) -> Option<ApiEventsType> {
-        Some(ApiEventsType::User {
-            user_id: self.user_email.peek().to_string(),
-        })
-    }
-}
-
 common_utils::impl_api_event_type!(
     Miscellaneous,
     (

crates/api_models/src/recon.rs

@@ -1,4 +1,4 @@
-use common_utils::pii;
+use common_utils::{id_type, pii};
 use masking::Secret;
 
 use crate::enums;
@@ -18,3 +18,11 @@ pub struct ReconTokenResponse {
 pub struct ReconStatusResponse {
     pub recon_status: enums::ReconStatus,
 }
+
+#[derive(serde::Serialize, Debug)]
+pub struct VerifyTokenResponse {
+    pub merchant_id: id_type::MerchantId,
+    pub user_email: pii::Email,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub acl: Option<String>,
+}

crates/api_models/src/user.rs

@@ -167,13 +167,6 @@ pub struct SendVerifyEmailRequest {
     pub email: pii::Email,
 }
 
-#[cfg(feature = "recon")]
-#[derive(serde::Serialize, Debug)]
-pub struct VerifyTokenResponse {
-    pub merchant_id: id_type::MerchantId,
-    pub user_email: pii::Email,
-}
-
 #[derive(Debug, serde::Deserialize, serde::Serialize)]
 pub struct UpdateUserAccountDetailsRequest {
     pub name: Option<Secret<String>>,

crates/common_enums/src/enums.rs

@@ -2819,9 +2819,15 @@ pub enum PermissionGroup {
     MerchantDetailsManage,
     // TODO: To be deprecated, make sure DB is migrated before removing
     OrganizationManage,
-    ReconOps,
     AccountView,
     AccountManage,
+    ReconReportsView,
+    ReconReportsManage,
+    ReconOpsView,
+    // Alias is added for backward compatibility with database
+    // TODO: Remove alias post migration
+    #[serde(alias = "recon_ops")]
+    ReconOpsManage,
 }
 
 #[derive(Clone, Debug, serde::Serialize, PartialEq, Eq, Hash, strum::EnumIter)]
@@ -2831,7 +2837,8 @@ pub enum ParentGroup {
     Workflows,
     Analytics,
     Users,
-    Recon,
+    ReconOps,
+    ReconReports,
     Account,
 }
 
@@ -2854,7 +2861,13 @@ pub enum Resource {
     WebhookEvent,
     Payout,
     Report,
-    Recon,
+    ReconToken,
+    ReconFiles,
+    ReconAndSettlementAnalytics,
+    ReconUpload,
+    ReconReports,
+    RunRecon,
+    ReconConfig,
 }
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, serde::Serialize, Hash)]

crates/connector_configs/src/connector.rs

@@ -120,6 +120,7 @@ pub struct ConfigMetadata {
 #[derive(Debug, Deserialize, serde::Serialize, Clone)]
 pub struct ConnectorWalletDetailsConfig {
     pub samsung_pay: Option<Vec<InputData>>,
+    pub paze: Option<Vec<InputData>>,
 }
 
 #[serde_with::skip_serializing_none]

crates/connector_configs/toml/development.toml

@@ -1325,6 +1325,25 @@ required=true
 type="MultiSelect"
 options=["visa","masterCard","amex","discover"]
 
+[[cybersource.connector_wallets_details.paze]]
+name="client_id"
+label="Client Id"
+placeholder="Enter paze Client Id"
+required=true
+type="Text"
+[[cybersource.connector_wallets_details.paze]]
+name="client_profile_id"
+label="Client Profile Id"
+placeholder="Enter Client Profile Id"
+required=true
+type="Text"
+[[cybersource.connector_wallets_details.paze]]
+name="client_name"
+label="Display Name"
+placeholder="Enter Display Name"
+required=true
+type="Text"
+
 [cybersource.metadata.acquirer_bin]
 name="acquirer_bin"
 label="Acquirer Bin"