From daeef4fe0adfc3d46edf5d278b096209a3388152 Mon Sep 17 00:00:00 2001
From: Eric Fortmeyer <efortmeyer@bethel.jw.org>
Date: Sun, 21 May 2023 00:52:39 -0500
Subject: [PATCH] fix: inject the token into the middleware

The response filter and the token storage require access to the token.

BREAKING CHANGE: Inject the token into the `CsrfResponseFilterMiddleware`'s constructor.  The `CsrfTokenGenerator` has been removed.
---
 README.md                                     |  2 +-
 acceptance-test-results.md                    |  2 +-
 ...ion-Http-CsrfResponseFilterMiddleware.html | 14 ++++----
 docs/graphs/classes.svg                       | 12 +++----
 docs/indices/files.html                       |  1 -
 docs/js/searchIndex.js                        | 15 ---------
 docs/namespaces/phpolar-csrfprotection.html   |  3 --
 docs/packages/Phpolar-CsrfProtection.html     |  3 --
 phpunit.dev.xml                               |  2 +-
 src/CsrfTokenGenerator.php                    | 26 ---------------
 src/Http/CsrfResponseFilterMiddleware.php     | 13 ++++----
 tests/acceptance/MemoryUsageTest.php          |  2 +-
 tests/unit/CsrfTokenGeneratorTest.php         | 32 -------------------
 .../Http/CsrfResponseFilterMiddlewareTest.php |  4 +--
 14 files changed, 23 insertions(+), 108 deletions(-)
 delete mode 100644 src/CsrfTokenGenerator.php
 delete mode 100644 tests/unit/CsrfTokenGeneratorTest.php

diff --git a/README.md b/README.md
index 8de1791..d515bee 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,6 @@ $preparedResponse = $middleWare->process($request, $routingHandler);
 ## Thresholds
 |Source Code Size|Memory Usage|
 |----------------|------------|
