@metarisc/metarisc-js 0.0.1-alpha.69 → 0.0.1-alpha.70

package/lib/api/CommissionsAPI.d.ts

@@ -49,8 +49,8 @@ export declare class CommissionsAPI extends Core {
      * Ajout d'un membre dans la commission.
      */
     postMembresCommission(commissionId: string, params: {
-        titre?: string;
-        presenceObligatoire?: boolean;
+        titre: string;
+        presenceObligatoire: boolean;
     }): Promise<AxiosResponse<CommissionMembre>>;
     /**
      * Mise à jour des préférences de la commission.

package/lib/client.d.ts

@@ -16,7 +16,11 @@ export declare enum AuthMethod {
     CLIENT_CREDENTIALS = 0,
     AUTHORIZATION_CODE = 1
 }
+export declare enum EventEnum {
+    request = "request"
+}
 export declare class Client {
+    private eventStream;
     private axios;
     private oauth2;
     private access_token?;
@@ -29,6 +33,8 @@ export declare class Client {
      * Lance une requête (authentifiée si possible) sur l'API Metarisc.
      */
     request<T>(config: RequestConfig): Promise<AxiosResponse<T>>;
+    protected emit(eventName: EventEnum, payload: unknown): void;
+    getEventStream(): EventTarget;
     /**
      * Définition de l'Access Token
      */

package/lib/client.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Client = exports.AuthMethod = void 0;
+exports.Client = exports.EventEnum = exports.AuthMethod = void 0;
 const axios_1 = __importDefault(require("axios"));
 const axios_retry_1 = __importDefault(require("axios-retry"));
 const oauth2_1 = require("./auth/oauth2");
@@ -15,8 +15,13 @@ var AuthMethod;
     AuthMethod[AuthMethod["CLIENT_CREDENTIALS"] = 0] = "CLIENT_CREDENTIALS";
     AuthMethod[AuthMethod["AUTHORIZATION_CODE"] = 1] = "AUTHORIZATION_CODE";
 })(AuthMethod = exports.AuthMethod || (exports.AuthMethod = {}));
