refactor: extract URL normalization logic into reusable helper method

- Created normalize_path_from_url() helper that handles absolute URLs and context path prepending
- Updated fetch_url() to use the new helper for consistent path handling
- Updated send_document() to use the new helper, eliminating duplicate logic
- Maintains context path awareness for brokers deployed at subpaths
- All tests passing (131 pact_verifier tests)

Author: YOU54F

rust/pact-core-mock-server

@@ -0,0 +1 @@
+Subproject commit 819ac3df29462dc13fa66eac77082ce504608c57

rust/pact_verifier/src/pact_broker.rs

@@ -322,6 +322,35 @@ impl HALClient {
       self.fetch_url(&link_data, template_values).await
     }
 
+  /// Normalize a URL or path from a broker link, handling context paths and absolute URLs
+  fn normalize_path_from_url(&self, url_string: &str) -> Result<String, PactBrokerError> {
+    trace!("normalize_path_from_url(url='{}')", url_string);
+
+    // Extract path from URL if it's absolute, otherwise use as-is
+    let mut path = if let Ok(parsed_url) = url_string.parse::<Url>() {
+      // URL is absolute, extract path to use broker's original host and context path
+      parsed_url.path().to_string()
+    } else {
+      // URL is already a path (relative)
+      url_string.to_string()
+    };
+
+    // If we have a context path and the path doesn't already include it, prepend it
+    let broker_url = self.url.parse::<Url>()?;
+    let context_path = broker_url.path();
+    if !context_path.is_empty() && context_path != "/" && path.starts_with("/") {
+      let context_with_slash = format!("{}/", context_path);
+      let path_matches_context = path == context_path || path.starts_with(&context_with_slash);
+      if !path_matches_context {
+        // Path doesn't include context path, prepend it
+        debug!("Prepending context path '{}' to path '{}'", context_path, path);
+        path = format!("{}{}", context_path, path);
+      }
+    }
+
+    Ok(path)
+  }
+
   /// Fetch the resource at the Link from the Pact broker
   pub async fn fetch_url(
     &self,
@@ -340,9 +369,8 @@ impl HALClient {
         ))
     }?;
 
-    let base_url = self.url.parse::<Url>()?;
-    let joined_url = base_url.join(&link_url)?;
-    self.fetch(joined_url.path().into()).await
+    let path = self.normalize_path_from_url(&link_url)?;
+    self.fetch(&path).await
   }
 
   async fn fetch(&self, path: &str) -> Result<Value, PactBrokerError> {
@@ -528,29 +556,8 @@ impl HALClient {
   async fn send_document(&self, url: &str, body: &str, method: Method) -> Result<Value, PactBrokerError> {
     debug!("Sending JSON to {} using {}: {}", url, method, body);
 
-    // Extract path from URL if it's absolute (like fetch_url does), then resolve with context path
-    let mut path = if let Ok(link_as_url) = url.parse::<Url>() {
-      // URL is absolute, extract path to use broker's original host and context path
-      link_as_url.path().to_string()
-    } else {
-      // URL is already a path (relative)
-      url.to_string()
-    };
-
-    // If we have a context path and the path doesn't already include it, prepend it
-    let broker_url = self.url.parse::<Url>()?;
-    let context_path = broker_url.path();
-    if !context_path.is_empty() && context_path != "/" && path.starts_with("/") {
-      let context_with_slash = format!("{}/", context_path);
-      let path_matches_context = path == context_path || path.starts_with(&context_with_slash);
-      if !path_matches_context {
-        // Path doesn't include context path, prepend it
-        let full_path = format!("{}{}", context_path, path);
-        path = full_path;
-      }
-    }
-
-    let url = self.resolve_path(path.as_str())?;
+    let path = self.normalize_path_from_url(url)?;
+    let url = self.resolve_path(&path)?;
 
     let request_builder = match self.auth {
       Some(ref auth) => match auth {