@ama-sdk/core 11.0.0-prerelease.9 → 11.0.0-rc.10

package/cjs/clients/api-angular-client.js

@@ -317,29 +317,6 @@ var ApiAngularClient = /*#__PURE__*/ function() {
                 })();
             }
         },
-        {
-            key: "prepareOptions",
-            value: /** @inheritdoc */ function prepareOptions(url, method, queryParams, headers, body, tokenizedOptions, metadata, api) {
-                var _this = this;
-                return _async_to_generator(function() {
-                    return _ts_generator(this, function(_state) {
-                        return [
-                            2,
-                            _this.getRequestOptions({
-                                headers: headers,
-                                method: method,
-                                basePath: url,
-                                queryParams: queryParams,
-                                body: body,
-                                metadata: metadata,
-                                tokenizedOptions: tokenizedOptions,
-                                api: api
-                            })
-                        ];
-                    });
-                })();
-            }
-        },
         {
             key: "prepareUrl",
             value: /** @inheritdoc */ function prepareUrl(url) {

package/cjs/clients/api-beacon-client.js

@@ -161,21 +161,6 @@ var ApiBeaconClient = /*#__PURE__*/ function() {
                 return Promise.resolve(opts);
             }
         },
-        {
-            key: "prepareOptions",
-            value: /** @inheritdoc */ function prepareOptions(url, method, queryParams, headers, body, tokenizedOptions, metadata, api) {
-                return this.getRequestOptions({
-                    headers: headers,
-                    method: method,
-                    basePath: url,
-                    queryParams: queryParams,
-                    body: body,
-                    metadata: metadata,
-                    tokenizedOptions: tokenizedOptions,
-                    api: api
-                });
-            }
-        },
         {
             key: "prepareUrl",
             value: /** @inheritdoc */ function prepareUrl(url, queryParameters) {

package/cjs/clients/api-fetch-client.js

@@ -355,29 +355,6 @@ var ApiFetchClient = /*#__PURE__*/ function() {
                 })();
             }
         },