+var EventEnum;
+(function (EventEnum) {
+    EventEnum["request"] = "request";
+})(EventEnum = exports.EventEnum || (exports.EventEnum = {}));
 class Client {
     constructor(config) {
+        this.eventStream = new EventTarget();
         // Paramétrage OAuth2
         this.oauth2 = new oauth2_1.OAuth2({
             client_id: config.client_id,
@@ -106,6 +111,7 @@ class Client {
      * Lance une requête (authentifiée si possible) sur l'API Metarisc.
      */
     async request(config) {
+        this.emit(EventEnum.request, config);
         return this.axios.request({
             method: config.method || "GET",
             url: config.endpoint || "/",
@@ -114,6 +120,12 @@ class Client {
             headers: config.headers
         });
     }
+    emit(eventName, payload) {
+        this.eventStream.dispatchEvent(new CustomEvent(eventName, { detail: payload }));
+    }
+    getEventStream() {
+        return this.eventStream;
+    }
     /**
      * Définition de l'Access Token
      */

package/lib/core.d.ts

@@ -1,5 +1,5 @@
 import { AxiosResponse } from "axios";
-import { AuthMethod, Client } from "./client";
+import { AuthMethod, Client, EventEnum } from "./client";
 import { Collection } from "./collection";
 import { GrantResponse, RefreshResponse } from "./auth/oauth2";
 interface RequestConfig {
@@ -29,10 +29,8 @@ export interface OAuth2Options {
 export declare class Core {
     protected client: Client;
     protected config: MetariscConfig;
-    protected requestEvent: EventTarget;
     constructor(config: MetariscConfig, client?: Client);
     request<T>(config: RequestConfig): Promise<AxiosResponse<T>>;
-    protected emit(eventName: EventEnum, payload: unknown): void;
     on(eventName: EventEnum, callback: (event: Event) => void): void;
     collect<T>(config: RequestConfig): Collection<T>;
     authenticate(auth_method: AuthMethod, options: OAuth2Options): Promise<GrantResponse>;
@@ -41,7 +39,4 @@ export declare class Core {
     setRefreshToken(refresh_token: string): void;
     setActiveOrganisation(orgId: string): void;
 }
-export declare enum EventEnum {
-    request = "request"
-}
 export {};

package/lib/core.js

@@ -1,23 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventEnum = exports.Core = void 0;
+exports.Core = void 0;
 const client_1 = require("./client");
 const collection_1 = require("./collection");
 class Core {
     constructor(config, client) {
-        this.requestEvent = new EventTarget();
         this.config = config;
         this.client = client ?? new client_1.Client(config);
     }
     async request(config) {
-        this.emit(EventEnum.request, config);
         return this.client.request(config);
     }
-    emit(eventName, payload) {
-        this.requestEvent.dispatchEvent(new CustomEvent(eventName, { detail: payload }));
-    }
     on(eventName, callback) {
-        this.requestEvent.addEventListener(eventName, callback);
+        this.client.getEventStream().addEventListener(eventName, callback);
     }
     collect(config) {
         return new collection_1.Collection(this, {
@@ -43,7 +38,3 @@ class Core {
     }
 }
 exports.Core = Core;
-var EventEnum;
-(function (EventEnum) {
-    EventEnum["request"] = "request";
-})(EventEnum = exports.EventEnum || (exports.EventEnum = {}));

package/lib/utils.d.ts

@@ -11,7 +11,9 @@ export declare class Utils {
      */
     static formatDate(date: Date): string;
     /**
-     * Filtre un objet pour enlever tous les champs "undefined"
+     * Filtre un objet pour :
+     * - enlever tous les champs "undefined"
+     * - filtrer les dates
      */
     static payloadFilter(payload: any): object;
 }

package/lib/utils.js

@@ -43,10 +43,13 @@ class Utils {
             new String(date.getUTCSeconds()).padStart(2, '0') + 'Z');
     }
     /**
-     * Filtre un objet pour enlever tous les champs "undefined"
+     * Filtre un objet pour :
+     * - enlever tous les champs "undefined"
+     * - filtrer les dates
      */
     static payloadFilter(payload) {
         const filtered = {};
+        // Filtre sur tous les champs "undefined"
         Object.keys(payload).forEach((key) => {
             if (payload[key] === Object(payload[key])) {
                 filtered[key] = Utils.payloadFilter(payload[key]);
@@ -55,6 +58,12 @@ class Utils {
                 filtered[key] = payload[key];
             }
         });
+        // Filtre sur la date
+        Object.keys(filtered).forEach((key) => {
+            if (filtered[key] instanceof Date) {
+                filtered[key] = this.formatDate(payload[key]);
+            }
+        });
         return filtered;
     }
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@metarisc/metarisc-js",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
-  "version": "0.0.1-alpha.69",
+  "version": "0.0.1-alpha.70",
   "scripts": {
     "lint": "eslint . --ext .ts --fix",
     "compile": "tsc",

package/src/api/CommissionsAPI.ts

@@ -114,7 +114,7 @@ export class CommissionsAPI extends Core {
     /**
      * Ajout d'un membre dans la commission.
      */
-    async postMembresCommission(commissionId: string, params : { titre ? : string, presenceObligatoire ? : boolean }): Promise<AxiosResponse<CommissionMembre>>
+    async postMembresCommission(commissionId: string, params : { titre : string, presenceObligatoire : boolean, }): Promise<AxiosResponse<CommissionMembre>>
     {
         const pathVariable = { 'commission_id': (new String(commissionId)).toString() };
         return this.request({

package/src/client.ts

@@ -23,7 +23,13 @@ export enum AuthMethod {
 	AUTHORIZATION_CODE,
 }
 
+export enum EventEnum {
+    request = "request"
+}
+
 export class Client {
+	private eventStream = new EventTarget();
+
 	private axios: AxiosInstance;
 
 	private oauth2: OAuth2;
@@ -133,6 +139,7 @@ export class Client {
 	 * Lance une requête (authentifiée si possible) sur l'API Metarisc.
 	 */
 	async request<T>(config: RequestConfig): Promise<AxiosResponse<T>> {
+		this.emit(EventEnum.request, config);
 		return this.axios.request<T>({
 			method: config.method || "GET",
 			url: config.endpoint || "/",
@@ -142,6 +149,16 @@ export class Client {
 		});
 	}
 
+	protected emit(eventName: EventEnum, payload: unknown) {
+        this.eventStream.dispatchEvent(
+            new CustomEvent(eventName, { detail: payload })
+        );
+    }
+
+	public getEventStream(): EventTarget {
+		return this.eventStream;
+	}
+
 	/**
 	 * Définition de l'Access Token
 	 */

package/src/core.ts

@@ -1,5 +1,5 @@
 import { AxiosResponse } from "axios";
-import { AuthMethod, Client } from "./client";
+import { AuthMethod, Client, EventEnum } from "./client";
 import { Collection } from "./collection";
 import { GrantResponse, RefreshResponse } from "./auth/oauth2";
 
@@ -29,7 +29,6 @@ export interface OAuth2Options {
 export class Core {
     protected client: Client;
     protected config: MetariscConfig;
-    protected requestEvent = new EventTarget();
 
     constructor(config: MetariscConfig, client?: Client) {
         this.config = config;
@@ -37,18 +36,11 @@ export class Core {
     }
 
     async request<T>(config: RequestConfig): Promise<AxiosResponse<T>> {
-        this.emit(EventEnum.request, config);
         return this.client.request<T>(config);
     }
 
-    protected emit(eventName: EventEnum, payload: unknown) {
-        this.requestEvent.dispatchEvent(
-            new CustomEvent(eventName, { detail: payload })
-        );
-    }
-
     on(eventName: EventEnum, callback: (event: Event) => void): void {
-        this.requestEvent.addEventListener(eventName, callback);
+        this.client.getEventStream().addEventListener(eventName, callback);
     }
 
     collect<T>(config: RequestConfig): Collection<T> {
@@ -82,7 +74,3 @@ export class Core {
         this.client.setActiveOrganisation(orgId);
     }
 }
-
-export enum EventEnum {
-    request = "request"
-}

package/src/utils.ts

@@ -48,10 +48,13 @@ export class Utils {
     }
 
     /**
-     * Filtre un objet pour enlever tous les champs "undefined"
+     * Filtre un objet pour :
+     * - enlever tous les champs "undefined"
+     * - filtrer les dates
      */
     static payloadFilter(payload : any) : object {
         const filtered : any = {};
+        // Filtre sur tous les champs "undefined"
         Object.keys(payload).forEach((key) => {
             if (payload[key] === Object(payload[key])) {
                 filtered[key] = Utils.payloadFilter(payload[key]);
@@ -60,6 +63,12 @@ export class Utils {
                 filtered[key] = payload[key];
             }
         });
+        // Filtre sur la date
+        Object.keys(filtered).forEach((key) => {
+            if(filtered[key] instanceof Date) {
+                filtered[key] = this.formatDate(payload[key]);
+            }
+        });
         return filtered;
     }
 }