@steroidsjs/core 2.3.0-beta.7 → 3.0.0-beta.10

package/components/JwtHttpComponent.d.ts

@@ -1,24 +1,24 @@
-import BaseHttpComponent from './HttpComponent';
-export default class JwtHttpComponent extends BaseHttpComponent {
-    refreshTokenRequest: {
-        url: string;
-        method: string;
-    };
-    refreshTokenKey: string;
-    _refreshToken: any;
-    constructor(components: any, config?: any);
-    getAxiosConfig(): Promise<{
-        withCredentials: boolean;
-        headers: any;
-    }>;
-    private setRefreshTokenInterceptor;
-    getAxiosInstance(): Promise<any>;
-    removeRefreshToken(): void;
-    setRefreshToken(value: any): void;
-    getRefreshToken(): Promise<any>;
-    onLogout(): void;
-    onLogin(params: {
-        accessToken: string;
-        refreshToken: string;
-    }): void;
-}
+import BaseHttpComponent from '@steroidsjs/core/components/HttpComponent';
+export default class JwtHttpComponent extends BaseHttpComponent {
+    refreshTokenRequest: {
+        url: string;
+        method: string;
+    };
+    refreshTokenKey: string;
+    _refreshToken: any;
+    constructor(components: any, config?: any);
+    getAxiosConfig(): Promise<{
+        withCredentials: boolean;
+        headers: any;
+    }>;
+    private setRefreshTokenInterceptor;
+    getAxiosInstance(): Promise<any>;
+    removeRefreshToken(): void;
+    setRefreshToken(value: any): void;
+    getRefreshToken(): Promise<any>;
+    onLogout(): void;
+    onLogin(params: {
+        accessToken: string;
+        refreshToken: string;
+    }): void;
+}

package/components/JwtHttpComponent.js

