Decorate of session factory to create custom bags

config/services.yaml

@@ -56,3 +56,7 @@ services:
       - '@Surfnet\StepupSelfService\SelfServiceBundle\Security\Authentication\AuthenticatedSessionStateHandler'
       - []
       - '@logger'
+
+  Surfnet\StepupSelfService\SamlStepupProviderBundle\Session\SessionFactoryWithAttributeBag:
+    decorates: session.factory
+    arguments: [ '@.inner' ]

src/Surfnet/StepupSelfService/SamlStepupProviderBundle/DependencyInjection/SurfnetStepupSelfServiceSamlStepupProviderExtension.php

@@ -84,10 +84,11 @@ private function loadProviderConfiguration(
         $stateHandlerDefinition = new Definition(
             StateHandler::class,
             [
-                new Reference('gssp.sessionbag'),
+                new Reference('request_stack'),
                 $provider
             ]
         );
+
         $container->setDefinition('gssp.provider.' . $provider . '.statehandler', $stateHandlerDefinition);
 
         $providerDefinition = new Definition(

src/Surfnet/StepupSelfService/SamlStepupProviderBundle/Provider/ProviderRepository.php

@@ -59,4 +59,12 @@ public function get(string $providerName): Provider
 
         return $this->providers[$providerName];
     }
+
+    /**
+     * @return Provider[]
+     */
+    public function getAll(): array
+    {
+        return $this->providers;
+    }
 }

src/Surfnet/StepupSelfService/SamlStepupProviderBundle/Resources/config/services.yml

@@ -13,16 +13,3 @@ services:
     Surfnet\StepupSelfService\SamlStepupProviderBundle\Provider\ProviderRepository:
         alias: gssp.provider_repository
 
-    gssp.sessionbag:
-        class: Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag
-#        factory: ['@request_stack', 'getSession']
-        arguments: ['gssp']
-
-    gssp.session.attribute_bag:
-        public: false
-        class: Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag
-        arguments:
-            - '__gssp__'
-            - '/'
-        calls:
-            - [setName, ['gssp']]

src/Surfnet/StepupSelfService/SamlStepupProviderBundle/Saml/StateHandler.php

@@ -20,15 +20,16 @@
 
 namespace Surfnet\StepupSelfService\SamlStepupProviderBundle\Saml;
 
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
 
 final readonly class StateHandler
 {
     const REQUEST_ID = 'request_id';
 
     public function __construct(
-        private AttributeBagInterface $attributeBag,
-        private string                $provider,
+        private RequestStack $requestStack,
+        private string $provider,
     ) {
     }
 
@@ -46,16 +47,22 @@ public function getRequestId(): ?string
 
     public function clear(): void
     {
-        $this->attributeBag->remove($this->provider);
+        $session = $this->requestStack->getSession();
+
+        $session->getBag('gssp.provider.' . $this->provider)->clear();
+
+        $this->requestStack->getSession()->remove($this->provider);
     }
 
     protected function set(string $key, $value): void
     {
-        $this->attributeBag->set($this->provider . '/' . $key, $value);
+        $session = $this->requestStack->getSession();
+        $session->getBag('gssp.provider.' . $this->provider)->set($key, $value);
     }
 
     protected function get(string $key)
     {
-        return $this->attributeBag->get($this->provider . '/' . $key);
+        $session = $this->requestStack->getSession();
+        return $session->getBag('gssp.provider.' . $this->provider)->get($key);
     }
 }

src/Surfnet/StepupSelfService/SamlStepupProviderBundle/Session/SessionFactoryWithAttributeBag.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Surfnet\StepupSelfService\SamlStepupProviderBundle\Session;
+
+use Surfnet\StepupSelfService\SamlStepupProviderBundle\Provider\ProviderRepository;
+use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
+use Symfony\Component\HttpFoundation\Session\SessionFactoryInterface;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+
+/**
+ *  This class is responsible for creating a session with attribute bags for each provider.
+ *  It implements the SessionFactoryInterface.
+ */
+final readonly class SessionFactoryWithAttributeBag implements SessionFactoryInterface
+{
+    public function __construct(
+        private SessionFactoryInterface $delegate,
+        private ProviderRepository $providerRepository,
+    ) {
+    }
+
+    public function createSession(): SessionInterface
+    {
+        $session = $this->delegate->createSession();
+
+        foreach ($this->providerRepository->getAll() as $provider) {
+            $bag = new AttributeBag('gssp.provider.' . $provider->getName());
+            $bag->setName('gssp.provider.' . $provider->getName());
+            $session->registerBag($bag);
+        }
+
+        return $session;
+    }
+}

src/Surfnet/StepupSelfService/SamlStepupProviderBundle/SurfnetStepupSelfServiceSamlStepupProviderBundle.php

@@ -33,7 +33,6 @@ class SurfnetStepupSelfServiceSamlStepupProviderBundle extends Bundle
 {
     public function build(ContainerBuilder $container): void
     {
-        $container->addCompilerPass(new StateHandlerSessionPass());
         $container->addCompilerPass(new ViewConfigCollectionPass());
     }
 }

src/Surfnet/StepupSelfService/SelfServiceBundle/Tests/Service/GsspUserAttributeServiceTest.php

@@ -28,6 +28,7 @@
 use Surfnet\StepupSelfService\SamlStepupProviderBundle\Provider\Provider;
 use Surfnet\StepupSelfService\SamlStepupProviderBundle\Saml\StateHandler;
 use Surfnet\StepupSelfService\SelfServiceBundle\Service\GsspUserAttributeService;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
 
 class GsspUserAttributeServiceTest extends m\Adapter\Phpunit\MockeryTestCase
@@ -54,7 +55,7 @@ public function test_if_it_adds_extensions(): void
             'azuremfa',
             m::spy(ServiceProvider::class),
             m::spy(IdentityProvider::class),
-            new StateHandler(m::mock(AttributeBagInterface::class), 'test')
+            new StateHandler(m::mock(RequestStack::class), 'test')
         );
 
         $extensions = m::mock(Extensions::class);
@@ -84,7 +85,7 @@ public function test_if_it_skips_extensions(): void
             'tiqr',
             m::spy(ServiceProvider::class),
             m::spy(IdentityProvider::class),
-            new StateHandler(m::mock(AttributeBagInterface::class), 'test')
+            new StateHandler(m::mock(RequestStack::class), 'test')
         );
 
         $extensions = m::mock(Extensions::class);