@wazo/sdk 0.40.8 → 0.41.0

package/src/__tests__/api-client.test.ts

@@ -76,7 +76,6 @@ const server = 'localhost';
 const authVersion = '0.1';
 const username = 'wazo';
 const password = 'zowa';
-jest.mock('node-fetch/src/index', () => {});
 const token = '1234';
 
 const client = new WazoApiClient({

package/src/domain/__tests__/Session.test.ts

@@ -4,13 +4,8 @@ import Line from '../Line';
 
 describe('Session domain', () => {
   it('can parse a plain session to domain', () => {
-    // Can't use `new Headers` because it's not supported on node 16.
-    const headers = {
-      get: () => 'new-stack',
-    };
-
     const plain = {
-      _headers: headers,
+      _headers: new Headers({ 'wazo-stack-host': 'new-stack' }),
       data: {
         token: 'b93ae6bd-08d7-4001-9e61-057e72bbc4b3',
         acl: ['calld.lines.*.presences.read', 'calld.switchboards.#', 'calld.transfers.*.complete.update', 'calld.transfers.*.delete', 'calld.transfers.*.read', 'calld.users.*.presences.read', 'calld.users.me.#', 'confd.infos.read', 'confd.users.me.#.read', 'confd.users.me.forwards.*.*', 'confd.users.me.funckeys.*', 'confd.users.me.funckeys.*.*', 'confd.users.me.read', 'confd.users.me.services.*.*', 'confd.users.me.update', 'dird.#.me.read', 'dird.directories.favorites.#', 'dird.directories.lookup.*.headers.read', 'dird.directories.lookup.*.read', 'dird.directories.personal.*.read', 'dird.personal.#', 'events.calls.me', 'events.chat.message.*.me', 'events.config.users.me.#', 'events.statuses.*', 'events.switchboards.#', 'events.transfers.me', 'events.users.me.#', 'events.directory.me.#', 'websocketd', 'call-logd.users.me.cdr.read'],

package/src/service/IssueReporter.ts

@@ -2,7 +2,6 @@
 
 /* eslint-disable prefer-destructuring, no-param-reassign, no-underscore-dangle */
 import moment from 'moment';
-import { realFetch } from '../utils/api-requester';
 import isMobile from '../utils/isMobile';
 import { obfuscateToken } from '../utils/string';
 
@@ -383,7 +382,7 @@ class IssueReporter {
     const url = `http${isSecure ? 's' : ''}://${host}${isSecure ? '' : `:${port}`}/${tag}`;
     const body = Array.isArray(payload) ? `[${payload.map(this._boundParseLoggerBody).join(',')}]` : this._parseLoggerBody(payload as Record<string, any>);
 
-    realFetch()(url, {
+    fetch(url, {
       method: 'POST',
       headers: {
         Accept: 'application/json',

package/src/service/__tests__/IssueReporter.test.ts

@@ -4,7 +4,6 @@
 
 /* eslint-disable no-console */
 import IssueReporter from '../IssueReporter';
-import { realFetch } from '../../utils/api-requester';
 
 jest.mock('../../utils/api-requester');
 let oldLog: any;
@@ -25,9 +24,7 @@ describe('IssueReporter', () => {
   });
   beforeEach(() => {
     jest.resetAllMocks();
-    (realFetch as any).mockImplementation(() => () => ({
-      catch: () => {},
-    }));
+    jest.spyOn(global, 'fetch');
   });
   afterAll(() => {
     console.log = oldLog;
@@ -50,7 +47,7 @@ describe('IssueReporter', () => {
 
     IssueReporter._sendToRemoteLogger('info');
 
-    expect(realFetch).toHaveBeenCalled();
+    expect(fetch).toHaveBeenCalled();
   });
   it('should send if verbosity is equal than required', () => {
     // Same level
@@ -60,7 +57,7 @@ describe('IssueReporter', () => {
 
     IssueReporter._sendToRemoteLogger('trace');
 
-    expect(realFetch).toHaveBeenCalled();
+    expect(fetch).toHaveBeenCalled();
   });
   it('should not send if verbosity is lower than required', () => {
     // Lower level
@@ -70,7 +67,7 @@ describe('IssueReporter', () => {
 
     IssueReporter._sendToRemoteLogger('trace');
 
-    expect(realFetch).not.toHaveBeenCalled();
+    expect(fetch).not.toHaveBeenCalled();
   });
   it('should log extra data', () => {
     jest.spyOn(IssueReporter, '_sendToRemoteLogger').mockImplementation(() => {});

package/src/simple/Auth.ts

@@ -53,8 +53,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 +61,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 +208,7 @@ class Auth {
     setRefreshToken(null);
     this.session = null;
     this.authenticated = false;
+    this.usingEdgeServer = undefined;
     setFetchOptions({});
   }
 
@@ -318,27 +317,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 +374,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/__tests__/api-requester.test.ts

@@ -79,8 +79,6 @@ describe('Retrieving headers', () => {
 });
 describe('Calling fetch', () => {
   it('should call fetch without body but query string in get method', async () => {
-    jest.mock('node-fetch/src/index', () => {});
-
     global.fetch = jest.fn(() => Promise.resolve({
       json: () => Promise.resolve({}),
       headers: {
@@ -108,7 +106,6 @@ describe('Calling fetch', () => {
 
 describe('With a refresh token', () => {
   it('should retry the call with a new token', async () => {
-    jest.mock('node-fetch/src/index', () => {});
     let calls = 0;
 
     global.fetch = jest.fn(() => {

package/src/utils/api-requester.ts

@@ -1,12 +1,7 @@
-/* global window */
-/* eslint-disable global-require */
-/* eslint-disable import/no-dynamic-require */
 import { Base64 } from 'js-base64';
-import { AbortController as NodeAbortController } from 'node-abort-controller';
 
 import BadResponse from '../domain/BadResponse';
 import ServerError from '../domain/ServerError';
-import isMobile from './isMobile';
 import type { Token } from '../domain/types';
 import IssueReporter from '../service/IssueReporter';
 
@@ -23,32 +18,6 @@ const methods = ['head', 'get', 'post', 'put', 'delete', 'options'];
 const logger = IssueReporter ? IssueReporter.loggerFor('api') : console;
 const REQUEST_TIMEOUT_MS = 300 * 1000; // 300s like the Chrome engine default value.
 
-// Use a function here to be able to mock it in tests
-export const realFetch = () => {
-  if (typeof fetch !== 'undefined') {
-    return fetch;
-  }
-
-  if (typeof document !== 'undefined' && window.fetch) {
-    // Browser
-    return window.fetch;
-  }
-
-  if (isMobile()) {
-    // React native
-    return fetch;
-  }
-
-  // nodejs
-  // this package is disabled for react-native in package.json because it requires nodejs modules
-  // Used to trick the optimizer to avoid requiring `node-fetch/lib/index` directly
-  // It causes to require it on browsers when delivered by a nodejs engine (cf: vitejs).
-  try {
-    return require(Math.random() >= 0 ? 'node-fetch/lib/index' : '');
-  } catch (e: any) {
-    return fetch;
-  }
-};
 export default class ApiRequester {
   server: string;
 
@@ -167,9 +136,9 @@ 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 controller = new AbortController();
     const extraHeaders = fetchOptions.headers || {};
     delete fetchOptions.headers;
     const options = {
@@ -192,7 +161,7 @@ export default class ApiRequester {
     }
 
     const start = new Date();
-    const requestPromise = realFetch()(url, options).then((response: any) => {
+    const requestPromise = fetch(url, options).then((response: any) => {
       const contentType = response.headers.get('content-type') || '';
       const isJson = contentType.indexOf('application/json') !== -1;
       IssueReporter.logRequest(url, options, response, start);