@@ -1,193 +1,202 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-exports.__esModule = true;
-var axios_1 = __importDefault(require("axios"));
-var auth_1 = require("../actions/auth");
-var HttpComponent_1 = __importDefault(require("./HttpComponent"));
-var JwtHttpComponent = /** @class */ (function (_super) {
-    __extends(JwtHttpComponent, _super);
-    function JwtHttpComponent(components, config) {
-        if (config === void 0) { config = {}; }
-        var _this = _super.call(this, components, config) || this;
-        _this.refreshTokenKey = 'refreshToken';
-        _this.refreshTokenKey = config.refreshTokenKey || 'refreshToken';
-        _this.refreshTokenRequest = config.refreshTokenRequest;
-        return _this;
-    }
-    JwtHttpComponent.prototype.getAxiosConfig = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var config, clientStorage, tokenValue, _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        config = _super.prototype.getAxiosConfig.call(this);
-                        if (!!this._refreshToken) return [3 /*break*/, 4];
-                        clientStorage = this._components.clientStorage;
-                        tokenValue = clientStorage.get(this.refreshTokenKey, this.clientStorageName)
-                            || clientStorage.get(this.refreshTokenKey)
-                            || null;
-                        _a = this;
-                        if (!(tokenValue instanceof Promise)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, tokenValue];
-                    case 1:
-                        _b = _c.sent();
-                        return [3 /*break*/, 3];
-                    case 2:
-                        _b = tokenValue;
-                        _c.label = 3;
-                    case 3:
-                        _a._refreshToken = _b;
-                        if (this._refreshToken) {
-                            clientStorage.set(this.refreshTokenKey, this._refreshToken, this.clientStorageName, this.clientStorageExpiresIn);
-                        }
-                        _c.label = 4;
-                    case 4: return [2 /*return*/, config];
-                }
-            });
-        });
-    };
-    JwtHttpComponent.prototype.setRefreshTokenInterceptor = function (axiosInstance) {
-        var _this = this;
-        axiosInstance.interceptors.response.use(function (config) { return config; }, function (error) { return __awaiter(_this, void 0, void 0, function () {
-            var originalRequest, store, response, accessToken;
-            var _a;
-            var _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        originalRequest = error.config;
-                        if (!(error.response.status === 401
-                            && error.config
-                            && !error.config._isRetry
-                            && originalRequest.url !== this.getUrl((_b = this.refreshTokenRequest) === null || _b === void 0 ? void 0 : _b.url))) return [3 /*break*/, 2];
-                        this.removeAccessToken();
-                        store = this._components.store;
-                        return [4 /*yield*/, this.send(this.refreshTokenRequest.method, this.refreshTokenRequest.url, (_a = {},
-                                _a[this.refreshTokenKey] = this._refreshToken,
-                                _a))];
-                    case 1:
-                        response = _d.sent();
-                        accessToken = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c[this.accessTokenKey];
-                        if (accessToken) {
-                            this.setAccessToken(accessToken);
-                            originalRequest._isRetry = true;
-                            originalRequest.headers.Authorization = 'Bearer ' + accessToken;
-                            return [2 /*return*/, axiosInstance.request(originalRequest)];
-                        }
-                        store.dispatch(auth_1.logout());
-                        _d.label = 2;
-                    case 2: throw error;
-                }
-            });
-        }); });
-    };
-    JwtHttpComponent.prototype.getAxiosInstance = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        if (!!this._axios) return [3 /*break*/, 2];
-                        _a = this;
-                        _c = (_b = axios_1["default"]).create;
-                        return [4 /*yield*/, this.getAxiosConfig()];
-                    case 1:
-                        _a._axios = _c.apply(_b, [_d.sent()]);
-                        this.setRefreshTokenInterceptor(this._axios);
-                        _d.label = 2;
-                    case 2: return [2 /*return*/, this._axios];
-                }
-            });
-        });
-    };
-    JwtHttpComponent.prototype.removeRefreshToken = function () {
-        this._refreshToken = null;
-        this.resetConfig();
-        this._components.clientStorage.remove(this.refreshTokenKey, this.clientStorageName);
-    };
-    JwtHttpComponent.prototype.setRefreshToken = function (value) {
-        this._refreshToken = value;
-        this.resetConfig();
-        this._components.clientStorage.set(this.refreshTokenKey, value, this.clientStorageName, this.clientStorageExpiresIn);
-    };
-    JwtHttpComponent.prototype.getRefreshToken = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (!(this._refreshToken === false)) return [3 /*break*/, 2];
-                        _a = this;
-                        return [4 /*yield*/, this._components.clientStorage.get(this.refreshTokenKey, this.clientStorageName)];
-                    case 1:
-                        _a._refreshToken = (_b.sent()) || null;
-                        _b.label = 2;
-                    case 2: return [2 /*return*/, this._refreshToken];
-                }
-            });
-        });
-    };
-    JwtHttpComponent.prototype.onLogout = function () {
-        this.removeAccessToken();
-        this.removeRefreshToken();
-    };
-    JwtHttpComponent.prototype.onLogin = function (params) {
-        this.setAccessToken(params.accessToken);
-        this.setRefreshToken(params.refreshToken);
-    };
-    return JwtHttpComponent;
-}(HttpComponent_1["default"]));
-exports["default"] = JwtHttpComponent;
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+var axios_1 = __importDefault(require("axios"));
+var HttpComponent_1 = __importDefault(require("@steroidsjs/core/components/HttpComponent"));
+var auth_1 = require("@steroidsjs/core/actions/auth");
+var JwtHttpComponent = /** @class */ (function (_super) {
+    __extends(JwtHttpComponent, _super);
+    function JwtHttpComponent(components, config) {
+        if (config === void 0) { config = {}; }
+        var _this = _super.call(this, components, config) || this;
+        _this.refreshTokenKey = 'refreshToken';
+        _this.refreshTokenKey = config.refreshTokenKey || 'refreshToken';
+        _this.refreshTokenRequest = config.refreshTokenRequest;
+        return _this;
+    }
+    JwtHttpComponent.prototype.getAxiosConfig = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var config, clientStorage, tokenValue, _a, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        config = _super.prototype.getAxiosConfig.call(this);
+                        if (!!this._refreshToken) return [3 /*break*/, 4];
+                        clientStorage = this._components.clientStorage;
+                        tokenValue = clientStorage.get(this.refreshTokenKey, this.clientStorageName)
+                            || clientStorage.get(this.refreshTokenKey)
+                            || null;
+                        _a = this;
+                        if (!(tokenValue instanceof Promise)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, tokenValue];
+                    case 1:
+                        _b = _c.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        _b = tokenValue;
+                        _c.label = 3;
+                    case 3:
+                        _a._refreshToken = _b;
+                        if (this._refreshToken) {
+                            clientStorage.set(this.refreshTokenKey, this._refreshToken, this.clientStorageName, this.clientStorageExpiresIn);
+                        }
+                        _c.label = 4;
+                    case 4: return [2 /*return*/, config];
+                }
+            });
+        });
+    };
+    JwtHttpComponent.prototype.setRefreshTokenInterceptor = function (axiosInstance) {
+        var _this = this;
+        axiosInstance.interceptors.response.use(function (config) { return config; }, function (error) { return __awaiter(_this, void 0, void 0, function () {
+            var originalRequest, store, response, accessToken, _a;
+            var _b;
+            var _c, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        originalRequest = error.config;
+                        if (!(error.response.status === 401
+                            && error.config
+                            && !error.config._isRetry
+                            && originalRequest.url !== this.getUrl((_c = this.refreshTokenRequest) === null || _c === void 0 ? void 0 : _c.url))) return [3 /*break*/, 5];
+                        this.removeAccessToken();
+                        store = this._components.store;
+                        _e.label = 1;
+                    case 1:
+                        _e.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.send(this.refreshTokenRequest.method, this.refreshTokenRequest.url, (_b = {},
+                                _b[this.refreshTokenKey] = this._refreshToken,
+                                _b))];
+                    case 2:
+                        response = _e.sent();
+                        accessToken = (_d = response === null || response === void 0 ? void 0 : response.data) === null || _d === void 0 ? void 0 : _d[this.accessTokenKey];
+                        if (accessToken) {
+                            this.setAccessToken(accessToken);
+                            originalRequest._isRetry = true;
+                            originalRequest.headers.Authorization = 'Bearer ' + accessToken;
+                            return [2 /*return*/, axiosInstance.request(originalRequest)];
+                        }
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _a = _e.sent();
+                        store.dispatch((0, auth_1.logout)());
+                        return [3 /*break*/, 4];
+                    case 4:
+                        store.dispatch((0, auth_1.logout)());
+                        _e.label = 5;
+                    case 5: throw error;
+                }
+            });
+        }); });
+    };
+    JwtHttpComponent.prototype.getAxiosInstance = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        if (!!this._axios) return [3 /*break*/, 2];
+                        _a = this;
+                        _c = (_b = axios_1["default"]).create;
+                        return [4 /*yield*/, this.getAxiosConfig()];
+                    case 1:
+                        _a._axios = _c.apply(_b, [_d.sent()]);
+                        this.setRefreshTokenInterceptor(this._axios);
+                        _d.label = 2;
+                    case 2: return [2 /*return*/, this._axios];
+                }
+            });
+        });
+    };
+    JwtHttpComponent.prototype.removeRefreshToken = function () {
+        this._refreshToken = null;
+        this.resetConfig();
+        this._components.clientStorage.remove(this.refreshTokenKey, this.clientStorageName);
+    };
+    JwtHttpComponent.prototype.setRefreshToken = function (value) {
+        this._refreshToken = value;
+        this.resetConfig();
+        this._components.clientStorage.set(this.refreshTokenKey, value, this.clientStorageName, this.clientStorageExpiresIn);
+    };
+    JwtHttpComponent.prototype.getRefreshToken = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!(this._refreshToken === false)) return [3 /*break*/, 2];
+                        _a = this;
+                        return [4 /*yield*/, this._components.clientStorage.get(this.refreshTokenKey, this.clientStorageName)];
+                    case 1:
+                        _a._refreshToken = (_b.sent()) || null;
+                        _b.label = 2;
+                    case 2: return [2 /*return*/, this._refreshToken];
+                }
+            });
+        });
+    };
+    JwtHttpComponent.prototype.onLogout = function () {
+        this.removeAccessToken();
+        this.removeRefreshToken();
+    };
+    JwtHttpComponent.prototype.onLogin = function (params) {
+        this.setAccessToken(params.accessToken);
+        this.setRefreshToken(params.refreshToken);
+    };
+    return JwtHttpComponent;
+}(HttpComponent_1["default"]));
+exports["default"] = JwtHttpComponent;

