2 Commits dd0524835b ... 45460820e1

Author SHA1 Message Date
  Khanh Nguyen 45460820e1 update fix auth error 3 months ago
  Khanh Nguyen 33cfb8f159 update authentication 3 months ago
3 changed files with 54 additions and 10 deletions
  1. 5 3
      .env.example
  2. 49 4
      src/config/initialization.py
  3. 0 3
      src/services/client_rest.py

+ 5 - 3
.env.example

@@ -1,3 +1,5 @@
-BASE_URL=https://api.site.local
-PHPSESSID=sess_xyz789
-AUTHORIZATION=
+BASE_URL=https://api.site.local # A modifier
+OIL_USERNAME=admin # A modifier
+OIL_PASSWORD=password # A modifier
+HTTP_USERNAME=admin # A modifier (optionnel)
+HTTP_PASSWORD=password # A modifier (optionnel)

+ 49 - 4
src/config/initialization.py

@@ -4,6 +4,8 @@ from __future__ import annotations
 
 import os
 from pathlib import Path
+from httpx import Client
+from urllib.parse import urlparse
 
 from dotenv import load_dotenv
 
@@ -27,21 +29,64 @@ class Initialisation:
         load_dotenv(env_path)
 
         self.base_url = os.getenv("BASE_URL", "").rstrip("/")
-        self.phpsessid = os.getenv("PHPSESSID", "")
-        self.authorization = os.getenv("AUTHORIZATION", "")
+        self.oil_username = os.getenv("OIL_USERNAME", "")
+        self.oil_password = os.getenv("OIL_PASSWORD", "")
+        self.http_username = os.getenv("HTTP_USERNAME", "")
+        self.http_password = os.getenv("HTTP_PASSWORD", "")
         self._configured = True
 
+
     def validate(self) -> None:
         """Vérifie la présence des variables d'environnement requises."""
         missing: list[str] = []
         if not self.base_url:
             missing.append("BASE_URL")
-        if not self.phpsessid:
-            missing.append("PHPSESSID")
+        if not self.oil_username:
+            missing.append("OIL_USERNAME")
+        if not self.oil_password:
+            missing.append("OIL_PASSWORD")
         if missing:
             raise ValueError(
                 f"Variables d'environnement manquantes ou invalides : {', '.join(missing)}"
             )
+        scheme, host = self._parse_base_url(self.base_url)
+
+        if self.http_username and self.http_password:
+            self.base_url = f"{scheme}://{self.http_username}:{self.http_password}@{host}"
+        else:
+            self.base_url = f"{scheme}://{host}"
+
+        try:
+            with Client() as client:
+                response = client.post(
+                    f"{self.base_url}/rest/user/login",
+                    data={
+                        "id": self.oil_username,
+                        "password": self.oil_password,
+                    }
+                )
+
+                if response.status_code != 200:
+                    raise ValueError(f"{response.content}")
+                payload = response.json()
+                if str(payload.get("code")) != "200":
+                    raise ValueError(
+                        f"{payload.get('message', payload)}, {payload.get('extmessage', payload)}"
+                    )
+                self.phpsessid = response.cookies.get("PHPSESSID")
+                
+        except Exception as e:
+            raise ValueError(f"Erreur lors de la validation de la configuration : {e}")
+
+
+    def _parse_base_url(self, raw: str) -> tuple[str, str]:
+        value = raw.strip().rstrip("/")
+        if "://" not in value:
+            return "https", value
+        parsed = urlparse(self.base_url)
+        scheme = parsed.scheme or "https"
+        host = parsed.netloc or parsed.path.split("/")[0]
+        return scheme, host
 
     def execute(self) -> None:
         """Valide la configuration et démarre le moteur MCP."""

+ 0 - 3
src/services/client_rest.py

@@ -32,15 +32,12 @@ class ClientREST:
         init = Initialisation()
         self._base_url = init.base_url
         self._phpsessid = init.phpsessid
-        self._authorization = init.authorization
 
     def _build_headers(self) -> dict[str, str]:
         headers = {
             "Accept": "application/json",
             "Cookie": f"PHPSESSID={self._phpsessid}",
         }
-        if self._authorization:
-            headers["Authorization"] = self._authorization
         return headers
 
     def execute(