@nextgis/ngw-connector 1.16.1 → 1.16.2

package/lib/ngw-connector.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-connector; version: 1.16.1; author: NextGIS */
+/** Bundle of @nextgis/ngw-connector; version: 1.16.2; author: NextGIS */
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -1367,6 +1367,65 @@ function template(str, data) {
     });
 }
 
+function apiRequest(opt) {
+    var params = opt.params;
+    return new CancelablePromise(function (resolve, reject) {
+        opt.connector
+            .connect()
+            .then(function (apiItems) {
+            var apiItem = apiItems && apiItems[opt.name];
+            if (apiItem) {
+                apiItem = __spreadArray([], apiItem, true);
+                var url = apiItem.shift();
+                if (apiItem.length) {
+                    var replaceParams = {};
+                    for (var fry = 0; fry < apiItem.length; fry++) {
+                        var arg = apiItem[fry];
+                        replaceParams[fry] = '{' + arg + '}';
+                        if (params[arg] === undefined) {
+                            throw new Error('`' + arg + '`' + ' url api argument is not specified');
+                        }
+                    }
+                    if (url) {
+                        url = template(url, replaceParams);
+                    }
+                }
+                // Transfer part of the parameters from `params` to the URL string
+                if (params) {
+                    var paramArray_1 = [];
+                    var paramList = params.paramList;
+                    if (Array.isArray(paramList)) {
+                        delete params.paramList;
+                        paramList.forEach(function (x) {
+                            paramArray_1.push("".concat(x[0], "=").concat(x[1]));
+                        });
+                    }
+                    for (var p in params) {
+                        if (apiItem.indexOf(p) === -1) {
+                            paramArray_1.push("".concat(p, "=").concat(params[p]));
+                        }
+                    }
+                    if (paramArray_1.length) {
+                        url = url + '?' + paramArray_1.join('&');
+                    }
+                }
+                if (url) {
+                    resolve(opt.connector.makeQuery(url, params, opt.requestOptions));
+                }
+                else {
+                    reject(new Error('request url is not set'));
+                }
+            }
+            else {
+                resolve(undefined);
+            }
+        })
+            .catch(function (er) {
+            reject(er);
+        });
+    });
+}
+
 /**
  * Thrown when ...
  */
@@ -1732,65 +1791,6 @@ var ResourcesControl = /** @class */ (function () {
     return ResourcesControl;
 }());
 
