Update Cloudfront cookies config keys and improve middleware condition check

Author: gertvanhout

config/cloudfront-cookies.php

@@ -3,17 +3,17 @@
 declare(strict_types=1);
 
 return [
-    'version' => env('CLOUDFRONT_VERSION', 'latest'),
+    'version' => env('CLOUDFRONT_COOKIES_VERSION', 'latest'),
 
-    'region' => env('CLOUDFRONT_REGION', 'us-east-1'),
+    'region' => env('CLOUDFRONT_COOKIES_REGION', 'us-east-1'),
 
-    'key_pair_id' => env('CLOUDFRONT_KEY_PAIR_ID', ''),
+    'key_pair_id' => env('CLOUDFRONT_COOKIES_KEY_PAIR_ID'),
 
-    'private_key_path' => env('CLOUDFRONT_PRIVATE_KEY_PATH', ''),
+    'private_key_path' => env('CLOUDFRONT_COOKIES_PRIVATE_KEY_PATH'),
 
-    'private_key_storage' => env('CLOUDFRONT_PRIVATE_KEY_STORAGE', 'local'),
+    'private_key_storage' => env('CLOUDFRONT_COOKIES_PRIVATE_KEY_STORAGE', 'local'),
 
-    'resource' => env('CLOUDFRONT_RESOURCE', 'http*://localhost/*'),
+    'resource' => env('CLOUDFRONT_COOKIES_RESOURCE', 'http*://localhost/*'),
 
     'cookies_expiration' => [
         'unit' => \Carbon\CarbonInterval::PERIOD_DAYS,

src/Http/Middleware/CloudfrontSignedCookiesMiddleware.php

@@ -16,9 +16,9 @@ public function handle(Request $request, Closure $next)
     {
         $cookies = collect(static::cookieNames());
 
-        $shouldNotSign = config('cloudfront-cookies.resource') === '' ||
-            config('cloudfront-cookies.key_pair_id') === '' ||
-            config('cloudfront-cookies.private_key_path') === '' ||
+        $shouldNotSign = !config('cloudfront-cookies.resource') ||
+            !config('cloudfront-cookies.key_pair_id') ||
+            !config('cloudfront-cookies.private_key_path') ||
             $cookies->every(function ($cookie) use ($request) {
                 return $request->hasCookie($cookie);
             });