From 8c61b69320af2aa82dd48c7ab1de7f3b9bbff0bb Mon Sep 17 00:00:00 2001
From: Pier Paolo MAMMI <pierpaolo.mammi@unipr.it>
Date: Wed, 22 Jul 2026 16:11:45 +0200
Subject: [PATCH] fix api urls

---
 src/ElixForms/Auth/ElixFormsApiClient.php            | 4 ++--
 src/ElixForms/Auth/ElixFormsAuthenticationClient.php | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ElixForms/Auth/ElixFormsApiClient.php b/src/ElixForms/Auth/ElixFormsApiClient.php
index e14cf55..b8edb53 100644
--- a/src/ElixForms/Auth/ElixFormsApiClient.php
+++ b/src/ElixForms/Auth/ElixFormsApiClient.php
@@ -36,7 +36,7 @@ class ElixFormsApiClient
         }
         $queryParts[] = 'moduleTag=' . rawurlencode($moduleTag);
 
-        $url = $this->baseUrl . '/eF/api/request/lookup/by-status?' . implode('&', $queryParts);
+        $url = "{$this->baseUrl}/api/request/lookup/by-status?" . implode('&', $queryParts);
         $payload = $this->getJson($url, $authToken, $username, 'LookupByStatus');
         $requests = $payload['value']['requests'] ?? [];
 
@@ -65,7 +65,7 @@ class ElixFormsApiClient
         }
 
         $url = \sprintf(
-            '%s/eF/services/api/request/%s/view/_DEFAULT/exportTags/get/v1?moduleTag=%s&exportGroup=%s',
+            '%s/services/api/request/%s/view/_DEFAULT/exportTags/get/v1?moduleTag=%s&exportGroup=%s',
             $this->baseUrl,
             rawurlencode((string) $requestId),
             rawurlencode($moduleTag),
diff --git a/src/ElixForms/Auth/ElixFormsAuthenticationClient.php b/src/ElixForms/Auth/ElixFormsAuthenticationClient.php
index 5b02f5f..4740e79 100644
--- a/src/ElixForms/Auth/ElixFormsAuthenticationClient.php
+++ b/src/ElixForms/Auth/ElixFormsAuthenticationClient.php
@@ -23,7 +23,8 @@ class ElixFormsAuthenticationClient {
      * @throws ElixFormsException Se le credenziali sono errate o c'è un errore server
      */
     public function login(string $username, string $password): string {
-        $url = $this->baseUrl . '/eF/services/api/authentication/login/v1';
+        $this->baseUrl = rtrim($this->baseUrl,'/');
+        $url = "{$this->baseUrl}/services/api/authentication/login/v1";
 
         try {
             $response = $this->httpClient->post($url, [
@@ -64,7 +65,7 @@ class ElixFormsAuthenticationClient {
      * @throws ElixFormsException Se c'è un errore durante il logout
      */
     public function logout(string $username, string $token): bool {
-        $url = $this->baseUrl . '/eF/services/api/authentication/' . urlencode($username) . '/logout/v1';
+        $url = "{$this->baseUrl}/services/api/authentication/" . urlencode($username) . '/logout/v1';
 
         try {
             $response = $this->httpClient->post($url, [