@wazo/sdk 0.40.8 → 0.40.9

package/esm/simple/Auth.js

@@ -27,15 +27,13 @@ class Auth {
     mobile;
     BACKEND_WAZO;
     BACKEND_LDAP;
-    // Useful to avoid the check of the header by doing an extra request to the stack
-    shouldCheckUserUuidHeader;
+    usingEdgeServer;
     constructor() {
         this.expiration = DETAULT_EXPIRATION;
         this.authenticated = false;
         this.minSubscriptionType = null;
         this.BACKEND_WAZO = DEFAULT_BACKEND_USER;
         this.BACKEND_LDAP = BACKEND_LDAP_USER;
-        this.shouldCheckUserUuidHeader = true;
     }
     init(clientId, expiration, minSubscriptionType, authorizationName, mobile) {
         this.clientId = clientId;
@@ -160,6 +158,7 @@ class Auth {
         setRefreshToken(null);
         this.session = null;
         this.authenticated = false;
+        this.usingEdgeServer = undefined;
         setFetchOptions({});
     }
     setOnHostFromHeaders(callback) {
@@ -241,26 +240,44 @@ class Auth {
     getName() {
         return `${this.getFirstName()} ${this.getLastName()}`;
     }
-    async setHttpUserUuidHeader(uuid) {
-        if (!uuid) {
-            return;
-        }
-        const headers = {
+    _getHttpUserUuidHeaders(uuid) {
+        return {
             ...(getFetchOptions()?.headers || {}),
             'X-User-UUID': uuid,
         };
+    }
+    setHttpUserUuidHeader(uuid) {
+        logger.info('Setting http header user uuid', { uuid });
+        if (!uuid) {
+            logger.warn('attempting to set a null value to user uuid header');
+            return;
+        }
+        const headers = this._getHttpUserUuidHeaders(uuid);
+        setFetchOptions({
+            ...getFetchOptions(),
+            headers,
+        });
+    }
+    async checkHttpUserUuidHeader(uuid) {
+        logger.info('Checking user uuid http header', { uuid });
+        if (!uuid) {
+            return;
+        }
+        const headers = this._getHttpUserUuidHeaders(uuid);
         try {
-            if (this.shouldCheckUserUuidHeader) {
-                await getApiClient().client.head('auth/0.1/status', null, headers);
+            const response = await getApiClient().client.head('auth/0.1/status', null, headers, (r) => r);
+            const allowsUserUuidHeader = response.headers.get('access-control-allow-headers')?.includes('X-User-UUID');
+            if (this.mobile && !allowsUserUuidHeader) {
+                throw new Error('Server does not allow user UUID header on mobile');
             }
             // If the previous request went well, it means that the header is accepted
-            setFetchOptions({
-                ...getFetchOptions(),
-                headers,
-            });
+            this.setHttpUserUuidHeader(uuid);
+            this.usingEdgeServer = true;
+            logger.info('Setting usingEdgeServer value to TRUE', { requestHeaders: headers, responseHeaders: response.headers, allowsUserUuidHeader });
         }
-        catch (_) {
-            // Nothing to do
+        catch (e) {
+            this.usingEdgeServer = false;
+            logger.info('Setting usingEdgeServer to FALSE', { justification: e });
         }
     }
     async _onAuthenticated(rawSession) {
@@ -268,10 +285,15 @@ class Auth {
             return this.session;
         }
         const session = rawSession;
-        await this.setHttpUserUuidHeader(session.uuid);
         if (!session) {
             return null;
         }
+        if (this.usingEdgeServer) {
+            this.setHttpUserUuidHeader(session.uuid);
+        }
+        else if (typeof this.usingEdgeServer === 'undefined') {
+            await this.checkHttpUserUuidHeader(session.uuid);
+        }
         setApiToken(session.token);
         if (session.refreshToken) {
             setRefreshToken(session.refreshToken);

package/esm/types/simple/Auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../src/simple/Auth.ts"],"names":[],"mappings":"AAsBA,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAClD,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;;AA+X/C,wBAAuC"}
+{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../src/simple/Auth.ts"],"names":[],"mappings":"AAuBA,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAClD,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;;AA8Z/C,wBAAuC"}

package/esm/utils/api-requester.js

@@ -113,7 +113,7 @@ export default class ApiRequester {
         }
         const isHead = method === 'head';
         const hasEmptyResponse = method === 'delete' || isHead;
-        const newParse = hasEmptyResponse ? ApiRequester.successResponseParser : parse;
+        const newParse = hasEmptyResponse && parse === ApiRequester.defaultParser ? ApiRequester.successResponseParser : parse;
         const fetchOptions = { ...(this.fetchOptions || {}) };
         const controller = typeof AbortController !== 'undefined' ? new AbortController() : new NodeAbortController();
         const extraHeaders = fetchOptions.headers || {};

package/lib/simple/Auth.js

@@ -62,7 +62,6 @@ class Auth {
         this.minSubscriptionType = null;
         this.BACKEND_WAZO = auth_1.DEFAULT_BACKEND_USER;
         this.BACKEND_LDAP = auth_1.BACKEND_LDAP_USER;
-        this.shouldCheckUserUuidHeader = true;
     }
     init(clientId, expiration, minSubscriptionType, authorizationName, mobile) {
         this.clientId = clientId;
@@ -197,6 +196,7 @@ class Auth {
             (0, getApiClient_1.setRefreshToken)(null);
             this.session = null;
             this.authenticated = false;
+            this.usingEdgeServer = undefined;
             (0, getApiClient_1.setFetchOptions)({});
         });
     }
@@ -280,22 +280,41 @@ class Auth {
     getName() {
         return `${this.getFirstName()} ${this.getLastName()}`;
     }
+    _getHttpUserUuidHeaders(uuid) {
+        var _a;
+        return Object.assign(Object.assign({}, (((_a = (0, getApiClient_1.getFetchOptions)()) === null || _a === void 0 ? void 0 : _a.headers) || {})), { 'X-User-UUID': uuid });
+    }
     setHttpUserUuidHeader(uuid) {
+        logger.info('Setting http header user uuid', { uuid });
+        if (!uuid) {
+            logger.warn('attempting to set a null value to user uuid header');
+            return;
+        }
+        const headers = this._getHttpUserUuidHeaders(uuid);
+        (0, getApiClient_1.setFetchOptions)(Object.assign(Object.assign({}, (0, getApiClient_1.getFetchOptions)()), { headers }));
+    }
+    checkHttpUserUuidHeader(uuid) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            logger.info('Checking user uuid http header', { uuid });
             if (!uuid) {
                 return;
             }
-            const headers = Object.assign(Object.assign({}, (((_a = (0, getApiClient_1.getFetchOptions)()) === null || _a === void 0 ? void 0 : _a.headers) || {})), { 'X-User-UUID': uuid });
+            const headers = this._getHttpUserUuidHeaders(uuid);
             try {
-                if (this.shouldCheckUserUuidHeader) {
-                    yield (0, getApiClient_1.default)().client.head('auth/0.1/status', null, headers);
+                const response = yield (0, getApiClient_1.default)().client.head('auth/0.1/status', null, headers, (r) => r);
+                const allowsUserUuidHeader = (_a = response.headers.get('access-control-allow-headers')) === null || _a === void 0 ? void 0 : _a.includes('X-User-UUID');
+                if (this.mobile && !allowsUserUuidHeader) {
+                    throw new Error('Server does not allow user UUID header on mobile');
                 }
                 // If the previous request went well, it means that the header is accepted
-                (0, getApiClient_1.setFetchOptions)(Object.assign(Object.assign({}, (0, getApiClient_1.getFetchOptions)()), { headers }));
+                this.setHttpUserUuidHeader(uuid);
+                this.usingEdgeServer = true;
+                logger.info('Setting usingEdgeServer value to TRUE', { requestHeaders: headers, responseHeaders: response.headers, allowsUserUuidHeader });
             }
-            catch (_) {
-                // Nothing to do
+            catch (e) {
+                this.usingEdgeServer = false;
+                logger.info('Setting usingEdgeServer to FALSE', { justification: e });
             }
         });
     }
@@ -306,10 +325,15 @@ class Auth {
                 return this.session;
             }
             const session = rawSession;
-            yield this.setHttpUserUuidHeader(session.uuid);
             if (!session) {
                 return null;
             }
+            if (this.usingEdgeServer) {
+                this.setHttpUserUuidHeader(session.uuid);
+            }
+            else if (typeof this.usingEdgeServer === 'undefined') {
+                yield this.checkHttpUserUuidHeader(session.uuid);
+            }
             (0, getApiClient_1.setApiToken)(session.token);
             if (session.refreshToken) {
                 (0, getApiClient_1.setRefreshToken)(session.refreshToken);

package/lib/types/simple/Auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../src/simple/Auth.ts"],"names":[],"mappings":"AAsBA,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAClD,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;;AA+X/C,wBAAuC"}
+{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../src/simple/Auth.ts"],"names":[],"mappings":"AAuBA,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAClD,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;;AA8Z/C,wBAAuC"}

package/lib/utils/api-requester.js

@@ -114,7 +114,7 @@ class ApiRequester {
             }
             const isHead = method === 'head';
             const hasEmptyResponse = method === 'delete' || isHead;
-            const newParse = hasEmptyResponse ? ApiRequester.successResponseParser : parse;
+            const newParse = hasEmptyResponse && parse === ApiRequester.defaultParser ? ApiRequester.successResponseParser : parse;
             const fetchOptions = Object.assign({}, (this.fetchOptions || {}));
             const controller = typeof AbortController !== 'undefined' ? new AbortController() : new node_abort_controller_1.AbortController();
             const extraHeaders = fetchOptions.headers || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.40.8",
+  "version": "0.40.9",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "index.js",
   "types": "lib/types/index.d.ts",

package/src/simple/Auth.ts

@@ -1,4 +1,5 @@
 /* eslint-disable max-classes-per-file */
+import type { Response } from 'node-fetch';
 import Session from '../domain/Session';
 import { BACKEND_LDAP_USER, DEFAULT_BACKEND_USER, DETAULT_EXPIRATION } from '../api/auth';
 import getApiClient, {
@@ -53,8 +54,7 @@ class Auth {
 
   BACKEND_LDAP: string;
 
-  // Useful to avoid the check of the header by doing an extra request to the stack
-  shouldCheckUserUuidHeader: boolean;
+  usingEdgeServer: boolean | undefined;
 
   constructor() {
     this.expiration = DETAULT_EXPIRATION;
@@ -62,7 +62,6 @@ class Auth {
     this.minSubscriptionType = null;
     this.BACKEND_WAZO = DEFAULT_BACKEND_USER;
     this.BACKEND_LDAP = BACKEND_LDAP_USER;
-    this.shouldCheckUserUuidHeader = true;
   }
 
   init(clientId: string, expiration: number, minSubscriptionType: number | null | undefined, authorizationName: string | null, mobile: boolean): void {
@@ -210,6 +209,7 @@ class Auth {
     setRefreshToken(null);
     this.session = null;
     this.authenticated = false;
+    this.usingEdgeServer = undefined;
     setFetchOptions({});
   }
 
@@ -318,27 +318,54 @@ class Auth {
     return `${this.getFirstName()} ${this.getLastName()}`;
   }
 
-  async setHttpUserUuidHeader(uuid: string | null | undefined) {
-    if (!uuid) {
-      return;
-    }
-    const headers = {
+  _getHttpUserUuidHeaders(uuid:string) {
+    return {
       ...(getFetchOptions()?.headers || {}),
       'X-User-UUID': uuid,
     };
+  }
+
+  setHttpUserUuidHeader(uuid: string) {
+    logger.info('Setting http header user uuid', { uuid });
+
+    if (!uuid) {
+      logger.warn('attempting to set a null value to user uuid header');
+      return;
+    }
+
+    const headers = this._getHttpUserUuidHeaders(uuid);
+
+    setFetchOptions({
+      ...getFetchOptions(),
+      headers,
+    });
+  }
+
+  async checkHttpUserUuidHeader(uuid: string | null | undefined) {
+    logger.info('Checking user uuid http header', { uuid });
+
+    if (!uuid) {
+      return;
+    }
+
+    const headers = this._getHttpUserUuidHeaders(uuid);
 
     try {
-      if (this.shouldCheckUserUuidHeader) {
-        await getApiClient().client.head('auth/0.1/status', null, headers);
+      const response: Response = await getApiClient().client.head('auth/0.1/status', null, headers, (r: any) => r);
+
+      const allowsUserUuidHeader = response.headers.get('access-control-allow-headers')?.includes('X-User-UUID');
+
+      if (this.mobile && !allowsUserUuidHeader) {
+        throw new Error('Server does not allow user UUID header on mobile');
       }
 
       // If the previous request went well, it means that the header is accepted
-      setFetchOptions({
-        ...getFetchOptions(),
-        headers,
-      });
-    } catch (_) {
-      // Nothing to do
+      this.setHttpUserUuidHeader(uuid);
+      this.usingEdgeServer = true;
+      logger.info('Setting usingEdgeServer value to TRUE', { requestHeaders: headers, responseHeaders: response.headers, allowsUserUuidHeader });
+    } catch (e) {
+      this.usingEdgeServer = false;
+      logger.info('Setting usingEdgeServer to FALSE', { justification: e });
     }
   }
 
@@ -348,12 +375,17 @@ class Auth {
     }
 
     const session = rawSession;
-    await this.setHttpUserUuidHeader(session.uuid);
 
     if (!session) {
       return null;
     }
 
+    if (this.usingEdgeServer) {
+      this.setHttpUserUuidHeader(session.uuid as string);
+    } else if (typeof this.usingEdgeServer === 'undefined') {
+      await this.checkHttpUserUuidHeader(session.uuid);
+    }
+
     setApiToken(session.token);
 
     if (session.refreshToken) {

package/src/utils/api-requester.ts

@@ -167,7 +167,7 @@ export default class ApiRequester {
 
     const isHead = method === 'head';
     const hasEmptyResponse = method === 'delete' || isHead;
-    const newParse = hasEmptyResponse ? ApiRequester.successResponseParser : parse;
+    const newParse = hasEmptyResponse && parse === ApiRequester.defaultParser ? ApiRequester.successResponseParser : parse;
     const fetchOptions = { ...(this.fetchOptions || {}) };
     const controller = typeof AbortController !== 'undefined' ? new AbortController() : new NodeAbortController();
     const extraHeaders = fetchOptions.headers || {};