-|4.5 kB|108 kB
+|4.2 kB|108 kB
 
 [Back to top](#csrf-protection)
diff --git a/acceptance-test-results.md b/acceptance-test-results.md
index 5c98518..455ed0b 100644
--- a/acceptance-test-results.md
+++ b/acceptance-test-results.md
@@ -23,5 +23,5 @@
 - [x] Memory usage shall be below 108000 bytes
 
 ## Project Size (Phpolar\CsrfProtection\ProjectSize)
-- [x] Source code total size shall be below 4500 bytes
+- [x] Source code total size shall be below 4200 bytes
 
diff --git a/docs/classes/Phpolar-CsrfProtection-Http-CsrfResponseFilterMiddleware.html b/docs/classes/Phpolar-CsrfProtection-Http-CsrfResponseFilterMiddleware.html
index aab5a5b..42f5152 100644
--- a/docs/classes/Phpolar-CsrfProtection-Http-CsrfResponseFilterMiddleware.html
+++ b/docs/classes/Phpolar-CsrfProtection-Http-CsrfResponseFilterMiddleware.html
@@ -206,31 +206,31 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                    <span class="phpdocumentor-signature__name">__construct</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><a href="classes/Phpolar-CsrfProtection-Storage-AbstractTokenStorage.html"><abbr title="\Phpolar\CsrfProtection\Storage\AbstractTokenStorage">AbstractTokenStorage</abbr></a>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$storage</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type"><a href="classes/Phpolar-CsrfProtection-CsrfTokenGenerator.html"><abbr title="\Phpolar\CsrfProtection\CsrfTokenGenerator">CsrfTokenGenerator</abbr></a>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$tokenGenerator</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Phpolar\Http\Message\ResponseFilterStrategyInterface">ResponseFilterStrategyInterface</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$filterStrategy</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
+                    <span class="phpdocumentor-signature__name">__construct</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><a href="classes/Phpolar-CsrfProtection-CsrfToken.html"><abbr title="\Phpolar\CsrfProtection\CsrfToken">CsrfToken</abbr></a>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$token</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type"><a href="classes/Phpolar-CsrfProtection-Storage-AbstractTokenStorage.html"><abbr title="\Phpolar\CsrfProtection\Storage\AbstractTokenStorage">AbstractTokenStorage</abbr></a>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$storage</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Phpolar\Http\Message\ResponseFilterInterface">ResponseFilterInterface</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$responseFilter</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
 
         <section class="phpdocumentor-description"></section>
 
         <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
     <dl class="phpdocumentor-argument-list">
                     <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$storage</span>
-                : <span class="phpdocumentor-signature__argument__return-type"><a href="classes/Phpolar-CsrfProtection-Storage-AbstractTokenStorage.html"><abbr title="\Phpolar\CsrfProtection\Storage\AbstractTokenStorage">AbstractTokenStorage</abbr></a></span>
+                <span class="phpdocumentor-signature__argument__name">$token</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><a href="classes/Phpolar-CsrfProtection-CsrfToken.html"><abbr title="\Phpolar\CsrfProtection\CsrfToken">CsrfToken</abbr></a></span>
                             </dt>
             <dd class="phpdocumentor-argument-list__definition">
                     <section class="phpdocumentor-description"></section>
 
             </dd>
                     <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$tokenGenerator</span>
-                : <span class="phpdocumentor-signature__argument__return-type"><a href="classes/Phpolar-CsrfProtection-CsrfTokenGenerator.html"><abbr title="\Phpolar\CsrfProtection\CsrfTokenGenerator">CsrfTokenGenerator</abbr></a></span>
+                <span class="phpdocumentor-signature__argument__name">$storage</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><a href="classes/Phpolar-CsrfProtection-Storage-AbstractTokenStorage.html"><abbr title="\Phpolar\CsrfProtection\Storage\AbstractTokenStorage">AbstractTokenStorage</abbr></a></span>
                             </dt>
             <dd class="phpdocumentor-argument-list__definition">
                     <section class="phpdocumentor-description"></section>
 
             </dd>
                     <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$filterStrategy</span>
-                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Phpolar\Http\Message\ResponseFilterStrategyInterface">ResponseFilterStrategyInterface</abbr></span>
+                <span class="phpdocumentor-signature__argument__name">$responseFilter</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Phpolar\Http\Message\ResponseFilterInterface">ResponseFilterInterface</abbr></span>
                             </dt>
             <dd class="phpdocumentor-argument-list__definition">
                     <section class="phpdocumentor-description"></section>
diff --git a/docs/graphs/classes.svg b/docs/graphs/classes.svg
index 1750010..7eb379a 100644
--- a/docs/graphs/classes.svg
+++ b/docs/graphs/classes.svg
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="534px" preserveAspectRatio="none" style="width:547px;height:534px;" version="1.1" viewBox="0 0 547 534" width="547px" zoomAndPan="magnify"><defs/><g><!--MD5=[540ebe81cd522f86a29871f64de41617]
-cluster Phpolar\\CsrfProtection--><polygon fill="#FFFFFF" points="300,372,486,372,493,394.2969,496,394.2969,496,522,300,522,300,372" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="300" x2="493" y1="394.2969" y2="394.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="180" x="304" y="386.9951">Phpolar\CsrfProtection</text><!--MD5=[b0599d64809b33a47852a51499c9b6df]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="467px" preserveAspectRatio="none" style="width:547px;height:467px;" version="1.1" viewBox="0 0 547 467" width="547px" zoomAndPan="magnify"><defs/><g><!--MD5=[540ebe81cd522f86a29871f64de41617]
+cluster Phpolar\\CsrfProtection--><polygon fill="#FFFFFF" points="300,372,486,372,493,394.2969,496,394.2969,496,455,300,455,300,372" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="300" x2="493" y1="394.2969" y2="394.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="180" x="304" y="386.9951">Phpolar\CsrfProtection</text><!--MD5=[b0599d64809b33a47852a51499c9b6df]
 cluster Phpolar\\CsrfProtection\\Http--><polygon fill="#FFFFFF" points="271,131,495,131,502,153.2969,525,153.2969,525,348,271,348,271,131" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="271" x2="502" y1="153.2969" y2="153.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="218" x="275" y="145.9951">Phpolar\CsrfProtection\Http</text><!--MD5=[8e860edd58322d7276ac762460b19afb]
 cluster Psr\\Http\\Server--><polygon fill="#FFFFFF" points="22,131,150,131,157,153.2969,243,153.2969,243,281,22,281,22,131" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="157" y1="153.2969" y2="153.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="122" x="26" y="145.9951">Psr\Http\Server</text><!--MD5=[4214a011deaa3a50b2f5d003099ceada]
 cluster Phpolar\\CsrfProtection\\Storage--><polygon fill="#FFFFFF" points="30.5,24,283.5,24,290.5,46.2969,498.5,46.2969,498.5,107,30.5,107,30.5,24" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="30.5" x2="290.5" y1="46.2969" y2="46.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="247" x="34.5" y="38.9951">Phpolar\CsrfProtection\Storage</text><!--MD5=[e43d7e1031fd6c0e780976ee6e7f49d7]
-class Phpolar\\CsrfProtection\\CsrfToken--><rect fill="#FEFECE" height="32" id="Phpolar\\CsrfProtection\\CsrfToken" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="351" y="407"/><ellipse cx="366" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M368.9688,428.6406 Q368.3906,428.9375 367.75,429.0781 Q367.1094,429.2344 366.4063,429.2344 Q363.9063,429.2344 362.5781,427.5938 Q361.2656,425.9375 361.2656,422.8125 Q361.2656,419.6875 362.5781,418.0313 Q363.9063,416.375 366.4063,416.375 Q367.1094,416.375 367.75,416.5313 Q368.4063,416.6875 368.9688,416.9844 L368.9688,419.7031 Q368.3438,419.125 367.75,418.8594 Q367.1563,418.5781 366.5313,418.5781 Q365.1875,418.5781 364.5,419.6563 Q363.8125,420.7188 363.8125,422.8125 Q363.8125,424.9063 364.5,425.9844 Q365.1875,427.0469 366.5313,427.0469 Q367.1563,427.0469 367.75,426.7813 Q368.3438,426.5 368.9688,425.9219 L368.9688,428.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="380" y="427.1543">CsrfToken</text><!--MD5=[fc180e3dee81ea9a391c3b8056d3ef96]
-class Phpolar\\CsrfProtection\\CsrfTokenGenerator--><rect fill="#FEFECE" height="32" id="Phpolar\\CsrfProtection\\CsrfTokenGenerator" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="319" y="474"/><ellipse cx="334" cy="490" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M336.9688,495.6406 Q336.3906,495.9375 335.75,496.0781 Q335.1094,496.2344 334.4063,496.2344 Q331.9063,496.2344 330.5781,494.5938 Q329.2656,492.9375 329.2656,489.8125 Q329.2656,486.6875 330.5781,485.0313 Q331.9063,483.375 334.4063,483.375 Q335.1094,483.375 335.75,483.5313 Q336.4063,483.6875 336.9688,483.9844 L336.9688,486.7031 Q336.3438,486.125 335.75,485.8594 Q335.1563,485.5781 334.5313,485.5781 Q333.1875,485.5781 332.5,486.6563 Q331.8125,487.7188 331.8125,489.8125 Q331.8125,491.9063 332.5,492.9844 Q333.1875,494.0469 334.5313,494.0469 Q335.1563,494.0469 335.75,493.7813 Q336.3438,493.5 336.9688,492.9219 L336.9688,495.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="126" x="348" y="494.1543">CsrfTokenGenerator</text><!--MD5=[e408896b58cb043f153e1cc54118f0bf]
+class Phpolar\\CsrfProtection\\CsrfToken--><rect fill="#FEFECE" height="32" id="Phpolar\\CsrfProtection\\CsrfToken" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="351" y="407"/><ellipse cx="366" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M368.9688,428.6406 Q368.3906,428.9375 367.75,429.0781 Q367.1094,429.2344 366.4063,429.2344 Q363.9063,429.2344 362.5781,427.5938 Q361.2656,425.9375 361.2656,422.8125 Q361.2656,419.6875 362.5781,418.0313 Q363.9063,416.375 366.4063,416.375 Q367.1094,416.375 367.75,416.5313 Q368.4063,416.6875 368.9688,416.9844 L368.9688,419.7031 Q368.3438,419.125 367.75,418.8594 Q367.1563,418.5781 366.5313,418.5781 Q365.1875,418.5781 364.5,419.6563 Q363.8125,420.7188 363.8125,422.8125 Q363.8125,424.9063 364.5,425.9844 Q365.1875,427.0469 366.5313,427.0469 Q367.1563,427.0469 367.75,426.7813 Q368.3438,426.5 368.9688,425.9219 L368.9688,428.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="380" y="427.1543">CsrfToken</text><!--MD5=[e408896b58cb043f153e1cc54118f0bf]
 class Phpolar\\CsrfProtection\\Http\\CsrfProtectionRequestHandler--><rect fill="#FEFECE" height="32" id="Phpolar\\CsrfProtection\\Http\\CsrfProtectionRequestHandler" style="stroke: #A80036; stroke-width: 1.5;" width="222" x="287" y="166"/><ellipse cx="302" cy="182" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M304.9688,187.6406 Q304.3906,187.9375 303.75,188.0781 Q303.1094,188.2344 302.4063,188.2344 Q299.9063,188.2344 298.5781,186.5938 Q297.2656,184.9375 297.2656,181.8125 Q297.2656,178.6875 298.5781,177.0313 Q299.9063,175.375 302.4063,175.375 Q303.1094,175.375 303.75,175.5313 Q304.4063,175.6875 304.9688,175.9844 L304.9688,178.7031 Q304.3438,178.125 303.75,177.8594 Q303.1563,177.5781 302.5313,177.5781 Q301.1875,177.5781 300.5,178.6563 Q299.8125,179.7188 299.8125,181.8125 Q299.8125,183.9063 300.5,184.9844 Q301.1875,186.0469 302.5313,186.0469 Q303.1563,186.0469 303.75,185.7813 Q304.3438,185.5 304.9688,184.9219 L304.9688,187.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="190" x="316" y="186.1543">CsrfProtectionRequestHandler</text><!--MD5=[a793c685d1399d54fc1277f95f0636e2]
 class Phpolar\\CsrfProtection\\Http\\CsrfRequestCheckMiddleware--><rect fill="#FEFECE" height="32" id="Phpolar\\CsrfProtection\\Http\\CsrfRequestCheckMiddleware" style="stroke: #A80036; stroke-width: 1.5;" width="216" x="290" y="233"/><ellipse cx="305" cy="249" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M307.9688,254.6406 Q307.3906,254.9375 306.75,255.0781 Q306.1094,255.2344 305.4063,255.2344 Q302.9063,255.2344 301.5781,253.5938 Q300.2656,251.9375 300.2656,248.8125 Q300.2656,245.6875 301.5781,244.0313 Q302.9063,242.375 305.4063,242.375 Q306.1094,242.375 306.75,242.5313 Q307.4063,242.6875 307.9688,242.9844 L307.9688,245.7031 Q307.3438,245.125 306.75,244.8594 Q306.1563,244.5781 305.5313,244.5781 Q304.1875,244.5781 303.5,245.6563 Q302.8125,246.7188 302.8125,248.8125 Q302.8125,250.9063 303.5,251.9844 Q304.1875,253.0469 305.5313,253.0469 Q306.1563,253.0469 306.75,252.7813 Q307.3438,252.5 307.9688,251.9219 L307.9688,254.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="184" x="319" y="253.1543">CsrfRequestCheckMiddleware</text><!--MD5=[23ff9cedbc439124cac828ea0e475bb0]
 class Phpolar\\CsrfProtection\\Http\\CsrfResponseFilterMiddleware--><rect fill="#FEFECE" height="32" id="Phpolar\\CsrfProtection\\Http\\CsrfResponseFilterMiddleware" style="stroke: #A80036; stroke-width: 1.5;" width="219" x="288.5" y="300"/><ellipse cx="303.5" cy="316" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M306.4688,321.6406 Q305.8906,321.9375 305.25,322.0781 Q304.6094,322.2344 303.9063,322.2344 Q301.4063,322.2344 300.0781,320.5938 Q298.7656,318.9375 298.7656,315.8125 Q298.7656,312.6875 300.0781,311.0313 Q301.4063,309.375 303.9063,309.375 Q304.6094,309.375 305.25,309.5313 Q305.9063,309.6875 306.4688,309.9844 L306.4688,312.7031 Q305.8438,312.125 305.25,311.8594 Q304.6563,311.5781 304.0313,311.5781 Q302.6875,311.5781 302,312.6563 Q301.3125,313.7188 301.3125,315.8125 Q301.3125,317.9063 302,318.9844 Q302.6875,320.0469 304.0313,320.0469 Q304.6563,320.0469 305.25,319.7813 Q305.8438,319.5 306.4688,318.9219 L306.4688,321.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="187" x="317.5" y="320.1543">CsrfResponseFilterMiddleware</text><!--MD5=[eb647d64e0e505aae508247625db42c9]
@@ -17,7 +16,7 @@ reverse link Stringable to Phpolar\\CsrfProtection\\CsrfToken--><path d="M200.58
 reverse link Psr\\Http\\Server\\RequestHandlerInterface to Phpolar\\CsrfProtection\\Http\\CsrfProtectionRequestHandler--><path d="M247.23,182 C247.23,182 286.99,182 286.99,182 " fill="none" id="Psr\\Http\\Server\\RequestHandlerInterface&lt;-Phpolar\\CsrfProtection\\Http\\CsrfProtectionRequestHandler" style="stroke: #516F42; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="247.23,189,227.23,182,247.23,175,247.23,189" style="stroke: #516F42; stroke-width: 1.0;"/><!--MD5=[c1907b9c47702894484bf454c4dcb06a]
 reverse link Psr\\Http\\Server\\MiddlewareInterface to Phpolar\\CsrfProtection\\Http\\CsrfRequestCheckMiddleware--><path d="M232.52,249 C232.52,249 289.69,249 289.69,249 " fill="none" id="Psr\\Http\\Server\\MiddlewareInterface&lt;-Phpolar\\CsrfProtection\\Http\\CsrfRequestCheckMiddleware" style="stroke: #516F42; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="232.52,256,212.52,249,232.52,242,232.52,256" style="stroke: #516F42; stroke-width: 1.0;"/><!--MD5=[c142cb715253b75370a1f377ab67aeda]
 reverse link Psr\\Http\\Server\\MiddlewareInterface to Phpolar\\CsrfProtection\\Http\\CsrfResponseFilterMiddleware--><path d="M197,285.22 C197,285.22 197,316 197,316 C197,316 241.35,316 288.38,316 " fill="none" id="Psr\\Http\\Server\\MiddlewareInterface&lt;-Phpolar\\CsrfProtection\\Http\\CsrfResponseFilterMiddleware" style="stroke: #516F42; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="190,285.22,197,265.22,204,285.22,190,285.22" style="stroke: #516F42; stroke-width: 1.0;"/><!--MD5=[ebe49e231e210efe761595e85ab441b7]
-reverse link Phpolar\\CsrfProtection\\Storage\\AbstractTokenStorage to Phpolar\\CsrfProtection\\Storage\\SessionTokenStorage--><path d="M238.7,75 C238.7,75 313.14,75 313.14,75 " fill="none" id="Phpolar\\CsrfProtection\\Storage\\AbstractTokenStorage&lt;-Phpolar\\CsrfProtection\\Storage\\SessionTokenStorage" style="stroke: #516F42; stroke-width: 1.0;"/><polygon fill="none" points="238.7,82,218.7,75,238.7,68,238.7,82" style="stroke: #516F42; stroke-width: 1.0;"/><!--MD5=[45b0d9bb4d4b68367253d2ca96cf6054]
+reverse link Phpolar\\CsrfProtection\\Storage\\AbstractTokenStorage to Phpolar\\CsrfProtection\\Storage\\SessionTokenStorage--><path d="M238.7,75 C238.7,75 313.14,75 313.14,75 " fill="none" id="Phpolar\\CsrfProtection\\Storage\\AbstractTokenStorage&lt;-Phpolar\\CsrfProtection\\Storage\\SessionTokenStorage" style="stroke: #516F42; stroke-width: 1.0;"/><polygon fill="none" points="238.7,82,218.7,75,238.7,68,238.7,82" style="stroke: #516F42; stroke-width: 1.0;"/><!--MD5=[d97ff77e5c4a3ceff2339c46de905525]
 @startuml
    skinparam ArrowColor #516f42
    skinparam activityBorderColor #516f42
@@ -36,9 +35,6 @@ set namespaceSeparator \\
 class \\Phpolar\\CsrfProtection\\CsrfToken implements \\Stringable {
 }
 
-class \\Phpolar\\CsrfProtection\\CsrfTokenGenerator {
-}
-
 class \\Phpolar\\CsrfProtection\\Http\\CsrfProtectionRequestHandler implements \\Psr\\Http\\Server\\RequestHandlerInterface {
 }
 
diff --git a/docs/indices/files.html b/docs/indices/files.html
index 0c9229e..855374e 100644
--- a/docs/indices/files.html
+++ b/docs/indices/files.html
@@ -107,7 +107,6 @@ <h3>C</h3>
                     <li><a href="files/http-csrfrequestcheckmiddleware.html"><abbr title="Http/CsrfRequestCheckMiddleware.php">CsrfRequestCheckMiddleware.php</abbr></a></li>
                     <li><a href="files/http-csrfresponsefiltermiddleware.html"><abbr title="Http/CsrfResponseFilterMiddleware.php">CsrfResponseFilterMiddleware.php</abbr></a></li>
                     <li><a href="files/csrftoken.html"><abbr title="CsrfToken.php">CsrfToken.php</abbr></a></li>
-                    <li><a href="files/csrftokengenerator.html"><abbr title="CsrfTokenGenerator.php">CsrfTokenGenerator.php</abbr></a></li>
                     <li><a href="files/constants.html"><abbr title="constants.php">constants.php</abbr></a></li>
                 </ul>
                                                                                                                                                                                                                                                                                                                                                 <h3>S</h3>
diff --git a/docs/js/searchIndex.js b/docs/js/searchIndex.js
index ce0c733..241189a 100644
--- a/docs/js/searchIndex.js
+++ b/docs/js/searchIndex.js
@@ -40,21 +40,6 @@ Search.appendIndex(
             "name": "represents",
             "summary": "Determines\u0020if\u0020the\u0020given\u0020string\u0020is\u0020represented\u0020by\u0020this\u0020object.",
             "url": "classes/Phpolar-CsrfProtection-CsrfToken.html#method_represents"
-        },                {
-            "fqsen": "\\Phpolar\\CsrfProtection\\CsrfTokenGenerator",
-            "name": "CsrfTokenGenerator",
-            "summary": "Generates\u0020a\u0020token\u0020used\u0020to\u0020identify\nvalid\u0020requests.",
-            "url": "classes/Phpolar-CsrfProtection-CsrfTokenGenerator.html"
-        },                {
-            "fqsen": "\\Phpolar\\CsrfProtection\\CsrfTokenGenerator\u003A\u003A__construct\u0028\u0029",
-            "name": "__construct",
-            "summary": "",
-            "url": "classes/Phpolar-CsrfProtection-CsrfTokenGenerator.html#method___construct"
-        },                {
-            "fqsen": "\\Phpolar\\CsrfProtection\\CsrfTokenGenerator\u003A\u003Agenerate\u0028\u0029",
-            "name": "generate",
-            "summary": "Produces\u0020the\u0020token.",
-            "url": "classes/Phpolar-CsrfProtection-CsrfTokenGenerator.html#method_generate"
         },                {
             "fqsen": "\\Phpolar\\CsrfProtection\\Http\\CsrfProtectionRequestHandler",
             "name": "CsrfProtectionRequestHandler",
diff --git a/docs/namespaces/phpolar-csrfprotection.html b/docs/namespaces/phpolar-csrfprotection.html
index cf1d608..97c6d4e 100644
--- a/docs/namespaces/phpolar-csrfprotection.html
+++ b/docs/namespaces/phpolar-csrfprotection.html
@@ -122,9 +122,6 @@ <h3 id="interfaces_class_traits">
     
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Phpolar-CsrfProtection-CsrfToken.html"><abbr title="\Phpolar\CsrfProtection\CsrfToken">CsrfToken</abbr></a></dt>
         <dd>Represents a token used to determine the validity ot a request.</dd>
-            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Phpolar-CsrfProtection-CsrfTokenGenerator.html"><abbr title="\Phpolar\CsrfProtection\CsrfTokenGenerator">CsrfTokenGenerator</abbr></a></dt>
-        <dd>Generates a token used to identify
-valid requests.</dd>
     
     
     </dl>
diff --git a/docs/packages/Phpolar-CsrfProtection.html b/docs/packages/Phpolar-CsrfProtection.html
index a89e02b..0b57bc0 100644
--- a/docs/packages/Phpolar-CsrfProtection.html
+++ b/docs/packages/Phpolar-CsrfProtection.html
@@ -113,9 +113,6 @@ <h3 id="interfaces_class_traits">
     
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Phpolar-CsrfProtection-CsrfToken.html"><abbr title="\Phpolar\CsrfProtection\CsrfToken">CsrfToken</abbr></a></dt>
         <dd>Represents a token used to determine the validity ot a request.</dd>
-            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Phpolar-CsrfProtection-CsrfTokenGenerator.html"><abbr title="\Phpolar\CsrfProtection\CsrfTokenGenerator">CsrfTokenGenerator</abbr></a></dt>
-        <dd>Generates a token used to identify
-valid requests.</dd>
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Phpolar-CsrfProtection-Http-CsrfProtectionRequestHandler.html"><abbr title="\Phpolar\CsrfProtection\Http\CsrfProtectionRequestHandler">CsrfProtectionRequestHandler</abbr></a></dt>
         <dd>Refuses to process an invalid request</dd>
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Phpolar-CsrfProtection-Http-CsrfRequestCheckMiddleware.html"><abbr title="\Phpolar\CsrfProtection\Http\CsrfRequestCheckMiddleware">CsrfRequestCheckMiddleware</abbr></a></dt>
diff --git a/phpunit.dev.xml b/phpunit.dev.xml
index 7847e7a..8602fc7 100644
--- a/phpunit.dev.xml
+++ b/phpunit.dev.xml
@@ -14,7 +14,7 @@
   <coverage/>
   <php>
     <const name="SRC_GLOB" value="/src{/,/**/}*.php"/>
-    <const name="PROJECT_SIZE_THRESHOLD" value="4500"/>
+    <const name="PROJECT_SIZE_THRESHOLD" value="4200"/>
     <const name="PROJECT_MEMORY_USAGE_THRESHOLD" value="108000"/>
   </php>
   <source>
diff --git a/src/CsrfTokenGenerator.php b/src/CsrfTokenGenerator.php
deleted file mode 100644
index f955f5d..0000000
--- a/src/CsrfTokenGenerator.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Phpolar\CsrfProtection;
-
-use DateTimeImmutable;
-
-/**
- * Generates a token used to identify
- * valid requests.
- */
-class CsrfTokenGenerator
-{
-    public function __construct(private int $ttl = TOKEN_DEFAULT_TTL)
-    {
-    }
-
-    /**
-     * Produces the token.
-     */
-    public function generate(): CsrfToken
-    {
-        return new CsrfToken(new DateTimeImmutable("now"), $this->ttl);
-    }
-}
diff --git a/src/Http/CsrfResponseFilterMiddleware.php b/src/Http/CsrfResponseFilterMiddleware.php
index 3a61742..4aa39bf 100644
--- a/src/Http/CsrfResponseFilterMiddleware.php
+++ b/src/Http/CsrfResponseFilterMiddleware.php
@@ -4,7 +4,7 @@
 
 namespace Phpolar\CsrfProtection\Http;
 
-use Phpolar\CsrfProtection\CsrfTokenGenerator;
+use Phpolar\CsrfProtection\CsrfToken;
 use Phpolar\CsrfProtection\Storage\AbstractTokenStorage;
 use Phpolar\Http\Message\ResponseFilterInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -20,8 +20,8 @@
 class CsrfResponseFilterMiddleware implements MiddlewareInterface
 {
     public function __construct(
+        private CsrfToken $token,
         private AbstractTokenStorage $storage,
-        private CsrfTokenGenerator $tokenGenerator,
         private ResponseFilterInterface $responseFilter,
     ) {
     }
@@ -34,10 +34,11 @@ public function __construct(
      * The stored token SHOULD then be used to validate
      * futher requests.
      */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $token = $this->tokenGenerator->generate();
-        $this->storage->add($token);
+    public function process(
+        ServerRequestInterface $request,
+        RequestHandlerInterface $handler
+    ): ResponseInterface {
+        $this->storage->add($this->token);
         $response = $handler->handle($request);
         return $this->responseFilter->filter($response);
     }
diff --git a/tests/acceptance/MemoryUsageTest.php b/tests/acceptance/MemoryUsageTest.php
index 5e4b9bd..30e4693 100644
--- a/tests/acceptance/MemoryUsageTest.php
+++ b/tests/acceptance/MemoryUsageTest.php
@@ -56,8 +56,8 @@ public static function thresholds(): Generator
     public function shallBeBelowThreshold(int $threshold)
     {
         $responseFilterMiddleware = new CsrfResponseFilterMiddleware(
+            $this->token,
             new MemoryTokenStorageStub(),
-            new CsrfTokenGenerator(),
             new CsrfResponseFilter(
                 new ResponseFilterPatternStrategy(
                     $this->token,
diff --git a/tests/unit/CsrfTokenGeneratorTest.php b/tests/unit/CsrfTokenGeneratorTest.php
deleted file mode 100644
index dc70ea5..0000000
--- a/tests/unit/CsrfTokenGeneratorTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Phpolar\CsrfProtection;
-
-use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\TestDox;
-use PHPUnit\Framework\Attributes\UsesClass;
-use PHPUnit\Framework\TestCase;
-
-#[CoversClass(CsrfTokenGenerator::class)]
-#[UsesClass(CsrfToken::class)]
-final class CsrfTokenGeneratorTest extends TestCase
-{
-    #[TestDox("Shall produce a valid token")]
-    public function test1()
-    {
-        $sut = new CsrfTokenGenerator();
-        $token = $sut->generate();
-        $this->assertFalse($token->isExpired());
-    }
-
-    #[TestDox("Shall allow time-to-live to be configurable")]
-    public function test2()
-    {
-        $givenTtl = -1;
-        $sut = new CsrfTokenGenerator($givenTtl);
-        $token = $sut->generate();
-        $this->assertTrue($token->isExpired(), "Time-to-live is not configurable.");
-    }
-}
diff --git a/tests/unit/Http/CsrfResponseFilterMiddlewareTest.php b/tests/unit/Http/CsrfResponseFilterMiddlewareTest.php
index 5d26bcb..15f7c5c 100644
--- a/tests/unit/Http/CsrfResponseFilterMiddlewareTest.php
+++ b/tests/unit/Http/CsrfResponseFilterMiddlewareTest.php
@@ -62,14 +62,12 @@ public function linksAndForms()
         /**
          * @var Stub&CsrfTokenGenerator $tokenGenerator
          */
-        $tokenGenerator = $this->createStub(CsrfTokenGenerator::class);
         $responseFactory = new ResponseFactoryStub();
         $tokenStorage = new MemoryTokenStorageStub();
         $streamFactory = new StreamFactoryStub("w+");
 
         $validToken = new CsrfToken(new DateTimeImmutable("now"));
         $request = (new RequestStub("GET"))->withQueryParams([REQUEST_ID_KEY => (string) $validToken]);
-        $tokenGenerator->method("generate")->willReturn($validToken);
         $routingResponse = $responseFactory
             ->createResponse()
             ->withBody(
@@ -77,8 +75,8 @@ public function linksAndForms()
             );
         $routingHandlerStub->method("handle")->willReturn($routingResponse);
         $sut = new CsrfResponseFilterMiddleware(
+            $validToken,
             $tokenStorage,
-            $tokenGenerator,
             new CsrfResponseFilter(
                 new ResponseFilterPatternStrategy(
                     $validToken,