-        {
-            key: "prepareOptions",
-            value: /** @inheritdoc */ function prepareOptions(url, method, queryParams, headers, body, tokenizedOptions, metadata, api) {
-                var _this = this;
-                return _async_to_generator(function() {
-                    return _ts_generator(this, function(_state) {
-                        return [
-                            2,
-                            _this.getRequestOptions({
-                                headers: headers,
-                                method: method,
-                                basePath: url,
-                                queryParams: queryParams,
-                                body: body,
-                                metadata: metadata,
-                                tokenizedOptions: tokenizedOptions,
-                                api: api
-                            })
-                        ];
-                    });
-                })();
-            }
-        },
         {
             key: "prepareUrl",
             value: /** @inheritdoc */ function prepareUrl(url) {

package/cjs/fwk/api.helpers.js

@@ -188,7 +188,7 @@ endpoint) {
     if (typeof revivers === 'function' || typeof revivers === 'undefined') {
         return revivers;
     }
-    if (response.status && revivers[response.status]) {
+    if (response.status && Object.keys(revivers).indexOf("".concat(response.status)) > -1) {
         return revivers[response.status];
     }
     if (options === null || options === void 0 ? void 0 : options.disableFallback) {

package/cjs/fwk/core/api-client.js

@@ -9,5 +9,5 @@ Object.defineProperty(exports, "isApiClient", {
     }
 });
 function isApiClient(client) {
-    return client && !!client.options && typeof client.extractQueryParams === 'function' && typeof client.prepareOptions === 'function' && typeof client.prepareUrl === 'function' && typeof client.processFormData === 'function' && typeof client.processCall === 'function';
+    return client && !!client.options && typeof client.extractQueryParams === 'function' && typeof client.getRequestOptions === 'function' && typeof client.prepareUrl === 'function' && typeof client.processFormData === 'function' && typeof client.processCall === 'function';
 }

package/cjs/fwk/index.js

@@ -11,7 +11,6 @@ _export_star(require("./errors"), exports);
 _export_star(require("./ignore-enum.type"), exports);
 _export_star(require("./logger"), exports);
 _export_star(require("./mocks/index"), exports);
-_export_star(require("./open-api-tools-configuration"), exports);
 _export_star(require("./Reviver"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {

package/cjs/plugins/perf-metric/perf-metric.fetch.js

@@ -215,19 +215,31 @@ var PerformanceMetricPlugin = /*#__PURE__*/ function() {
    * Callback function called when a mark is closed with an error.
    */ _define_property(this, "onMarkError", void 0);
         /**
+   * Callback function called when a mark is opened.
+   */ _define_property(this, "onMarkOpen", void 0);
+        /**
    * Opened marks.
    */ _define_property(this, "openMarks", {});
         /**
-   * Method used to get the current time.
-   * Date.now() is used by default, but we fall back on window.performance.now() if available.
+   * Performance reporter to use for performance measurements.
+   * @default window.performance on browser only, undefined on node
+   */ _define_property(this, "performance", void 0);
+        /**
+   * Method used to get the current time as default implementation if no Performance API available.
+   * Date.now() is used by default.
    */ _define_property(this, "getTime", Date.now);
+        /**
+   * Retrieve the performance tag name
+   * @param status status of the call
+   * @param markId Mark ID
+   */ _define_property(this, "getPerformanceTag", function(status, markId) {
+            return "sdk:".concat(status, ":").concat(markId);
+        });
+        this.getPerformanceTag = (options === null || options === void 0 ? void 0 : options.getPerformanceTag) || this.getPerformanceTag;
+        this.performance = (options === null || options === void 0 ? void 0 : options.performance) || (typeof window !== 'undefined' ? window.performance : undefined);
         this.onMarkComplete = options ? options.onMarkComplete : this.onMarkComplete;
         this.onMarkError = options ? options.onMarkError : this.onMarkError;
-        if (typeof window !== 'undefined' && !!window.performance && !!window.performance.now) {
-            this.getTime = function() {
-                return window.performance.now();
-            };
-        }
+        this.onMarkOpen = options ? options.onMarkOpen : this.onMarkOpen;
     }
     _create_class(PerformanceMetricPlugin, [
         {
@@ -237,13 +249,21 @@ var PerformanceMetricPlugin = /*#__PURE__*/ function() {
    * @param url URL of the call associated to the mark to open
    * @param requestOptions Options of the call associated to the mark to open
    */ function openMark(url, requestOptions) {
+                var _this_performance;
                 var markId = (0, _uuid.v4)();
-                this.openMarks = _object_spread_props(_object_spread({}, this.openMarks), _define_property({}, markId, {
+                var perfMark = ((_this_performance = this.performance) === null || _this_performance === void 0 ? void 0 : _this_performance.mark(this.getPerformanceTag('start', markId))) || undefined;
+                var _perfMark_startTime;
+                var startTime = (_perfMark_startTime = perfMark === null || perfMark === void 0 ? void 0 : perfMark.startTime) !== null && _perfMark_startTime !== void 0 ? _perfMark_startTime : this.getTime();
+                var mark = {
                     markId: markId,
                     url: url,
                     requestOptions: requestOptions,
-                    startTime: this.getTime()
-                }));
+                    startTime: startTime
+                };
+                this.openMarks[markId] = mark;
+                if (this.onMarkOpen) {
+                    void this.onMarkOpen(mark);
+                }
                 return markId;
             }
         },
@@ -254,14 +274,19 @@ var PerformanceMetricPlugin = /*#__PURE__*/ function() {
    * @param markId Id of the mark to close
    * @param response Response of the call associated to the mark to close
    */ function closeMark(markId, response) {
+                var _this_performance, _this_performance1;
+                var perfMark = ((_this_performance = this.performance) === null || _this_performance === void 0 ? void 0 : _this_performance.mark(this.getPerformanceTag('end', markId))) || undefined;
+                var _perfMark_startTime;
+                var endTime = (_perfMark_startTime = perfMark === null || perfMark === void 0 ? void 0 : perfMark.startTime) !== null && _perfMark_startTime !== void 0 ? _perfMark_startTime : this.getTime();
+                (_this_performance1 = this.performance) === null || _this_performance1 === void 0 ? void 0 : _this_performance1.measure(this.getPerformanceTag('measure', markId), this.getPerformanceTag('start', markId), this.getPerformanceTag('end', markId));
                 var mark = this.openMarks[markId];
                 if (!mark) {
                     return;
                 }
                 if (this.onMarkComplete) {
-                    this.onMarkComplete(_object_spread_props(_object_spread({}, mark), {
+                    void this.onMarkComplete(_object_spread_props(_object_spread({}, mark), {
                         response: response,
-                        endTime: this.getTime()
+                        endTime: endTime
                     }));
                 }
                 delete this.openMarks[markId];
@@ -274,14 +299,19 @@ var PerformanceMetricPlugin = /*#__PURE__*/ function() {
    * @param markId Id of the mark to close
    * @param error Optional error of the call associated to the mark to close
    */ function closeMarkWithError(markId, error) {
+                var _this_performance, _this_performance1;
+                var perfMark = ((_this_performance = this.performance) === null || _this_performance === void 0 ? void 0 : _this_performance.mark(this.getPerformanceTag('error', markId))) || undefined;
+                var _perfMark_startTime;
+                var endTime = (_perfMark_startTime = perfMark === null || perfMark === void 0 ? void 0 : perfMark.startTime) !== null && _perfMark_startTime !== void 0 ? _perfMark_startTime : this.getTime();
+                (_this_performance1 = this.performance) === null || _this_performance1 === void 0 ? void 0 : _this_performance1.measure(this.getPerformanceTag('measure', markId), this.getPerformanceTag('start', markId), this.getPerformanceTag('error', markId));
                 var mark = this.openMarks[markId];
                 if (!mark) {
                     return;
                 }
                 if (this.onMarkError) {
-                    this.onMarkError(_object_spread_props(_object_spread({}, mark), {
+                    void this.onMarkError(_object_spread_props(_object_spread({}, mark), {
                         error: error,
-                        endTime: this.getTime()
+                        endTime: endTime
                     }));
                 }
                 delete this.openMarks[markId];

package/cjs/plugins/perf-metric/perf-metric.probe.spec.js

@@ -5,8 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 var _perfmetricfetch = require("./perf-metric.fetch");
 var perfPlugin;
 describe('PerformanceMetricPlugin', function() {
+    var onMarkOpen;
     beforeEach(function() {
-        perfPlugin = new _perfmetricfetch.PerformanceMetricPlugin({});
+        onMarkOpen = jest.fn();
+        perfPlugin = new _perfmetricfetch.PerformanceMetricPlugin({
+            onMarkOpen: onMarkOpen
+        });
     });
     it('should generate new mark ids', function() {
         expect(perfPlugin.openMark('', {})).not.toEqual(perfPlugin.openMark('', {}));
@@ -47,4 +51,10 @@ describe('PerformanceMetricPlugin', function() {
         perfPlugin.closeMarkWithError(markId, {});
         return ret;
     });
+    it('should include call the open mark callback', function() {
+        var markId = perfPlugin.openMark('my-url', {});
+        expect(onMarkOpen).toHaveBeenCalledWith(expect.objectContaining({
+            markId: markId
+        }));
+    });
 });

package/cjs/plugins/session-id/session-id.request.js

@@ -59,6 +59,7 @@ var SessionIdRequest = /*#__PURE__*/ function() {
         // Declaration done first since generateSessionId uses the logger
         this.sessionIdHeader = sessionIdHeader;
         this.requestIdActivated = activateRequestId;
+        this.sessionId = this.generateSessionId();
     }
     _create_class(SessionIdRequest, [
         {

package/cjs/plugins/timeout/timeout.fetch.js

@@ -78,6 +78,10 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function _ts_generator(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -177,7 +181,7 @@ function _ts_generator(thisArg, body) {
  * Check if a message can be cast as an {@link ImpervaCaptchaMessage}
  * @param message
  */ function isImpervaCaptchaMessage(message) {
-    return Object.prototype.hasOwnProperty.call(message, 'impervaChallenge') && Object.prototype.hasOwnProperty.call(message.impervaChallenge, 'status') && Object.prototype.hasOwnProperty.call(message.impervaChallenge, 'type') && message.impervaChallenge.type === 'captcha';
+    return !!message && Object.prototype.hasOwnProperty.call(message, 'impervaChallenge') && Object.prototype.hasOwnProperty.call(message.impervaChallenge, 'status') && Object.prototype.hasOwnProperty.call(message.impervaChallenge, 'type') && message.impervaChallenge.type === 'captcha';
 }
 var impervaCaptchaEventHandlerFactory = function(config) {
     return function(timeoutPauseCallback) {
@@ -186,8 +190,15 @@ var impervaCaptchaEventHandlerFactory = function(config) {
             if (originHostname !== location.hostname && ((config === null || config === void 0 ? void 0 : config.whiteListedHostNames) || []).indexOf(originHostname) === -1) {
                 return;
             }
-            var message = typeof event.data === 'string' ? JSON.parse(event.data) : event.data;
-            if (message && isImpervaCaptchaMessage(message)) {
+            var message = event.data;
+            if (typeof event.data === 'string') {
+                try {
+                    message = JSON.parse(event.data);
+                } catch (e) {
+                // This might not be an imperva message
+                }
+            }
+            if ((typeof message === "undefined" ? "undefined" : _type_of(message)) === 'object' && isImpervaCaptchaMessage(message)) {
                 timeoutPauseCallback(message.impervaChallenge.status === 'started' ? 'timeoutStopped' : 'timeoutStarted');
             }
         };

package/cjs/plugins/timeout/timeout.spec.js

@@ -33,6 +33,10 @@ function _async_to_generator(fn) {
         });
     };
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function _ts_generator(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -128,6 +132,7 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
+var _this = void 0;
 describe('Timeout Fetch Plugin', function() {
     it('should reject on timeout', /*#__PURE__*/ _async_to_generator(function() {
         var plugin, runner, call, callback;
@@ -327,3 +332,112 @@ describe('Timeout Fetch Plugin', function() {
         });
     }));
 });
+describe('impervaCaptchaEventHandlerFactory', function() {
+    var postMessageTemp;
+    beforeAll(function() {
+        var _global, _global1;
+        (_global = global).location || (_global.location = {
+            hostname: 'test'
+        });
+        (_global1 = global).addEventListener || (_global1.addEventListener = jest.fn().mockImplementation(function(event, handler) {
+            if (event === 'message') {
+                postMessageTemp = function(msg, origin) {
+                    var eventObject = {
+                        origin: origin || 'https://test',
+                        data: msg
+                    };
+                    if ((typeof handler === "undefined" ? "undefined" : _type_of(handler)) === 'object') {
+                        handler.handleEvent(eventObject);
+                    } else {
+                        handler(eventObject);
+                    }
+                };
+            }
+        }));
+    });
+    afterAll(function() {
+        jest.clearAllMocks();
+    });
+    it('should not throw on unexpected messages', function() {
+        var callback = jest.fn();
+        (0, _timeoutfetch.impervaCaptchaEventHandlerFactory)({
+            whiteListedHostNames: []
+        })(callback, _this);
+        postMessageTemp('pouet');
+        expect(callback).not.toHaveBeenCalled();
+        postMessageTemp(JSON.stringify({
+            impervaChallenge: {
+                type: 'incorrectType'
+            }
+        }));
+        expect(callback).not.toHaveBeenCalled();
+        postMessageTemp(JSON.stringify({
+            impervaChallenge: {
+                incorrectFormat: true
+            }
+        }));
+        expect(callback).not.toHaveBeenCalled();
+    });
+    it('should not throw on null messages', function() {
+        var callback = jest.fn();
+        (0, _timeoutfetch.impervaCaptchaEventHandlerFactory)({
+            whiteListedHostNames: []
+        })(callback, _this);
+        postMessageTemp(null);
+        expect(callback).not.toHaveBeenCalled();
+    });
+    it('should trigger a timeoutStopped if the captcha challenge has been started', function() {
+        var callback = jest.fn();
+        (0, _timeoutfetch.impervaCaptchaEventHandlerFactory)({
+            whiteListedHostNames: []
+        })(callback, _this);
+        postMessageTemp(JSON.stringify({
+            impervaChallenge: {
+                status: 'started',
+                type: 'captcha'
+            }
+        }));
+        expect(callback).toHaveBeenCalledWith('timeoutStopped');
+    });
+    it('should trigger a timeoutStarted if the captcha challenge has been finished', function() {
+        var callback = jest.fn();
+        (0, _timeoutfetch.impervaCaptchaEventHandlerFactory)({
+            whiteListedHostNames: []
+        })(callback, _this);
+        postMessageTemp({
+            impervaChallenge: {
+                status: 'ended',
+                type: 'captcha'
+            }
+        });
+        expect(callback).toHaveBeenCalledWith('timeoutStarted');
+    });
+    it('should trigger a timeoutStarted if the captcha challenge has been finished on a whitelisted domain', function() {
+        var callback = jest.fn();
+        (0, _timeoutfetch.impervaCaptchaEventHandlerFactory)({
+            whiteListedHostNames: [
+                'valid.domain'
+            ]
+        })(callback, _this);
+        postMessageTemp(JSON.stringify({
+            impervaChallenge: {
+                status: 'ended',
+                type: 'captcha'
+            }
+        }), 'http://valid.domain');
+        expect(callback).toHaveBeenCalledWith('timeoutStarted');
+    });
+    it('should ignore postMessage from non whitelisted domain', function() {
+        var callback = jest.fn();
+        (0, _timeoutfetch.impervaCaptchaEventHandlerFactory)({
+            whiteListedHostNames: []
+        })(callback, _this);
+        postMessageTemp(JSON.stringify({
+            impervaChallenge: {
+                status: 'ended',
+                type: 'captcha'
+            }
+        }), 'http://invalid.domain');
+        expect(callback).not.toHaveBeenCalled();
+    });
+});

package/cjs/utils/generic-api.js

@@ -197,7 +197,7 @@ var GenericApi = /*#__PURE__*/ function() {
    */ function request(requestOptions) {
                 var _this = this;
                 return _async_to_generator(function() {
-                    var _requestOptions_metadata, _requestOptions_metadata1, metadataHeaderAccept, headers, requestParameters, options, _tmp, url, ret;
+                    var _requestOptions_metadata, _requestOptions_metadata1, metadataHeaderAccept, headers, requestParameters, options, url, ret;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -212,30 +212,12 @@ var GenericApi = /*#__PURE__*/ function() {
                                     api: _this,
                                     headers: headers
                                 }, requestOptions);
-                                if (!_this.client.getRequestOptions) return [
-                                    3,
-                                    2
-                                ];
                                 return [
                                     4,
                                     _this.client.getRequestOptions(requestParameters)
                                 ];
                             case 1:
-                                _tmp = _state.sent();
-                                return [
-                                    3,
-                                    4
-                                ];
-                            case 2:
-                                return [
-                                    4,
-                                    _this.client.prepareOptions(requestParameters.basePath, requestParameters.method, requestParameters.queryParams || {}, requestParameters.headers)
-                                ];
-                            case 3:
-                                _tmp = _state.sent();
-                                _state.label = 4;
-                            case 4:
-                                options = _tmp;
+                                options = _state.sent();
                                 url = _this.client.prepareUrl(options.basePath, options.queryParams);
                                 ret = _this.client.processCall(url, options, _fwk.ApiTypes.DEFAULT, requestOptions.api.apiName, requestOptions.revivers, requestOptions.operationId);
                                 return [

package/cjs/utils/index.js

@@ -8,7 +8,6 @@ _export_star(require("./ie11"), exports);
 _export_star(require("./json-token"), exports);
 _export_star(require("./mime-types"), exports);
 _export_star(require("./generic-api"), exports);
-_export_star(require("./generators"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

package/esm2015/clients/api-angular-client.js

@@ -307,29 +307,6 @@ var DEFAULT_OPTIONS = {
                 })();
             }
         },
-        {
-            key: "prepareOptions",
-            value: /** @inheritdoc */ function prepareOptions(url, method, queryParams, headers, body, tokenizedOptions, metadata, api) {
-                var _this = this;
-                return _async_to_generator(function() {
-                    return _ts_generator(this, function(_state) {
-                        return [
-                            2,
-                            _this.getRequestOptions({
-                                headers: headers,
-                                method: method,
-                                basePath: url,
-                                queryParams: queryParams,
-                                body: body,
-                                metadata: metadata,
-                                tokenizedOptions: tokenizedOptions,
-                                api: api
-                            })
-                        ];
-                    });
-                })();
-            }
-        },
         {
             key: "prepareUrl",
             value: /** @inheritdoc */ function prepareUrl1(url) {

package/esm2015/clients/api-beacon-client.js

@@ -154,21 +154,6 @@ var isPromise = function(value) {
                 return Promise.resolve(opts);
             }
         },
-        {
-            key: "prepareOptions",
-            value: /** @inheritdoc */ function prepareOptions(url, method, queryParams, headers, body, tokenizedOptions, metadata, api) {
-                return this.getRequestOptions({
-                    headers: headers,
-                    method: method,
-                    basePath: url,
-                    queryParams: queryParams,
-                    body: body,
-                    metadata: metadata,
-                    tokenizedOptions: tokenizedOptions,
-                    api: api
-                });
-            }
-        },
         {
             key: "prepareUrl",
             value: /** @inheritdoc */ function prepareUrl1(url, queryParameters) {

package/esm2015/clients/api-fetch-client.js

@@ -345,29 +345,6 @@ var DEFAULT_OPTIONS = {
                 })();
             }
         },
-        {
-            key: "prepareOptions",
-            value: /** @inheritdoc */ function prepareOptions(url, method, queryParams, headers, body, tokenizedOptions, metadata, api) {
-                var _this = this;
-                return _async_to_generator(function() {
-                    return _ts_generator(this, function(_state) {
-                        return [
-                            2,
-                            _this.getRequestOptions({
-                                headers: headers,
-                                method: method,
-                                basePath: url,
-                                queryParams: queryParams,
-                                body: body,
-                                metadata: metadata,
-                                tokenizedOptions: tokenizedOptions,
-                                api: api
-                            })
-                        ];
-                    });
-                })();
-            }
-        },
         {
             key: "prepareUrl",
             value: /** @inheritdoc */ function prepareUrl1(url) {

package/esm2015/fwk/api.helpers.js

@@ -196,7 +196,7 @@ endpoint) {
     if (typeof revivers === 'function' || typeof revivers === 'undefined') {
         return revivers;
     }
-    if (response.status && revivers[response.status]) {
+    if (response.status && Object.keys(revivers).indexOf("".concat(response.status)) > -1) {
         return revivers[response.status];
     }
     if (options === null || options === void 0 ? void 0 : options.disableFallback) {

package/esm2015/fwk/core/api-client.js

@@ -2,5 +2,5 @@
  * Check if the object is an Api Client object
  * @param client object to check
  */ export function isApiClient(client) {
-    return client && !!client.options && typeof client.extractQueryParams === 'function' && typeof client.prepareOptions === 'function' && typeof client.prepareUrl === 'function' && typeof client.processFormData === 'function' && typeof client.processCall === 'function';
+    return client && !!client.options && typeof client.extractQueryParams === 'function' && typeof client.getRequestOptions === 'function' && typeof client.prepareUrl === 'function' && typeof client.processFormData === 'function' && typeof client.processCall === 'function';
 }

package/esm2015/fwk/index.js

@@ -7,5 +7,4 @@ export * from './errors';
 export * from './ignore-enum.type';
 export * from './logger';
 export * from './mocks/index';
-export * from './open-api-tools-configuration';
 export * from './Reviver';