make cookie expire configurable (#144)

dachcom-digital · Oct 6, 2023 · e0566fc · e0566fc
1 parent 2771bba
commit e0566fc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
@@ -114,4 +114,4 @@ jobs:
                 continue-on-error: true
                 run: |
                     bin/console cache:warmup --env=test
-                    vendor/bin/ecs check ${{ github.workspace }}/lib/test-bundle/src/I18nBundle --config ${{ github.workspace }}/lib/test-bundle/ecs.php
+                    vendor/bin/ecs check ${{ github.workspace }}/lib/test-bundle/src/ --config ${{ github.workspace }}/lib/test-bundle/ecs.php
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -160,7 +160,10 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->booleanNode('httpOnly')
                             ->defaultTrue()
                         ->end()
-                        ->scalarnode('sameSite')
+                        ->scalarNode('expire')
+                            ->defaultValue('+1 year')
+                        ->end()
+                        ->scalarNode('sameSite')
                             ->defaultValue(Cookie::SAMESITE_LAX)
                             ->validate()
                                 ->ifNotInArray([Cookie::SAMESITE_NONE, Cookie::SAMESITE_LAX, Cookie::SAMESITE_STRICT])

diff --git a/src/Helper/CookieHelper.php b/src/Helper/CookieHelper.php
@@ -48,9 +48,10 @@ public function set(Response $response, array $params): Cookie
         $secure = $cookieConfig['secure'];
         $httpOnly = $cookieConfig['httpOnly'];
         $sameSite = $cookieConfig['sameSite'];
+        $expire = is_string($cookieConfig['expire']) ? strtotime($cookieConfig['expire']) : $cookieConfig['expire'];
 
         $cookieData = base64_encode(json_encode($params));
-        $cookie = new Cookie(Definitions::REDIRECT_COOKIE_NAME, $cookieData, strtotime('+1 year'), $path, $domain, $secure, $httpOnly, false, $sameSite);
+        $cookie = new Cookie(Definitions::REDIRECT_COOKIE_NAME, $cookieData, $expire, $path, $domain, $secure, $httpOnly, false, $sameSite);
         $response->headers->setCookie($cookie);
 
         return $cookie;