package/components/LocaleComponent.d.ts

@@ -1,30 +1,30 @@
-import moment from 'moment';
-import 'moment/locale/it';
-import 'moment/locale/ru';
-/**
- * Locale Component
- * Компонент для локализации приложения. Поддерживает конфигурацию языка и временной зоны
- *
- * Пример строки: `{__('{count} {count, plural, one{день} few{дня} many{дней}}', {count: 2})}`
- */
-export default class LocaleComponent {
-    backendTimeDiff: null;
-    backendTimeZone: any;
-    /**
-     * Язык приложения
-     * @example ru
-     */
-    language: string;
-    sourceLanguage: string;
-    translations: any;
-    constructor(components: any, config: any);
-    /**
-     * Получение экземпляра `moment` с учетом временной зоны бекенда
-     * @param date Дата
-     * @param format Формат
-     */
-    moment(date?: string, format?: string): moment.Moment;
-    t(message: any, params?: {}): any;
-    translate(message: any, params?: {}): any;
-    _pasteComponents(message: any, components: any): any;
-}
+import moment from 'moment';
+import 'moment/locale/it';
+import 'moment/locale/ru';
+/**
+ * Locale Component
+ * Компонент для локализации приложения. Поддерживает конфигурацию языка и временной зоны
+ *
+ * Пример строки: `{__('{count} {count, plural, one{день} few{дня} many{дней}}', {count: 2})}`
+ */
+export default class LocaleComponent {
+    backendTimeDiff: null;
+    backendTimeZone: any;
+    /**
+     * Язык приложения
+     * @example ru
+     */
+    language: string;
+    sourceLanguage: string;
+    translations: any;
+    constructor(components: any, config: any);
+    /**
+     * Получение экземпляра `moment` с учетом временной зоны бекенда
+     * @param date Дата
+     * @param format Формат
+     */
+    moment(date?: string, format?: string): moment.Moment;
+    t(message: any, params?: {}): any;
+    translate(message: any, params?: {}): any;
+    _pasteComponents(message: any, components: any): any;
+}