Force trim slashes

Author: bencroker

CHANGELOG.md

@@ -1,10 +1,11 @@
 # Release Notes for Blitz CloudFront Purger
 
-## 4.1.3 - Unreleased
+## 4.1.3 - 2025-03-12
 
 ### Fixed
 
 - Fixed a typo in the field instructions on the plugin settings page ([#14](https://github.com/putyourlightson/craft-blitz-cloudfront/issues/14)).
+- Fixed a bug in which base site URLs containing sub-paths were not being purged ([#15](https://github.com/putyourlightson/craft-blitz-cloudfront/issues/15)).
 
 ## 4.1.2 - 2024-10-18
 

src/CloudFrontPurger.php

@@ -128,8 +128,8 @@ public function purgeSite(int $siteId, callable $setProgressHandler = null, bool
         }
 
         $path = $this->getPathFromUrl($site->getBaseUrl());
-        $path = rtrim($path, '/');
-        $this->sendRequest([$path . '/*']);
+        $wildcardPath = rtrim($path, '/') . '/*';
+        $this->sendRequest([$path, $wildcardPath]);
     }
 
     /**
@@ -255,9 +255,13 @@ private function getPathFromUrl(string $url): string
         $encodedReservedCharacters = ['%3B', '%2F', '%3F', '%3A', '%40', '%3D', '%26', '%2A'];
         $path = str_replace($encodedReservedCharacters, $reservedCharacters, urlencode($path));
 
-        // Append a trailing slash if `addTrailingSlashesToUrls` is `true`.
+        // CloudFront treats URLs with and without trailing slashes as distinct.
+        // https://github.com/putyourlightson/craft-blitz-cloudfront/pull/15
+        $path = rtrim($path, '/');
+
+        // Append a trailing slash if `addTrailingSlashesToUrls` is enabled.
         if (Craft::$app->config->general->addTrailingSlashesToUrls) {
-            $path = rtrim($path, '/') . '/';
+            $path = $path . '/';
         }
 
         return $path;