Refactor: env (#91)

* Refactor: env

* fix test

* app.api_base_url

* Remove api_base_url from controller render methods and add it as a global variable in twig configuration

* Remove api_token from controller render methods and update spa.html.twig to use app.session for auth_token

* Update API base URL configuration in templates and JavaScript

---------

Co-authored-by: Tatevik <tatevikg1@gmail.com>

Author: TatevikGr

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'),
         ]);
     }
 }