@communecter/cocolight-api-client 1.0.9 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@communecter/cocolight-api-client",
-    "version": "1.0.9",
+    "version": "1.0.11",
     "description": "Client Axios simplifié pour l'API cocolight",
     "repository": {
         "type": "git",
@@ -32,7 +32,9 @@
         "generate:testdata": "node ./scripts/generate-test-data.js",
         "generate:reponses": "node ./scripts/generate-constant-response-200.js",
         "generate:methodeapi": "node ./scripts/generate-methode-api.js",
-        "generate:ajv-standalone": "node ./scripts/generate-validate-function-ajv.js"
+        "generate:ajv-standalone": "node ./scripts/generate-validate-function-ajv.js",
+        "generate:entities": "node scripts/generate-entities.js",
+        "generate:all-properties-schema": "node scripts/generate-all-properties-schema.js"
     },
     "keywords": [
         "communecter",

package/src/Api.js

@@ -1,10 +1,11 @@
 // Api.js
 import EndpointApi from "./api/EndpointApi.js";
+import { News } from "./api/News.js";
 import { Organization } from "./api/Organization.js";
 import { Project } from "./api/Project.js";
 import { User } from "./api/User.js";
 import { UserApi } from "./api/UserApi.js";
-import { ApiAuthenticationError, ApiClientError } from "./error.js";
+import { ApiAuthenticationError, ApiClientError, ApiError } from "./error.js";
 
 export default class Api {
   /**
@@ -50,8 +51,27 @@ export default class Api {
      */
   static async userApiLogin(userApi, email, password) {
     try {
-      const loggedUser = await userApi.login(email, password);
-      return new Api(loggedUser, userApi.client);
+
+      if (!userApi) {
+        throw new ApiError("userApi is not defined");
+      }
+      if(!userApi.client) {
+        throw new ApiError("userApi.client is not defined");
+      }
+
+      if(userApi.client.isConnected) {
+        // Si l'utilisateur est déjà connecté, on le récupère
+        // et on ne fait pas de login
+        const loggedUser = await userApi.meIsconnected();
+        return new Api(loggedUser, userApi.client);
+      } else {
+        if (!email || !password) {
+          throw new ApiError("email and password are required");
+        }
+        const loggedUser = await userApi.login(email, password);
+        return new Api(loggedUser, userApi.client);
+      }
+
     } catch (error) {
       if(error instanceof ApiClientError) {
         if(error?.details?.error) {
@@ -76,12 +96,14 @@ export default class Api {
   /**
    * Retourne l'utilisateur connecté.
    *
-   * @returns {User} L'utilisateur connecté.
+   * @returns {Promise<User>} L'utilisateur connecté.
+   * @throws {ApiAuthenticationError} Si l'utilisateur n'est pas authentifié.
    */
-  me() {
+  async me() {
     if (!this._loggedUser) {
       throw new ApiAuthenticationError("Accès refusé : utilisateur non authentifié.");
     }
+    await this._loggedUser.get();
     return this._loggedUser;
   }
 
@@ -89,11 +111,18 @@ export default class Api {
    * Crée une instance User pour un utilisateur donné (autre que le connecté).
    *
    * @param {Object} userData - Les données de l'utilisateur public.
-   * @returns {User}
+   * @returns {Promise<User>} Une promesse qui résout l'instance User.
+   * @throws {Error} Si une erreur se produit lors de la création de l'utilisateur.
    */
-  user(userData) {
+  async user(userData) {
     try {
-      return new User(this._client, userData, {}, { EndpointApi });
+      if (!userData.id && !userData.slug) {
+        return new User(this._client, userData, { EndpointApi, Organization, Project, News });
+      } else {
+        const user = new User(this._client, userData, { EndpointApi, Organization, Project, News });
+        await user.get();
+        return user;
+      }
     } catch (error) {
       console.error("[Api.user] Erreur lors de la création d'un objet utilisateur public :", error.message);
       throw error;
@@ -105,18 +134,17 @@ export default class Api {
    * Creates an Organization object and optionally retrieves its profile.
    *
    * @param {Object} organizationData - The data required to initialize the Organization object.
-   * @param {Object} [options={ getProfile: true }] - Additional options for the organization creation.
-   * @param {boolean} [options.getProfile=true] - Whether to fetch the organization's profile after creation.
    * @returns {Promise<Organization>} A promise that resolves to the created Organization object.
    * @throws {Error} Throws an error if the organization creation or profile retrieval fails.
    */
-  async organization(organizationData, options = { getProfile: true }) {
+  async organization(organizationData) {
     try {
-      const oraganization = new Organization(this._client, organizationData, { EndpointApi });
-      if (options.getProfile) {
-        await oraganization.getProfil();
+      const organization = new Organization(this._client, organizationData, { EndpointApi, User, Project, News });
+      if (!organizationData.id && !organizationData.slug) {
+        throw new Error("Vous devez fournir un id ou un slug pour créer une instance Organization.");
       }
-      return oraganization;
+      await organization.get();
+      return organization;
     } catch (error) {
       console.error("[Api.organization] Erreur lors de la création d'un objet organisation :", error.message);
       throw error;
@@ -127,17 +155,16 @@ export default class Api {
    * Creates a new Project instance and optionally retrieves its profile.
    *
    * @param {Object} projectData - The data used to initialize the Project instance.
-   * @param {Object} [options={ getProfile: true }] - Additional options for project creation.
-   * @param {boolean} [options.getProfile=true] - Whether to retrieve the project's profile after creation.
    * @returns {Promise<Project>} A promise that resolves to the created Project instance.
    * @throws {Error} If an error occurs during project creation or profile retrieval.
    */
-  async project(projectData, options = { getProfile: true }) {
+  async project(projectData) {
     try {
-      const project = new Project(this._client, projectData, { EndpointApi });
-      if (options.getProfile) {
-        await project.getProfil();
+      const project = new Project(this._client, projectData, { User, News, EndpointApi });
+      if (!projectData.id && !projectData.slug) {
+        throw new Error("Vous devez fournir un id ou un slug pour créer une instance Project.");
       }
+      await project.get();
       return project;
     } catch (error) {
       console.error("[Api.project] Erreur lors de la création d'un objet projet :", error.message);
@@ -150,13 +177,23 @@ export default class Api {
    *
    * @returns {ApiClient}
    */
-
   get client() {
     return this._client;
   }
 
+  /**
+   * Retourne l'instance d'EndpointApi.
+   * 
+   * @returns {EndpointApi}
+   */
   get endpointApi() {
     return new EndpointApi(this._client);
   }
+
+  logout () {
+    this.loggedUser = null;
+    this._client.resetSession();
+    this._client._logger.info("UserApi: User logged out");
+  }
   
 }

package/src/ApiClient.js

@@ -12,6 +12,7 @@ import pino from "pino";
 import MongoID from "./EJSONType.js";
 import endpointsJson from "./endpoints.module.js";
 import { ApiClientError, ApiResponseError, ApiValidationError, CircuitBreakerError } from "./error.js";
+import { MemoryStorageStrategy } from "./utils/TokenStorage.js";
 
 EJSON.addType("oid", value => {
   return new MongoID.ObjectID(value);
@@ -31,6 +32,7 @@ export default class ApiClient extends EventEmitter {
    * @param {number}  [options.circuitBreakerThreshold=5] - Nb d'erreurs avant de bloquer
    * @param {number}  [options.circuitBreakerResetTime=60000] - Ms avant de reset le breaker
    * @param {boolean} [options.fromJSONValue=true] - Si true, les données sont transformées en EJSON
+   * @param {TokenStorageStrategy} [options.tokenStorageStrategy=null] - Stratégie de stockage des tokens
    */
   constructor({
     baseURL,
@@ -43,7 +45,8 @@ export default class ApiClient extends EventEmitter {
     maxRetries = 0,
     circuitBreakerThreshold = 5,
     circuitBreakerResetTime = 60000,
-    fromJSONValue = true
+    fromJSONValue = true,
+    tokenStorageStrategy = null
   } = {}) {
     super(); // EventEmitter
 
@@ -51,8 +54,9 @@ export default class ApiClient extends EventEmitter {
       throw new ApiClientError("Le paramètre \"baseURL\" est obligatoire.", 500);
     }
 
+    this.__entityTag = "ApiClient";
+    
     this._baseURL = baseURL;
-    this._refreshToken = refreshToken;
     this._refreshUrl = refreshUrl;
     this._endpoints = endpoints;
     this._debug = debug;
@@ -86,7 +90,6 @@ export default class ApiClient extends EventEmitter {
     });
 
     // Pino logger
-    // (Ici en mode pretty-print sur la console, tu peux configurer comme tu veux)
     this._logger = pino({
       transport: {
         target: "pino-pretty",
@@ -121,30 +124,73 @@ export default class ApiClient extends EventEmitter {
     this._breakerOpen = false;
     this._lastBreakerOpenTime = null;
 
-    // Applique un token initial
+    this._accessToken = null;
+    this._refreshToken = null;
+
+    // Applique un token initial s'il est fourni
+    if(refreshToken){
+      this.setRefreshToken(refreshToken);
+    }
+
     if (accessToken) {
       this.setToken(accessToken);
     }
 
+    this._tokenStorage = tokenStorageStrategy || new MemoryStorageStrategy();
+
+    const initialAccessToken = this._tokenStorage.getAccessToken();
+    if (initialAccessToken) {
+      this.setToken(initialAccessToken);
+    }
+
+    const initialRefreshToken = this._tokenStorage.getRefreshToken();
+    if (initialRefreshToken) {
+      this.setRefreshToken(initialRefreshToken);
+    }
+    
+
     // Intercepteur 401 -> refresh
     this._client.interceptors.response.use(
-      (response) => response,
-      async (error) => {
-        if (error.response && error.response.status === 401) {
-          if (this._refreshToken) {
-            try {
-              const refreshed = await this._refreshAccessToken();
-              if (refreshed) {
-                return this._client.request(error.config);
-              }
-            } catch (err) {
-              throw new ApiClientError(err.message, 401, err);
+      response => response,
+      async error => {
+        const originalRequest = error.config;
+
+        // Si la requête est déjà réessayée, abandonne
+        if (originalRequest._retry) {
+          this._logger.error("[ApiClient] Requête déjà retentée, échec définitif.");
+          throw error;
+        }
+
+        if (error.response && error.response.status === 401 && this._refreshToken) {
+          originalRequest._retry = true;
+
+          try {
+            this._logger.info("[ApiClient] Tentative de refresh du token...");
+            const refreshed = await this._refreshAccessToken();
+
+            if (refreshed) {
+              this._logger.info("[ApiClient] Token rafraîchi avec succès.");
+
+              // 🔑 Mise à jour EXPLICITE du header Authorization dans la requête originale
+              originalRequest.headers["Authorization"] = "Bearer " + this.getToken();
+
+              this._logger.info("[ApiClient] Retente la requête originale avec le nouveau token.");
+              return this._client.request(originalRequest);
+            } else {
+              this.resetSession();
+              throw new ApiClientError("Impossible de rafraîchir le token.", 401);
             }
+          } catch (err) {
+            this.resetSession();
+            throw new ApiClientError("Erreur lors du rafraîchissement du token.", 401, err);
           }
         }
+
         throw error;
       }
     );
+
+
   }
 
   /**
@@ -154,6 +200,7 @@ export default class ApiClient extends EventEmitter {
    */
   setToken(token) {
     this._accessToken = token;
+    this._tokenStorage.setAccessToken(token);
     this._client.defaults.headers.common["Authorization"] = "Bearer " + token;
     // Extrait l'id depuis le token et le stocke si disponible
     const userId = this._getIdFromToken(token);
@@ -176,17 +223,20 @@ export default class ApiClient extends EventEmitter {
   /**
    * Sets the refresh token for the API client.
    *
-   * @param {string} rt - The refresh token to be set.
+   * @param {string} refreshToken - The refresh token to be set.
    */
-  setRefreshToken(rt) {
-    this._refreshToken = rt;
-    // Vous pouvez faire de même ici si besoin
-    const userId = this._getIdFromToken(rt);
-    if (userId) {
-      this._setUserId(userId);
-      this._logger.debug(`[ApiClient] userId extrait depuis refreshToken : ${userId}`);
+  setRefreshToken(token) {
+    this._refreshToken = token;
+    this._tokenStorage.setRefreshToken(token);
+    if(this.userId === null){
+    // Extrait l'id depuis le token et le stocke si disponible
+      const userId = this._getIdFromToken(token);
+      if (userId) {
+        this._setUserId(userId);
+        this._logger.debug(`[ApiClient] userId extrait depuis refreshToken : ${userId}`);
+      }
     }
-    this._logger.debug(`[ApiClient] setRefreshToken: ${rt}`);
+    this._logger.debug(`[ApiClient] setRefreshToken: ${token}`);
   }
 
   /**
@@ -234,14 +284,19 @@ export default class ApiClient extends EventEmitter {
    */
   async _refreshAccessToken() {
     if (!this._refreshToken) return false;
+
+    const refreshClient = axios.create({
+      baseURL: this._baseURL,
+      timeout: 10000, // ajuster si nécessaire
+      headers: { "Content-Type": "application/json" }
+    });
+
     try {
-      const response = await this._client.post(
-        this._refreshUrl,
-        { refreshToken: this._refreshToken },
-        { headers: { "Content-Type": "application/json" } }
-      );
-      if (response.data && response.data.accessToken) {
-        this.setToken(response.data.accessToken);
+      const response = await refreshClient.post(this._refreshUrl, {
+        refreshToken: this._refreshToken
+      });
+      if (response.data && response.data.token) {
+        this.setToken(response.data.token);
         if (response.data.refreshToken) {
           this.setRefreshToken(response.data.refreshToken);
         }
@@ -774,6 +829,7 @@ export default class ApiClient extends EventEmitter {
     this.setToken(null);
     this.setRefreshToken(null);
     this._setUserId(null);
+    this._tokenStorage.clear();
 
     // Suppression des en-têtes
     delete this._client.defaults.headers.common["Authorization"];
@@ -1379,5 +1435,13 @@ export default class ApiClient extends EventEmitter {
   };
   
 
+  getRequestSchema(constant) {
+    const endpoint = this._endpoints.find(e => e.constant === constant);
+    return endpoint?.request || null;
+  }
+
+  getPathSchema(constant) {
+    return this._endpoints.find(e => e.constant === constant)?.pathParams || null;
+  }
 
 }