Merge branch 'main' into feature/didomi-integration

Author: aram356

Cargo.lock

@@ -40,6 +40,7 @@ log = "0.4.28"
 log-fastly = "0.11.12"
 lol_html = "2.7.0"
 once_cell = "1.21"
+matchit = "0.9"
 pin-project-lite = "0.2"
 rand = "0.8"
 regex = "1.12.2"

Cargo.toml

@@ -31,6 +31,7 @@ log = { workspace = true }
 rand = { workspace = true }
 log-fastly = { workspace = true }
 lol_html = { workspace = true }
+matchit = { workspace = true }
 pin-project-lite = { workspace = true }
 regex = { workspace = true }
 serde = { workspace = true }

crates/common/Cargo.toml

@@ -74,6 +74,7 @@ pub fn ensure_origin_backend(
         }
     }
 }
+
 pub fn ensure_backend_from_url(origin_url: &str) -> Result<String, Report<TrustedServerError>> {
     let parsed_url = Url::parse(origin_url).change_context(TrustedServerError::Proxy {
         message: format!("Invalid origin_url: {}", origin_url),

crates/common/src/backend.rs

@@ -14,7 +14,7 @@ use crate::integrations::{IntegrationEndpoint, IntegrationProxy, IntegrationRegi
 use crate::settings::{IntegrationConfig, Settings};
 
 const DIDOMI_INTEGRATION_ID: &str = "didomi";
-const DIDOMI_PREFIX: &str = "/didomi/consent";
+const DIDOMI_PREFIX: &str = "/integrations/didomi/consent";
 
 /// Configuration for the Didomi consent notice reverse proxy.
 #[derive(Debug, Clone, Deserialize, Serialize, Validate)]
@@ -178,11 +178,12 @@ pub fn register(settings: &Settings) -> Option<IntegrationRegistration> {
 
 #[async_trait(?Send)]
 impl IntegrationProxy for DidomiIntegration {
+    fn integration_name(&self) -> &'static str {
+        DIDOMI_INTEGRATION_ID
+    }
+
     fn routes(&self) -> Vec<IntegrationEndpoint> {
-        vec![
-            IntegrationEndpoint::get_prefix(DIDOMI_PREFIX),
-            IntegrationEndpoint::post_prefix(DIDOMI_PREFIX),
-        ]
+        vec![self.get("/consent/*"), self.post("/consent/*")]
     }
 
     async fn handle(
@@ -272,8 +273,8 @@ mod tests {
             .expect("should insert config");
 
         let registry = IntegrationRegistry::new(&settings);
-        assert!(registry.has_route(&Method::GET, "/didomi/consent/loader.js"));
-        assert!(registry.has_route(&Method::POST, "/didomi/consent/api/events"));
+        assert!(registry.has_route(&Method::GET, "/integrations/didomi/consent/loader.js"));
+        assert!(registry.has_route(&Method::POST, "/integrations/didomi/consent/api/events"));
         assert!(!registry.has_route(&Method::GET, "/other"));
     }
 }