Dev

assets/vue/api.js

@@ -38,7 +38,8 @@ const redirectToLogin = () => {
 
 const appElement = document.getElementById('vue-app');
 const apiToken = appElement?.dataset.apiToken;
-const apiBaseUrl = appElement?.dataset.apiBaseUrl;
+const apiElement = document.getElementById('api-config');
+const apiBaseUrl = apiElement?.dataset.apiBaseUrl;
 
 if (!apiBaseUrl) {
     console.error('API Base URL is not configured.');

composer.json

@@ -51,7 +51,7 @@
     },
     "require": {
         "php": "^8.1",
-        "phplist/core": "dev-main",
+        "phplist/core": "dev-env",
         "symfony/twig-bundle": "^6.4",
         "symfony/webpack-encore-bundle": "^2.2",
         "symfony/security-bundle": "^6.4",
@@ -96,6 +96,7 @@
             "PhpList\\Core\\Composer\\ScriptHandler::createBundleConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::createRoutesConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::createParametersConfiguration",
+            "PhpList\\Core\\Composer\\ScriptHandler::createDotenvConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::clearAllCaches"
         ],
         "publish-phplist-texts": [

config/packages/twig.yaml

@@ -3,3 +3,5 @@ twig:
     strict_variables: '%kernel.debug%'
     default_path: '%kernel.application_dir%/templates'
     auto_reload: true
+    globals:
+        api_base_url: '%app.api_base_url%'

config/services.yml

@@ -1,8 +1,4 @@
 # config/services.yaml
-parameters:
-  api_base_url: '%env(API_BASE_URL)%'
-  env(API_BASE_URL): 'http://api.phplist.local/'
-
 services:
   _defaults:
     autowire: true
@@ -27,7 +23,7 @@ services:
   Symfony\Component\HttpFoundation\Session\SessionInterface: '@session'
 
   PhpList\RestApiClient\Client:
-    $baseUrl: '%api_base_url%'
+    $baseUrl: '%app.api_base_url%'
 
   PhpList\WebFrontend\EventListener\ApiSessionListener:
     tags:

phpunit.xml.dist

@@ -5,11 +5,11 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="vendor/autoload.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
-        <env name="API_BASE_URL" value="http://api.phplist.local/"/>
         <ini name="error_reporting" value="-1"/>
         <server name="KERNEL_CLASS" value="PhpList\Core\Core\ApplicationKernel"/>
+        <server name="APP_ENV" value="test" force="true"/>
     </php>
 </phpunit>

src/Controller/AnalyticsController.php

@@ -17,8 +17,6 @@ public function index(Request $request): Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Analytics',
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 }

src/Controller/BouncesController.php

@@ -23,8 +23,6 @@ public function index(Request $request): Response
 
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Bounces',
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
             'bounce_actions' => $bounceActions,
         ]);
     }

src/Controller/CampaignsController.php

@@ -17,8 +17,6 @@ public function index(Request $request): Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Campaigns',
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 
@@ -27,8 +25,6 @@ public function create(Request $request): Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Create Campaign',
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 
@@ -37,8 +33,6 @@ public function edit(Request $request, int $campaignId): Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => sprintf('Edit Campaign #%d', $campaignId),
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 }

src/Controller/DashboardController.php

@@ -32,8 +32,6 @@ public function index(Request $request): Response
 
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Dashboard',
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
             'dashboard_stats' => $dashboardStats,
             'dashboard_error' => $dashboardError,
         ]);

src/Controller/ListsController.php

@@ -26,8 +26,6 @@ public function index(Request $request): JsonResponse|Response
         if (! $wantsJson) {
             return $this->render('@PhpListFrontend/spa.html.twig', [
                 'page' => 'Lists',
-                'api_token' => $request->getSession()->get('auth_token'),
-                'api_base_url' => $this->getParameter('api_base_url'),
             ]);
         }
         $initialData = $this->listClient->getLists();
@@ -40,8 +38,6 @@ public function view(Request $request, int $listId): JsonResponse|Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'List Subscribers',
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 }

src/Controller/PublicPagesController.php

@@ -17,8 +17,6 @@ public function index(Request $request): Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Subscribe Pages',
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 
@@ -27,8 +25,6 @@ public function create(Request $request): Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Create Subscribe Page',
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 
@@ -37,8 +33,6 @@ public function edit(Request $request, int $pageId): Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => sprintf('Edit Subscribe Page #%d', $pageId),
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 }

src/Controller/SettingsController.php

@@ -17,8 +17,6 @@ public function index(Request $request): Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Settings',
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 }

src/Controller/SubscribersController.php

@@ -37,8 +37,6 @@ public function index(Request $request): JsonResponse|Response
         if (! $wantsJson) {
             return $this->render('@PhpListFrontend/spa.html.twig', [
                 'page' => 'Subscribers',
-                'api_token' => $request->getSession()->get('auth_token'),
-                'api_base_url' => $this->getParameter('api_base_url'),
             ]);
         }
 

src/Controller/TemplatesController.php

@@ -17,8 +17,6 @@ public function index(Request $request): Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Templates',
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 
@@ -27,8 +25,6 @@ public function create(Request $request): Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Create Template',
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 
@@ -37,8 +33,6 @@ public function edit(Request $request, int $templateId): Response
     {
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => sprintf('Edit Template #%d', $templateId),
-            'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
         ]);
     }
 }

templates/base.html.twig

