fix(router): Make v2 endpoints follow standard naming conventions (#8630)

AnuthaDev · hyperswitch-bot[bot] · web-flow · commit 3230dec88824 · 2025-07-18T11:27:29.000Z
Co-authored-by: hyperswitch-bot[bot] &lt;148525504+hyperswitch-bot[bot]@users.noreply.github.com&gt;
diff --git a/api-reference/v2/openapi_spec_v2.json b/api-reference/v2/openapi_spec_v2.json
@@ -20,7 +20,7 @@
     }
   ],
   "paths": {
-    "/v2/organization": {
+    "/v2/organizations": {
       "post": {
         "tags": [
           "Organization"
@@ -67,7 +67,7 @@
         ]
       }
     },
-    "/v2/organization/{id}": {
+    "/v2/organizations/{id}": {
       "get": {
         "tags": [
           "Organization"
@@ -164,7 +164,7 @@
         ]
       }
     },
-    "/v2/organization/{id}/merchant-accounts": {
+    "/v2/organizations/{id}/merchant-accounts": {
       "get": {
         "tags": [
           "Organization"
@@ -1220,7 +1220,7 @@
         ]
       }
     },
-    "/v2/routing-algorithm": {
+    "/v2/routing-algorithms": {
       "post": {
         "tags": [
           "Routing"
@@ -1275,7 +1275,7 @@
         ]
       }
     },
-    "/v2/routing-algorithm/{id}": {
+    "/v2/routing-algorithms/{id}": {
       "get": {
         "tags": [
           "Routing"
@@ -2850,7 +2850,7 @@
         ]
       }
     },
-    "/v2/payment-method-session": {
+    "/v2/payment-method-sessions": {
       "post": {
         "tags": [
           "Payment Method Session"
@@ -2897,7 +2897,7 @@
         ]
       }
     },
-    "/v2/payment-method-session/{id}": {
+    "/v2/payment-method-sessions/{id}": {
       "get": {
         "tags": [
           "Payment Method Session"
@@ -2994,7 +2994,7 @@
         ]
       }
     },
-    "/v2/payment-method-session/{id}/list-payment-methods": {
+    "/v2/payment-method-sessions/{id}/list-payment-methods": {
       "get": {
         "tags": [
           "Payment Method Session"
@@ -3035,7 +3035,7 @@
         ]
       }
     },
-    "/v2/payment-method-session/{id}/update-saved-payment-method": {
+    "/v2/payment-method-sessions/{id}/update-saved-payment-method": {
       "put": {
         "tags": [
           "Payment Method Session"
@@ -3098,7 +3098,7 @@
         ]
       }
     },
-    "/v2/payment-method-session/{id}/confirm": {
+    "/v2/payment-method-sessions/{id}/confirm": {
       "post": {
         "tags": [
           "Payment Method Session"
@@ -3241,7 +3241,7 @@
         ]
       }
     },
-    "/v2/refunds/{id}/update_metadata": {
+    "/v2/refunds/{id}/update-metadata": {
       "put": {
         "tags": [
           "Refunds"
@@ -3377,7 +3377,7 @@
         ]
       }
     },
-    "/v2/process_tracker/revenue_recovery_workflow/{revenue_recovery_id}": {
+    "/v2/process-trackers/revenue-recovery-workflow/{revenue_recovery_id}": {
       "get": {
         "tags": [
           "Revenue Recovery"
diff --git a/api-reference/v2/organization/organization--create.mdx b/api-reference/v2/organization/organization--create.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: post /v2/organization
+openapi: post /v2/organizations
 ---
diff --git a/api-reference/v2/organization/organization--merchant-account--list.mdx b/api-reference/v2/organization/organization--merchant-account--list.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: get /v2/organization/{id}/merchant-accounts
+openapi: get /v2/organizations/{id}/merchant-accounts
 ---
diff --git a/api-reference/v2/organization/organization--retrieve.mdx b/api-reference/v2/organization/organization--retrieve.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: get /v2/organization/{id}
+openapi: get /v2/organizations/{id}
 ---
diff --git a/api-reference/v2/organization/organization--update.mdx b/api-reference/v2/organization/organization--update.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: put /v2/organization/{id}
+openapi: put /v2/organizations/{id}
 ---
diff --git a/api-reference/v2/payment-method-session/payment-method-session--confirm-a-payment-method-session.mdx b/api-reference/v2/payment-method-session/payment-method-session--confirm-a-payment-method-session.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: post /v2/payment-method-session/{id}/confirm
+openapi: post /v2/payment-method-sessions/{id}/confirm
 ---
diff --git a/api-reference/v2/payment-method-session/payment-method-session--create.mdx b/api-reference/v2/payment-method-session/payment-method-session--create.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: post /v2/payment-method-session
+openapi: post /v2/payment-method-sessions
 ---
diff --git a/api-reference/v2/payment-method-session/payment-method-session--delete-a-saved-payment-method.mdx b/api-reference/v2/payment-method-session/payment-method-session--delete-a-saved-payment-method.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: delete /v2/payment-method-session/{id}
+openapi: delete /v2/payment-method-sessions/{id}
 ---
diff --git a/api-reference/v2/payment-method-session/payment-method-session--list-payment-methods.mdx b/api-reference/v2/payment-method-session/payment-method-session--list-payment-methods.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: get /v2/payment-method-session/{id}/list-payment-methods
+openapi: get /v2/payment-method-sessions/{id}/list-payment-methods
 ---
diff --git a/api-reference/v2/payment-method-session/payment-method-session--retrieve.mdx b/api-reference/v2/payment-method-session/payment-method-session--retrieve.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: get /v2/payment-method-session/{id}
+openapi: get /v2/payment-method-sessions/{id}
 ---
diff --git a/api-reference/v2/payment-method-session/payment-method-session--update-a-saved-payment-method.mdx b/api-reference/v2/payment-method-session/payment-method-session--update-a-saved-payment-method.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: put /v2/payment-method-session/{id}/update-saved-payment-method
+openapi: put /v2/payment-method-sessions/{id}/update-saved-payment-method
 ---
diff --git a/api-reference/v2/revenue-recovery/revenue-recovery--retrieve.mdx b/api-reference/v2/revenue-recovery/revenue-recovery--retrieve.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: get /v2/process_tracker/revenue_recovery_workflow/{revenue_recovery_id}
+openapi: get /v2/process-trackers/revenue-recovery-workflow/{revenue_recovery_id}
 ---
diff --git a/api-reference/v2/routing/routing--create.mdx b/api-reference/v2/routing/routing--create.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: post /v2/routing-algorithm
+openapi: post /v2/routing-algorithms
 ---
diff --git a/api-reference/v2/routing/routing--retrieve.mdx b/api-reference/v2/routing/routing--retrieve.mdx
@@ -1,3 +1,3 @@
 ---
-openapi: get /v2/routing-algorithm/{id}
+openapi: get /v2/routing-algorithms/{id}
 ---
diff --git a/crates/hyperswitch_connectors/src/connectors/hyperswitch_vault.rs b/crates/hyperswitch_connectors/src/connectors/hyperswitch_vault.rs
@@ -85,7 +85,7 @@ impl ConnectorIntegration<ExternalVaultCreateFlow, VaultRequestData, VaultRespon
         connectors: &Connectors,
     ) -> CustomResult<String, errors::ConnectorError> {
         Ok(format!(
-            "{}/v2/payment-methods-session",
+            "{}/v2/payment-method-sessions",
             self.base_url(connectors)
         ))
     }
diff --git a/crates/openapi/src/routes/organization.rs b/crates/openapi/src/routes/organization.rs
@@ -77,7 +77,7 @@ pub async fn organization_update() {}
 /// Create a new organization
 #[utoipa::path(
     post,
-    path = "/v2/organization",
+    path = "/v2/organizations",
     request_body(
         content = OrganizationCreateRequest,
         examples(
@@ -104,7 +104,7 @@ pub async fn organization_create() {}
 /// Retrieve an existing organization
 #[utoipa::path(
     get,
-    path = "/v2/organization/{id}",
+    path = "/v2/organizations/{id}",
     params (("id" = String, Path, description = "The unique identifier for the Organization")),
     responses(
         (status = 200, description = "Organization Created", body =OrganizationResponse),
@@ -122,7 +122,7 @@ pub async fn organization_retrieve() {}
 /// Create a new organization for .
 #[utoipa::path(
     put,
-    path = "/v2/organization/{id}",
+    path = "/v2/organizations/{id}",
     request_body(
         content = OrganizationUpdateRequest,
         examples(
@@ -150,7 +150,7 @@ pub async fn organization_update() {}
 /// List merchant accounts for an Organization
 #[utoipa::path(
     get,
-    path = "/v2/organization/{id}/merchant-accounts",
+    path = "/v2/organizations/{id}/merchant-accounts",
     params (("id" = String, Path, description = "The unique identifier for the Organization")),
     responses(
         (status = 200, description = "Merchant Account list retrieved successfully", body = Vec<MerchantAccountResponse>),
diff --git a/crates/openapi/src/routes/payment_method.rs b/crates/openapi/src/routes/payment_method.rs
@@ -353,7 +353,7 @@ pub async fn list_customer_payment_method_api() {}
 #[cfg(feature = "v2")]
 #[utoipa::path(
     post,
-    path = "/v2/payment-method-session",
+    path = "/v2/payment-method-sessions",
     request_body(
     content = PaymentMethodSessionRequest,
         examples  (( "Create a payment method session with customer_id" = (
@@ -378,7 +378,7 @@ pub fn payment_method_session_create() {}
 #[cfg(feature = "v2")]
 #[utoipa::path(
     get,
-    path = "/v2/payment-method-session/{id}",
+    path = "/v2/payment-method-sessions/{id}",
     params (
         ("id" = String, Path, description = "The unique identifier for the Payment Method Session"),
     ),
@@ -399,7 +399,7 @@ pub fn payment_method_session_retrieve() {}
 #[cfg(feature = "v2")]
 #[utoipa::path(
     get,
-    path = "/v2/payment-method-session/{id}/list-payment-methods",
+    path = "/v2/payment-method-sessions/{id}/list-payment-methods",
     params (
         ("id" = String, Path, description = "The unique identifier for the Payment Method Session"),
     ),
@@ -419,7 +419,7 @@ pub fn payment_method_session_list_payment_methods() {}
 #[cfg(feature = "v2")]
 #[utoipa::path(
     put,
-    path = "/v2/payment-method-session/{id}/update-saved-payment-method",
+    path = "/v2/payment-method-sessions/{id}/update-saved-payment-method",
     params (
         ("id" = String, Path, description = "The unique identifier for the Payment Method Session"),
     ),
@@ -453,7 +453,7 @@ pub fn payment_method_session_update_saved_payment_method() {}
 #[cfg(feature = "v2")]
 #[utoipa::path(
     delete,
-    path = "/v2/payment-method-session/{id}",
+    path = "/v2/payment-method-sessions/{id}",
     params (
         ("id" = String, Path, description = "The unique identifier for the Payment Method Session"),
     ),
@@ -520,7 +520,7 @@ pub async fn tokenize_card_using_pm_api() {}
 /// **Confirms a payment method session object with the payment method data**
 #[utoipa::path(
   post,
-  path = "/v2/payment-method-session/{id}/confirm",
+  path = "/v2/payment-method-sessions/{id}/confirm",
   params (("id" = String, Path, description = "The unique identifier for the Payment Method Session"),
       (
         "X-Profile-Id" = String, Header,
diff --git a/crates/openapi/src/routes/refunds.rs b/crates/openapi/src/routes/refunds.rs
@@ -221,7 +221,7 @@ pub async fn refunds_create() {}
 /// Updates the properties of a Refund object. This API can be used to attach a reason for the refund or metadata fields
 #[utoipa::path(
     put,
-    path = "/v2/refunds/{id}/update_metadata",
+    path = "/v2/refunds/{id}/update-metadata",
     params(
         ("id" = String, Path, description = "The identifier for refund")
     ),
diff --git a/crates/openapi/src/routes/revenue_recovery.rs b/crates/openapi/src/routes/revenue_recovery.rs
@@ -4,7 +4,7 @@
 /// Retrieve the Revenue Recovery Payment Info
 #[utoipa::path(
     get,
-    path = "/v2/process_tracker/revenue_recovery_workflow/{revenue_recovery_id}",
+    path = "/v2/process-trackers/revenue-recovery-workflow/{revenue_recovery_id}",
     params(
         ("recovery_recovery_id" = String, Path, description = "The payment intent id"),
     ),
diff --git a/crates/openapi/src/routes/routing.rs b/crates/openapi/src/routes/routing.rs
@@ -26,7 +26,7 @@ pub async fn routing_create_config() {}
 /// Create a routing algorithm
 #[utoipa::path(
     post,
-    path = "/v2/routing-algorithm",
+    path = "/v2/routing-algorithms",
     request_body = RoutingConfigRequest,
     responses(
         (status = 200, description = "Routing Algorithm created", body = RoutingDictionaryRecord),
@@ -92,7 +92,7 @@ pub async fn routing_retrieve_config() {}
 /// Retrieve a routing algorithm with its algorithm id
 #[utoipa::path(
     get,
-    path = "/v2/routing-algorithm/{id}",
+    path = "/v2/routing-algorithms/{id}",
     params(
         ("id" = String, Path, description = "The unique identifier for a routing algorithm"),
     ),
diff --git a/crates/router/src/lib.rs b/crates/router/src/lib.rs
@@ -210,7 +210,10 @@ pub fn mk_app(
 
         #[cfg(feature = "v2")]
         {
-            server_app = server_app.service(routes::ProcessTracker::server(state.clone()));
+            server_app = server_app
+                .service(routes::UserDeprecated::server(state.clone()))
+                .service(routes::ProcessTrackerDeprecated::server(state.clone()))
+                .service(routes::ProcessTracker::server(state.clone()));
         }
     }
 
diff --git a/crates/router/src/routes.rs b/crates/router/src/routes.rs
@@ -91,8 +91,9 @@ pub use self::app::{
     ApiKeys, AppState, ApplePayCertificatesMigration, Authentication, Cache, Cards, Chat, Configs,
     ConnectorOnboarding, Customers, Disputes, EphemeralKey, FeatureMatrix, Files, Forex, Gsm,
     Health, Hypersense, Mandates, MerchantAccount, MerchantConnectorAccount, PaymentLink,
-    PaymentMethods, Payments, Poll, ProcessTracker, Profile, ProfileAcquirer, ProfileNew, Refunds,
-    Relay, RelayWebhooks, SessionState, ThreeDsDecisionRule, User, Webhooks,
+    PaymentMethods, Payments, Poll, ProcessTracker, ProcessTrackerDeprecated, Profile,
+    ProfileAcquirer, ProfileNew, Refunds, Relay, RelayWebhooks, SessionState, ThreeDsDecisionRule,
+    User, UserDeprecated, Webhooks,
 };
 #[cfg(feature = "olap")]
 pub use self::app::{Blocklist, Organization, Routing, Verify, WebhookEvents};
diff --git a/crates/router/src/routes/app.rs b/crates/router/src/routes/app.rs
diff --git a/cypress-tests-v2/cypress/support/commands.js b/cypress-tests-v2/cypress/support/commands.js

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`}`
`21`	`21`	`],`
`22`	`22`	`"paths": {`
`23`		`- "/v2/organization": {`
	`23`	`+ "/v2/organizations": {`
`24`	`24`	`"post": {`
`25`	`25`	`"tags": [`
`26`	`26`	`"Organization"`
`@@ -67,7 +67,7 @@`
`67`	`67`	`]`
`68`	`68`	`}`
`69`	`69`	`},`
`70`		`- "/v2/organization/{id}": {`
	`70`	`+ "/v2/organizations/{id}": {`
`71`	`71`	`"get": {`
`72`	`72`	`"tags": [`
`73`	`73`	`"Organization"`
`@@ -164,7 +164,7 @@`
`164`	`164`	`]`
`165`	`165`	`}`
`166`	`166`	`},`
`167`		`- "/v2/organization/{id}/merchant-accounts": {`
	`167`	`+ "/v2/organizations/{id}/merchant-accounts": {`
`168`	`168`	`"get": {`
`169`	`169`	`"tags": [`
`170`	`170`	`"Organization"`
`@@ -1220,7 +1220,7 @@`
`1220`	`1220`	`]`
`1221`	`1221`	`}`
`1222`	`1222`	`},`
`1223`		`- "/v2/routing-algorithm": {`
	`1223`	`+ "/v2/routing-algorithms": {`
`1224`	`1224`	`"post": {`
`1225`	`1225`	`"tags": [`
`1226`	`1226`	`"Routing"`
`@@ -1275,7 +1275,7 @@`
`1275`	`1275`	`]`
`1276`	`1276`	`}`
`1277`	`1277`	`},`
`1278`		`- "/v2/routing-algorithm/{id}": {`
	`1278`	`+ "/v2/routing-algorithms/{id}": {`
`1279`	`1279`	`"get": {`
`1280`	`1280`	`"tags": [`
`1281`	`1281`	`"Routing"`
`@@ -2850,7 +2850,7 @@`
`2850`	`2850`	`]`
`2851`	`2851`	`}`
`2852`	`2852`	`},`
`2853`		`- "/v2/payment-method-session": {`
	`2853`	`+ "/v2/payment-method-sessions": {`
`2854`	`2854`	`"post": {`
`2855`	`2855`	`"tags": [`
`2856`	`2856`	`"Payment Method Session"`
`@@ -2897,7 +2897,7 @@`
`2897`	`2897`	`]`
`2898`	`2898`	`}`
`2899`	`2899`	`},`
`2900`		`- "/v2/payment-method-session/{id}": {`
	`2900`	`+ "/v2/payment-method-sessions/{id}": {`
`2901`	`2901`	`"get": {`
`2902`	`2902`	`"tags": [`
`2903`	`2903`	`"Payment Method Session"`
`@@ -2994,7 +2994,7 @@`
`2994`	`2994`	`]`
`2995`	`2995`	`}`
`2996`	`2996`	`},`
`2997`		`- "/v2/payment-method-session/{id}/list-payment-methods": {`
	`2997`	`+ "/v2/payment-method-sessions/{id}/list-payment-methods": {`
`2998`	`2998`	`"get": {`
`2999`	`2999`	`"tags": [`
`3000`	`3000`	`"Payment Method Session"`
`@@ -3035,7 +3035,7 @@`
`3035`	`3035`	`]`
`3036`	`3036`	`}`
`3037`	`3037`	`},`
`3038`		`- "/v2/payment-method-session/{id}/update-saved-payment-method": {`
	`3038`	`+ "/v2/payment-method-sessions/{id}/update-saved-payment-method": {`
`3039`	`3039`	`"put": {`
`3040`	`3040`	`"tags": [`
`3041`	`3041`	`"Payment Method Session"`
`@@ -3098,7 +3098,7 @@`
`3098`	`3098`	`]`
`3099`	`3099`	`}`
`3100`	`3100`	`},`
`3101`		`- "/v2/payment-method-session/{id}/confirm": {`
	`3101`	`+ "/v2/payment-method-sessions/{id}/confirm": {`
`3102`	`3102`	`"post": {`
`3103`	`3103`	`"tags": [`
`3104`	`3104`	`"Payment Method Session"`
`@@ -3241,7 +3241,7 @@`
`3241`	`3241`	`]`
`3242`	`3242`	`}`
`3243`	`3243`	`},`
`3244`		`- "/v2/refunds/{id}/update_metadata": {`
	`3244`	`+ "/v2/refunds/{id}/update-metadata": {`
`3245`	`3245`	`"put": {`
`3246`	`3246`	`"tags": [`
`3247`	`3247`	`"Refunds"`
`@@ -3377,7 +3377,7 @@`
`3377`	`3377`	`]`
`3378`	`3378`	`}`
`3379`	`3379`	`},`
`3380`		`- "/v2/process_tracker/revenue_recovery_workflow/{revenue_recovery_id}": {`
	`3380`	`+ "/v2/process-trackers/revenue-recovery-workflow/{revenue_recovery_id}": {`
`3381`	`3381`	`"get": {`
`3382`	`3382`	`"tags": [`
`3383`	`3383`	`"Revenue Recovery"`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 ---
 -openapi: post /v2/organization
 +openapi: post /v2/organizations
 ---