ISSUE-357: use phplist-api-client (#71)

* ISSUE-357: use api-client

* ISSUE-357: fix config

---------

Co-authored-by: Tatevik <[email protected]>

Author: TatevikGr

composer.json

@@ -11,6 +11,14 @@
     ],
     "homepage": "https://www.phplist.com/",
     "license": "AGPL-3.0-or-later",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/tatevikgr/phplist-api-client"
+        }
+    ],
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "authors": [
         {
             "name": "Xheni Myrtaj",
@@ -35,9 +43,10 @@
     },
     "require": {
         "php": "^8.1",
-        "phplist/core": "v5.0.0-alpha8",
+        "phplist/core": "dev-main",
         "symfony/twig-bundle": "^6.4",
-        "symfony/webpack-encore-bundle": "^2.2"
+        "symfony/webpack-encore-bundle": "^2.2",
+        "tatevikgr/rest-api-client": "dev-ISSUE-357"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

config/services.yml

@@ -1,7 +1,7 @@
 # config/services.yaml
 parameters:
   api_base_url: '%env(API_BASE_URL)%'
-  env(API_BASE_URL): 'http://api.phplist.local/api/v2'
+  env(API_BASE_URL): 'http://api.phplist.local/api/v2/'
 
 services:
   _defaults:
@@ -29,3 +29,10 @@ services:
     tags: ['controller.service_arguments']
 
   Symfony\Component\HttpFoundation\Session\SessionInterface: '@session'
+
+  PhpList\RestApiClient\Client:
+    $baseUrl: '%api_base_url%'
+
+  PhpList\RestApiClient\Endpoint\AuthClient:
+    autoconfigure: true
+    autowire: true

src/Controller/AuthController.php

@@ -6,17 +6,17 @@
 
 use Exception;
 use GuzzleHttp\Exception\GuzzleException;
-use PhpList\WebFrontend\Service\ApiClient;
+use PhpList\RestApiClient\Endpoint\AuthClient;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 
 class AuthController extends AbstractController
 {
-    private ApiClient $apiClient;
+    private AuthClient $apiClient;
 
-    public function __construct(ApiClient $apiClient)
+    public function __construct(AuthClient $apiClient)
     {
         $this->apiClient = $apiClient;
     }
@@ -40,10 +40,9 @@ public function login(Request $request): Response
             $password = $request->request->get('password');
 
             try {
-                $authData = $this->apiClient->authenticate($username, $password);
+                $authData = $this->apiClient->login($username, $password);
                 $request->getSession()->set('auth_token', $authData['key']);
                 $request->getSession()->set('auth_expiry_date', $authData['key']);
-                $this->apiClient->setAuthToken($authData['key']);
 
                 return $this->redirectToRoute('empty_start_page');
             } catch (Exception $e) {

src/Service/ApiClient.php

@@ -9,6 +9,9 @@
 use JsonException;
 use RuntimeException;
 
+/**
+ * @deprecated since phplist/rest-api-client should be used instead.
+ */
 class ApiClient
 {
     private Client $client;

tests/Unit/Controller/AuthControllerTest.php

@@ -5,7 +5,7 @@
 namespace PhpList\WebFrontend\Tests\Unit\Controller;
 
 use PhpList\WebFrontend\Controller\AuthController;
-use PhpList\WebFrontend\Service\ApiClient;
+use PhpList\RestApiClient\Endpoint\AuthClient;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
@@ -16,12 +16,12 @@
 
 class AuthControllerTest extends TestCase
 {
-    private ApiClient&MockObject $apiClient;
+    private AuthClient&MockObject $apiClient;
     private AuthController $controller;
 
     protected function setUp(): void
     {
-        $this->apiClient = $this->createMock(ApiClient::class);
+        $this->apiClient = $this->createMock(AuthClient::class);
 
         $this->controller = $this->getMockBuilder(AuthController::class)
             ->setConstructorArgs([$this->apiClient])
@@ -118,14 +118,10 @@ public function testLoginWithPostRequestSuccess(): void
         ]);
         $request->setSession($session);
 
-        $this->apiClient->method('authenticate')
+        $this->apiClient->method('login')
             ->with('testuser', 'testpass')
             ->willReturn(['key' => 'test-token']);
 
-        $this->apiClient->expects($this->once())
-            ->method('setAuthToken')
-            ->with('test-token');
-
         $response = $this->controller->login($request);
 
         $this->assertInstanceOf(RedirectResponse::class, $response);
@@ -147,14 +143,17 @@ public function testLoginWithPostRequestFailure(): void
         ]);
         $request->setSession($session);
 
-        $this->apiClient->method('authenticate')
+        $this->apiClient->method('login')
             ->with('testuser', 'testpass')
             ->willThrowException(new RuntimeException('Invalid credentials'));
 
         $response = $this->controller->login($request);
 
         $this->assertStringContainsString('auth/login.html.twig', $response->getContent());
-        $this->assertStringContainsString('Invalid credentials', $response->getContent());
+        $this->assertStringContainsString(
+            'Invalid credentials or server error: Invalid credentials',
+            $response->getContent(),
+        );
     }
 
     public function testLoginWithExistingSession(): void