After review 0

Author: tatevikg1

assets/vue/components/subscribers/SubscriberDirectory.vue

@@ -91,9 +91,9 @@ import SubscriberFilters from './SubscriberFilters.vue'
 import SubscriberTable from './SubscriberTable.vue'
 import SubscriberModal from './SubscriberModal.vue'
 import ImportResult from './ImportResult.vue'
-import { inject, ref, onMounted, watch } from 'vue'
-import { subscriberFilters } from './subscriberFilters'
-import { subscribersClient } from '../../api'
+import {inject, onMounted, ref} from 'vue'
+import {subscriberFilters} from './subscriberFilters'
+import {subscribersClient} from '../../api'
 
 const initialSubscribers = inject('subscribers', [])
 const initialPagination = inject('pagination', {
@@ -275,12 +275,11 @@ const handleFileChange = async (event) => {
 
   isImporting.value = true
   try {
-    const result = await subscribersClient.importSubscribers({
+    importResult.value = await subscribersClient.importSubscribers({
       file,
       listId: 0,
       updateExisting: true
     })
-    importResult.value = result
     isImportResultOpen.value = true
     fetchSubscribers()
   } catch (error) {

assets/vue/components/subscribers/SubscriberModal.vue

@@ -10,7 +10,7 @@
             <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left w-full">
               <div class="flex justify-between items-center">
                 <h3 class="text-lg leading-6 font-medium text-slate-900" id="modal-title">
-                  Subscriber Details ID: {{ subscriber.id }}
+                  Subscriber Details ID: {{ subscriber.id ?? '' }}
                 </h3>
                 <button type="button" class="text-slate-400 hover:text-slate-500" @click="close">
                   <BaseIcon name="close" class="w-5 h-5" />

src/Controller/AuthController.php

@@ -46,7 +46,7 @@ public function login(Request $request): Response
             try {
                 $authData = $this->authClient->login($username, $password);
                 $request->getSession()->set('auth_token', $authData['key']);
-                $request->getSession()->set('auth_expiry_date', $authData['key']);
+                $request->getSession()->set('auth_expiry_date', $authData['expiry_date']);
                 $request->getSession()->set('auth_id', (int) $authData['id']);
 
                 return $this->redirectToRoute('home');

src/EventSubscriber/AuthGateSubscriber.php

@@ -18,6 +18,18 @@
  */
 class AuthGateSubscriber implements EventSubscriberInterface
 {
+    private const ALLOW_LIST = [
+        '/api/v2',
+        '/build/',
+        '/assets/',
+        '/css/',
+        '/js/',
+        '/images/',
+        '/img/',
+        '/favicon',
+        '/robots.txt',
+    ];
+
     public function __construct(private readonly UrlGeneratorInterface $urlGenerator)
     {
     }
@@ -63,7 +75,7 @@ private function isPublicPath(Request $request): bool
         }
 
         // Allow static assets commonly served under these prefixes
-        foreach (['/build/', '/assets/', '/css/', '/js/', '/images/', '/img/', '/favicon', '/robots.txt'] as $prefix) {
+        foreach (self::ALLOW_LIST as $prefix) {
             if (str_starts_with($path, $prefix)) {
                 return true;
             }

tests/System/ApplicationBundle/PhpListApplicationBundleTest.php

@@ -35,7 +35,7 @@ protected function tearDown(): void
     public function testHomepageReturnsSuccess(): void
     {
         $this->startSymfonyServer();
-        $response = $this->httpClient->get('/api/v2', [
+        $response = $this->httpClient->get('/', [
             'base_uri' => $this->getBaseUrl(),
         ]);
 

tests/Unit/Controller/AuthControllerTest.php

@@ -7,6 +7,7 @@
 use PhpList\RestApiClient\Entity\Administrator;
 use PhpList\WebFrontend\Controller\AuthController;
 use PhpList\RestApiClient\Endpoint\AuthClient;
+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
@@ -107,13 +108,21 @@ public function testLoginWithPostRequestSuccess(): void
                 ['login_error', false]
             ]);
 
+        $expected = [
+            ['auth_token', 'test-token'],
+            ['auth_expiry_date', '2026-03-18T14:15:38+04:00'],
+            ['auth_id', 1],
+        ];
+
+        $index = 0;
+
         $session->expects($this->exactly(3))
             ->method('set')
-            ->withConsecutive(
-                ['auth_token', 'test-token'],
-                ['auth_expiry_date', 'test-token'],
-                ['auth_id', 1]
-            );
+            ->willReturnCallback(function ($key, $value) use (&$expected, &$index) {
+                Assert::assertSame($expected[$index][0], $key);
+                Assert::assertSame($expected[$index][1], $value);
+                $index++;
+            });
 
         $request = Request::create('/login', 'POST', [
             'username' => 'testuser',
@@ -123,7 +132,7 @@ public function testLoginWithPostRequestSuccess(): void
 
         $this->authClient->method('login')
             ->with('testuser', 'testpass')
-            ->willReturn(['key' => 'test-token', 'id' => 1]);
+            ->willReturn(['key' => 'test-token', 'id' => 1, 'expiry_date' => '2026-03-18T14:15:38+04:00']);
 
         $response = $this->controller->login($request);
 
@@ -181,12 +190,19 @@ public function testLoginWithExistingSession(): void
     public function testLogout(): void
     {
         $session = $this->createMock(SessionInterface::class);
+        $expected = [
+            ['auth_token'],
+            ['auth_id'],
+        ];
+
+        $index = 0;
+
         $session->expects($this->exactly(2))
             ->method('remove')
-            ->withConsecutive(
-                ['auth_token'],
-                ['auth_id']
-            );
+            ->willReturnCallback(function ($key) use (&$expected, &$index) {
+                Assert::assertSame($expected[$index][0], $key);
+                $index++;
+            });
 
         $request = $this->createMock(Request::class);
         $request->method('getSession')