-function apiRequest(opt) {
-    var params = opt.params;
-    return new CancelablePromise(function (resolve, reject) {
-        opt.connector
-            .connect()
-            .then(function (apiItems) {
-            var apiItem = apiItems && apiItems[opt.name];
-            if (apiItem) {
-                apiItem = __spreadArray([], apiItem, true);
-                var url = apiItem.shift();
-                if (apiItem.length) {
-                    var replaceParams = {};
-                    for (var fry = 0; fry < apiItem.length; fry++) {
-                        var arg = apiItem[fry];
-                        replaceParams[fry] = '{' + arg + '}';
-                        if (params[arg] === undefined) {
-                            throw new Error('`' + arg + '`' + ' url api argument is not specified');
-                        }
-                    }
-                    if (url) {
-                        url = template(url, replaceParams);
-                    }
-                }
-                // Transfer part of the parameters from `params` to the URL string
-                if (params) {
-                    var paramArray_1 = [];
-                    var paramList = params.paramList;
-                    if (Array.isArray(paramList)) {
-                        delete params.paramList;
-                        paramList.forEach(function (x) {
-                            paramArray_1.push("".concat(x[0], "=").concat(x[1]));
-                        });
-                    }
-                    for (var p in params) {
-                        if (apiItem.indexOf(p) === -1) {
-                            paramArray_1.push("".concat(p, "=").concat(params[p]));
-                        }
-                    }
-                    if (paramArray_1.length) {
-                        url = url + '?' + paramArray_1.join('&');
-                    }
-                }
-                if (url) {
-                    resolve(opt.connector.makeQuery(url, params, opt.requestOptions));
-                }
-                else {
-                    reject(new Error('request url is not set'));
-                }
-            }
-            else {
-                resolve(undefined);
-            }
-        })
-            .catch(function (er) {
-            reject(er);
-        });
-    });
-}
-
 var ID = 0;
 var NgwConnector$1 = /** @class */ (function () {
     function NgwConnector(options) {
@@ -1861,9 +1861,9 @@ var NgwConnector$1 = /** @class */ (function () {
                 if (auth) {
                     var login = auth.login, password = auth.password;
                     if (login && password) {
-                        return _this.getUserInfo({ login: login, password: password })
+                        return _this._login({ login: login, password: password })
                             .then(function () {
-                            makeQuery();
+                            return makeQuery();
                         })
                             .catch(function (er) { return reject(er); });
                     }
@@ -1881,10 +1881,10 @@ var NgwConnector$1 = /** @class */ (function () {
      * Quick way to change NextGIS Web user.
      * @param credentials - New user credentials
      */
-    NgwConnector.prototype.login = function (credentials) {
+    NgwConnector.prototype.login = function (credentials, options) {
         this.logout();
         addConnector(this);
-        return this.getUserInfo(credentials);
+        return this._login(credentials, options);
     };
     /**
      * Disconnecting a user. Aborting all current requests
@@ -1897,29 +1897,16 @@ var NgwConnector$1 = /** @class */ (function () {
         this.emitter.emit('logout');
         this.resources.cache.clean();
     };
-    NgwConnector.prototype.getUserInfo = function (credentials) {
-        var _this = this;
+    NgwConnector.prototype.getUserInfo = function (credentials, options) {
         if (this.user && this.user.id) {
             return CancelablePromise.resolve(this.user);
         }
         if (credentials) {
             this.options.auth = credentials;
         }
-        var options = {
-            headers: this.getAuthorizationHeaders(credentials),
-            // withCredentials: true
-        };
+        var options_ = __assign({ headers: this.getAuthorizationHeaders(credentials) }, options);
         // Do not use apiRequest('auth.current_user') to avoid circular-references
-        return this.makeQuery('/api/component/auth/current_user', {}, options)
-            .then(function (data) {
-            _this.user = data;
-            _this.emitter.emit('login', data);
-            return data;
-        })
-            .catch(function (er) {
-            _this.emitter.emit('login:error', er);
-            throw er;
-        });
+        return this.makeQuery('/api/component/auth/current_user', {}, options_);
     };
     /**
      * Obtaining the required Headers for authentication of requests in the NGW.
@@ -1985,6 +1972,7 @@ var NgwConnector$1 = /** @class */ (function () {
      */
     NgwConnector.prototype.apiRequest = function (name, params_, requestOptions) {
         var _this = this;
+        var _a;
         if (params_ === void 0) { params_ = {}; }
         if (requestOptions === void 0) { requestOptions = {}; }
         var method = requestOptions.method, headers = requestOptions.headers, withCredentials = requestOptions.withCredentials, responseType = requestOptions.responseType;
@@ -1999,7 +1987,7 @@ var NgwConnector$1 = /** @class */ (function () {
                 withCredentials: withCredentials,
                 responseType: responseType,
                 baseUrl: this.options.baseUrl,
-                auth: this.options.auth,
+                userId: (_a = this.user) === null || _a === void 0 ? void 0 : _a.id,
             })));
         }
         return makeApiRequest();
@@ -2208,6 +2196,19 @@ var NgwConnector$1 = /** @class */ (function () {
         this.activeRequests.push(request);
         return request;
     };
+    NgwConnector.prototype._login = function (credentials, options) {
+        var _this = this;
+        return this.getUserInfo(credentials, options)
+            .then(function (data) {
+            _this.user = data;
+            _this.emitter.emit('login', data);
+            return data;
+        })
+            .catch(function (er) {
+            _this.emitter.emit('login:error', er);
+            throw er;
+        });
+    };
     NgwConnector.prototype._cleanActiveRequests = function (request) {
         var activeRequestIndex = this.activeRequests.indexOf(request);
         if (activeRequestIndex !== -1) {