@steroidsjs/core 2.3.0-beta.2 → 2.3.0-beta.4

package/actions/auth.d.ts

@@ -4,7 +4,7 @@ export declare const AUTH_SET_DATA = "AUTH_SET_DATA";
 export declare const AUTH_ADD_SOCIAL = "AUTH_ADD_SOCIAL";
 export declare const init: (skipInitialized?: boolean) => (dispatch: any, getState: any) => any;
 export declare const reInit: () => (dispatch: any, getState: any) => any;
-export declare const login: (token: any, redirectPageId?: string | boolean) => (dispatch: any, getState: any, { http }: {
+export declare const login: (token: any, redirectPageId?: string | boolean, params?: any) => (dispatch: any, getState: any, { http }: {
     http: any;
 }) => any;
 export declare const addSocial: (social: any) => {

package/actions/auth.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 exports.__esModule = true;
 exports.logout = exports.setData = exports.setUser = exports.addSocial = exports.login = exports.reInit = exports.init = exports.AUTH_ADD_SOCIAL = exports.AUTH_SET_DATA = exports.AUTH_INIT_USER = exports.AUTH_INIT = void 0;
 var router_1 = require("./router");
@@ -23,11 +34,11 @@ var init = function (skipInitialized) {
 exports.init = init;
 var reInit = function () { return exports.init(); };
 exports.reInit = reInit;
-var login = function (token, redirectPageId) {
+var login = function (token, redirectPageId, params) {
     if (redirectPageId === void 0) { redirectPageId = 'root'; }
     return function (dispatch, getState, _a) {
         var http = _a.http;
-        http.setAccessToken(token);
+        http.onLogin(__assign({ accessToken: token }, params));
         return dispatch({
             type: exports.AUTH_INIT,
             redirectPageId: redirectPageId || null

package/components/HttpComponent.d.ts

@@ -36,6 +36,9 @@ export default class HttpComponent {
     getAccessToken(): Promise<any>;
     resetConfig(): void;
     onLogout(): void;
+    onLogin(params: {
+        accessToken: string;
+    }): void;
     getAxiosInstance(): Promise<any>;
     getUrl(method: any): any;
     get(url: any, params?: {}, options?: IHttpRequestOptions): any;

package/components/HttpComponent.js

@@ -176,6 +176,9 @@ var HttpComponent = /** @class */ (function () {
     HttpComponent.prototype.onLogout = function () {
         this.removeAccessToken();
     };
+    HttpComponent.prototype.onLogin = function (params) {
+        this.setAccessToken(params.accessToken);
+    };
     HttpComponent.prototype.getAxiosInstance = function () {
         return __awaiter(this, void 0, void 0, function () {
             var _a, _b, _c;

package/components/JwtHttpComponent.d.ts

@@ -1,4 +1,4 @@
-import BaseHttpComponent from '@steroidsjs/core/components/HttpComponent';
+import BaseHttpComponent from './HttpComponent';
 export default class JwtHttpComponent extends BaseHttpComponent {
     refreshTokenRequest: {
         url: string;
@@ -7,11 +7,18 @@ export default class JwtHttpComponent extends BaseHttpComponent {
     refreshTokenKey: string;
     _refreshToken: any;
     constructor(components: any, config?: any);
-    getAxiosConfig(): Promise<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

@@ -55,10 +55,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 var axios_1 = __importDefault(require("axios"));
-// @ts-ignore
-var HttpComponent_1 = __importDefault(require("@steroidsjs/core/components/HttpComponent"));
-// @ts-ignore
-var auth_1 = require("@steroidsjs/core/actions/auth");
+var auth_1 = require("../actions/auth");
+var HttpComponent_1 = __importDefault(require("./HttpComponent"));
 var JwtHttpComponent = /** @class */ (function (_super) {
     __extends(JwtHttpComponent, _super);
     function JwtHttpComponent(components, config) {
@@ -112,6 +110,7 @@ var JwtHttpComponent = /** @class */ (function (_super) {
                     case 0:
                         originalRequest = error.config;
                         if (!(error.response.status === 401 && error.config && !error.config._isRetry)) 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,
@@ -120,14 +119,12 @@ var JwtHttpComponent = /** @class */ (function (_super) {
                         response = _c.sent();
                         accessToken = (_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b[this.accessTokenKey];
                         if (accessToken) {
-                            store.dispatch(auth_1.login(accessToken));
+                            this.setAccessToken(accessToken);
                             originalRequest._isRetry = true;
                             originalRequest.headers.Authorization = 'Bearer ' + accessToken;
                             return [2 /*return*/, axiosInstance.request(originalRequest)];
                         }
-                        else {
-                            store.dispatch(auth_1.logout());
-                        }
+                        store.dispatch(auth_1.logout());
                         _c.label = 2;
                     case 2: throw error;
                 }
@@ -141,40 +138,27 @@ var JwtHttpComponent = /** @class */ (function (_super) {
                 switch (_d.label) {
                     case 0:
                         if (!!this._axios) return [3 /*break*/, 2];
-                        // @ts-ignore
                         _a = this;
                         _c = (_b = axios_1["default"]).create;
                         return [4 /*yield*/, this.getAxiosConfig()];
                     case 1:
-                        // @ts-ignore
                         _a._axios = _c.apply(_b, [_d.sent()]);
-                        // @ts-ignore
                         this.setRefreshTokenInterceptor(this._axios);
                         _d.label = 2;
-                    case 2: 
-                    // @ts-ignore
-                    return [2 /*return*/, this._axios];
+                    case 2: return [2 /*return*/, this._axios];
                 }
             });
         });
     };
     JwtHttpComponent.prototype.removeRefreshToken = function () {
         this._refreshToken = null;
-        // @ts-ignore
         this.resetConfig();
-        // @ts-ignore
-        this._components.clientStorage.remove(this.refreshTokenKey, 
-        // @ts-ignore
-        this._components.clientStorage.STORAGE_COOKIE);
+        this._components.clientStorage.remove(this.refreshTokenKey, this._components.clientStorage.STORAGE_COOKIE);
     };
     JwtHttpComponent.prototype.setRefreshToken = function (value) {
         this._refreshToken = value;
-        // @ts-ignore
         this.resetConfig();
-        // @ts-ignore
-        this._components.clientStorage.set(this.refreshTokenKey, value, 
-        // @ts-ignore
-        this._components.clientStorage.STORAGE_COOKIE, 180);
+        this._components.clientStorage.set(this.refreshTokenKey, value, this._components.clientStorage.STORAGE_COOKIE, 180);
     };
     JwtHttpComponent.prototype.getRefreshToken = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -183,11 +167,9 @@ var JwtHttpComponent = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         if (!(this._refreshToken === false)) return [3 /*break*/, 2];
-                        // @ts-ignore
                         _a = this;
                         return [4 /*yield*/, this._components.clientStorage.get(this.refreshTokenKey)];
                     case 1:
-                        // @ts-ignore
                         _a._refreshToken = (_b.sent()) || null;
                         _b.label = 2;
                     case 2: return [2 /*return*/, this._refreshToken];
@@ -196,10 +178,13 @@ var JwtHttpComponent = /** @class */ (function (_super) {
         });
     };
     JwtHttpComponent.prototype.onLogout = function () {
-        // @ts-ignore
         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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/core",
-  "version": "2.3.0-beta.2",
+  "version": "2.3.0-beta.4",
   "description": "",
   "author": "Vladimir Kozhin <hello@kozhindev.com>",
   "repository": {
@@ -40,10 +40,10 @@
     "path-to-regexp": "^1.7.0",
     "qs": "^6.9.4",
     "query-string": "^6.14.0",
-    "react": "^18.2.0",
+    "react": "18.1.0",
     "react-click-outside": "^3.0.1",
     "react-day-picker": "^8.2.1",
-    "react-dom": "^18.2.0",
+    "react-dom": "18.1.0",
     "react-grid-gallery": "^0.4.8",
     "react-helmet": "^6.1.0",
     "react-image-crop": "^9.0.2",
@@ -62,6 +62,7 @@
     "@babel/preset-env": "^7.13.15",
     "@babel/preset-react": "^7.13.13",
     "@babel/preset-typescript": "^7.13.0",
+    "@steroidsjs/eslint-config": "^2.0.1",
     "@types/enzyme": "^3.10.8",
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/jest": "^26.0.22",