Add: auth user data retrieval

Author: tatevikg1

assets/vue/layouts/AdminLayout.vue

@@ -29,8 +29,8 @@
         <!-- User dropdown -->
         <div class="flex items-center gap-3 pl-2 group cursor-pointer">
           <div class="flex flex-col items-end hidden sm:flex">
-            <span class="text-sm font-bold text-slate-800 leading-none">Admin User</span>
-            <span class="text-[10px] text-slate-500 mt-0.5">Administrator</span>
+            <span class="text-sm font-bold text-slate-800 leading-none">{{ adminData.login_name || 'Admin User' }}</span>
+            <span class="text-[10px] text-slate-500 mt-0.5">{{ adminData.super_user ? 'Super Admin' : 'Administrator' }}</span>
           </div>
 
           <BaseIcon name="chevronDown" />
@@ -49,6 +49,24 @@
 /* No imports required */
 import BaseIcon from "../components/base/BaseIcon.vue";
 import { useSidebar } from "../composables/useSidebar";
+import { onMounted, ref } from "vue";
 
 const { openSidebar } = useSidebar();
+const adminData = ref({});
+
+onMounted(async () => {
+  try {
+    const response = await fetch('/admin-about', {
+      headers: {
+        'Accept': 'application/json',
+        'X-Requested-With': 'XMLHttpRequest'
+      }
+    });
+    if (response.ok) {
+      adminData.value = await response.json();
+    }
+  } catch (error) {
+    console.error('Failed to fetch admin data:', error);
+  }
+});
 </script>

config/services.yml

@@ -27,13 +27,10 @@ services:
   PhpList\RestApiClient\Client:
     $baseUrl: '%api_base_url%'
 
-  PhpList\RestApiClient\Endpoint\AuthClient:
-    autoconfigure: true
+  PhpList\RestApiClient\Endpoint\:
+    resource: '../vendor/tatevikgr/rest-api-client/src/Endpoint/'
     autowire: true
-
-  PhpList\RestApiClient\Endpoint\SubscribersClient:
     autoconfigure: true
-    autowire: true
 
   PhpList\WebFrontend\EventListener\ApiSessionListener:
     tags:

src/Controller/AuthController.php

@@ -8,17 +8,15 @@
 use GuzzleHttp\Exception\GuzzleException;
 use PhpList\RestApiClient\Endpoint\AuthClient;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 
 class AuthController extends AbstractController
 {
-    private AuthClient $apiClient;
-
-    public function __construct(AuthClient $apiClient)
+    public function __construct(private readonly AuthClient $authClient)
     {
-        $this->apiClient = $apiClient;
     }
 
     #[Route('/login', name: 'login', methods: ['GET', 'POST'])]
@@ -46,10 +44,10 @@ public function login(Request $request): Response
             }
 
             try {
-                $authData = $this->apiClient->login($username, $password);
+                $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_id', $authData['id']);
+                $request->getSession()->set('auth_id', (int) $authData['id']);
 
                 return $this->redirectToRoute('home');
             } catch (Exception $e) {
@@ -69,8 +67,14 @@ public function logout(Request $request): Response
     {
         $request->getSession()->remove('auth_token');
         $request->getSession()->remove('auth_id');
-        $this->apiClient->logout();
+        $this->authClient->logout();
 
         return $this->redirectToRoute('login');
     }
+
+    #[Route('/admin-about', name: 'admin_about')]
+    public function about(): JsonResponse
+    {
+        return new JsonResponse($this->authClient->getSessionUser()->toArray());
+    }
 }

tests/Unit/Controller/AuthControllerTest.php

@@ -4,27 +4,29 @@
 
 namespace PhpList\WebFrontend\Tests\Unit\Controller;
 
+use PhpList\RestApiClient\Entity\Administrator;
 use PhpList\WebFrontend\Controller\AuthController;
 use PhpList\RestApiClient\Endpoint\AuthClient;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 class AuthControllerTest extends TestCase
 {
-    private AuthClient&MockObject $apiClient;
+    private AuthClient&MockObject $authClient;
     private AuthController $controller;
 
     protected function setUp(): void
     {
-        $this->apiClient = $this->createMock(AuthClient::class);
+        $this->authClient = $this->createMock(AuthClient::class);
 
         $this->controller = $this->getMockBuilder(AuthController::class)
-            ->setConstructorArgs([$this->apiClient])
+            ->setConstructorArgs([$this->authClient])
             ->onlyMethods(['render', 'redirectToRoute', 'generateUrl'])
             ->getMock();
 
@@ -105,11 +107,12 @@ public function testLoginWithPostRequestSuccess(): void
                 ['login_error', false]
             ]);
 
-        $session->expects($this->exactly(2))
+        $session->expects($this->exactly(3))
             ->method('set')
             ->withConsecutive(
                 ['auth_token', 'test-token'],
-                ['auth_expiry_date', 'test-token']
+                ['auth_expiry_date', 'test-token'],
+                ['auth_id', 1]
             );
 
         $request = Request::create('/login', 'POST', [
@@ -118,9 +121,9 @@ public function testLoginWithPostRequestSuccess(): void
         ]);
         $request->setSession($session);
 
-        $this->apiClient->method('login')
+        $this->authClient->method('login')
             ->with('testuser', 'testpass')
-            ->willReturn(['key' => 'test-token']);
+            ->willReturn(['key' => 'test-token', 'id' => 1]);
 
         $response = $this->controller->login($request);
 
@@ -143,7 +146,7 @@ public function testLoginWithPostRequestFailure(): void
         ]);
         $request->setSession($session);
 
-        $this->apiClient->method('login')
+        $this->authClient->method('login')
             ->with('testuser', 'testpass')
             ->willThrowException(new RuntimeException('Invalid credentials'));
 
@@ -178,9 +181,12 @@ public function testLoginWithExistingSession(): void
     public function testLogout(): void
     {
         $session = $this->createMock(SessionInterface::class);
-        $session->expects($this->once())
+        $session->expects($this->exactly(2))
             ->method('remove')
-            ->with('auth_token');
+            ->withConsecutive(
+                ['auth_token'],
+                ['auth_id']
+            );
 
         $request = $this->createMock(Request::class);
         $request->method('getSession')
@@ -191,4 +197,29 @@ public function testLogout(): void
         $this->assertInstanceOf(RedirectResponse::class, $response);
         $this->assertStringContainsString('login', $response->getTargetUrl());
     }
+
+    public function testAbout(): void
+    {
+        $adminMock = $this->createMock(Administrator::class);
+        $adminMock->method('toArray')
+            ->willReturn([
+                'id' => 123,
+                'login_name' => 'testadmin',
+                'email' => 'admin@example.com',
+                'super_user' => true
+            ]);
+
+        $this->authClient->expects($this->once())
+            ->method('getSessionUser')
+            ->willReturn($adminMock);
+
+        $response = $this->controller->about();
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals(
+            '{"id":123,"login_name":"testadmin","email":"admin@example.com","super_user":true}',
+            $response->getContent()
+        );
+    }
 }