@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <title>{% block title %}phpList{% endblock %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta id="api-config" data-api-base-url="{{ api_base_url }}">
     <link rel="stylesheet" href="{{ asset('build/app.css', 'phplist_web_frontend') }}">
     <link rel="stylesheet" href="{{ asset('build/styles.css', 'phplist_web_frontend') }}">
 

templates/spa.html.twig

@@ -4,8 +4,7 @@
 
 {% block body %}
     <div id="vue-app"
-         data-api-token="{{ api_token|default('') }}"
-         data-api-base-url="{{ api_base_url|default('') }}"
+         data-api-token="{{ app.session.get('auth_token')|default('') }}"
          data-dashboard-stats="{{ dashboard_stats|default({})|json_encode|e('html_attr') }}"
          data-dashboard-error="{{ dashboard_error|default('')|e('html_attr') }}"
          data-bounce-actions="{{ bounce_actions|default({})|json_encode|e('html_attr') }}">

tests/Integration/Controller/AnalyticsControllerTest.php

@@ -7,6 +7,7 @@
 use PhpList\WebFrontend\Controller\AnalyticsController;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\Routing\RouterInterface;
@@ -27,12 +28,13 @@ public function testAnalyticsPageRendersExpectedSpaPayload(): void
         self::bootKernel();
         /** @var AnalyticsController $controller */
         $controller = static::getContainer()->get(AnalyticsController::class);
-        $apiBaseUrl = (string) static::getContainer()->getParameter('api_base_url');
+        $apiBaseUrl = (string) static::getContainer()->getParameter('app.api_base_url');
 
         $request = Request::create('/analytics/');
         $session = new Session(new MockArraySessionStorage());
         $session->set('auth_token', 'integration-token');
         $request->setSession($session);
+        static::getContainer()->get(RequestStack::class)->push($request);
 
         $response = $controller->index($request);
         $content = (string) $response->getContent();

tests/Integration/Controller/BouncesControllerTest.php

@@ -7,6 +7,7 @@
 use PhpList\WebFrontend\Controller\BouncesController;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\Routing\RouterInterface;
@@ -27,12 +28,13 @@ public function testBouncesPageRendersExpectedSpaPayload(): void
         self::bootKernel();
         /** @var BouncesController $controller */
         $controller = static::getContainer()->get(BouncesController::class);
-        $apiBaseUrl = (string) static::getContainer()->getParameter('api_base_url');
+        $apiBaseUrl = (string) static::getContainer()->getParameter('app.api_base_url');
 
         $request = Request::create('/bounces/');
         $session = new Session(new MockArraySessionStorage());
         $session->set('auth_token', 'integration-token');
         $request->setSession($session);
+        static::getContainer()->get(RequestStack::class)->push($request);
 
         $response = $controller->index($request);
         $content = (string) $response->getContent();

tests/Integration/Controller/CampaignsControllerTest.php

@@ -7,6 +7,7 @@
 use PhpList\WebFrontend\Controller\CampaignsController;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\Routing\RouterInterface;
@@ -41,6 +42,7 @@ public function testCampaignPagesRenderExpectedSpaPayload(
         $session = new Session(new MockArraySessionStorage());
         $session->set('auth_token', 'integration-token');
         $request->setSession($session);
+        static::getContainer()->get(RequestStack::class)->push($request);
 
         $response = $controller->{$action}($request, ...$actionArguments);
 

tests/Integration/Controller/DashboardControllerTest.php

@@ -11,6 +11,7 @@
 use PhpList\WebFrontend\Controller\DashboardController;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\Routing\RouterInterface;
@@ -29,7 +30,7 @@ public function testDashboardRouteIsRegistered(): void
     public function testDashboardRendersSpaPayloadWithStats(): void
     {
         self::bootKernel();
-        $apiBaseUrl = (string) static::getContainer()->getParameter('api_base_url');
+        $apiBaseUrl = (string) static::getContainer()->getParameter('app.api_base_url');
 
         $statsClient = $this->createMock(StatisticsClient::class);
         $statsClient->expects(self::once())
@@ -43,6 +44,7 @@ public function testDashboardRendersSpaPayloadWithStats(): void
         $session = new Session(new MockArraySessionStorage());
         $session->set('auth_token', 'integration-token');
         $request->setSession($session);
+        static::getContainer()->get(RequestStack::class)->push($request);
 
         $response = $controller->index($request);
         $content = (string) $response->getContent();

tests/Integration/Controller/ListsControllerTest.php

@@ -10,6 +10,7 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\Routing\RouterInterface;
@@ -31,7 +32,7 @@ public function testListRoutesAreRegistered(string $routeName, array $parameters
     public function testListsIndexRendersSpaForHtmlRequests(): void
     {
         self::bootKernel();
-        $apiBaseUrl = (string) static::getContainer()->getParameter('api_base_url');
+        $apiBaseUrl = (string) static::getContainer()->getParameter('app.api_base_url');
 
         $listClient = $this->createMock(ListClient::class);
         $listClient->expects(self::never())->method('getLists');
@@ -106,6 +107,7 @@ private function createRequestWithSession(string $path): Request
         $session = new Session(new MockArraySessionStorage());
         $session->set('auth_token', 'integration-token');
         $request->setSession($session);
+        static::getContainer()->get(RequestStack::class)->push($request);
 
         return $request;
     }

tests/bootstrap.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\Dotenv\Dotenv;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+if (method_exists(Dotenv::class, 'bootEnv')) {
+    (new Dotenv())->bootEnv(dirname(__DIR__) . '/.env');
+}