@etsoo/react 1.5.55 → 1.5.58

package/lib/app/CommonApp.d.ts

@@ -29,7 +29,6 @@ export declare abstract class CommonApp<U extends IUser = IUser, P extends IPage
      * @param props Props
      */
     refreshToken<D = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
-    private loginFailed;
     /**
      * Try login
      * @param data Additional data

package/lib/app/CommonApp.js

@@ -127,10 +127,6 @@ export class CommonApp extends ReactApp {
         }
         return success(result, callback);
     }
-    loginFailed() {
-        this.userUnauthorized();
-        this.toLoginPage();
-    }
     /**
      * Try login
      * @param data Additional data
@@ -144,18 +140,7 @@ export class CommonApp extends ReactApp {
             return false;
         // Refresh token
         return await this.refreshToken({
-            callback: (result) => {
-                if (result === true)
-                    return;
-                const message = this.formatRefreshTokenResult(result);
-                if (message == null) {
-                    this.loginFailed();
-                    return;
-                }
-                this.notifier.alert(message, () => {
-                    this.loginFailed();
-                });
-            },
+            callback: (result) => this.doRefreshTokenResult(result),
             data,
             showLoading,
             relogin: true

package/lib/app/ReactApp.d.ts

@@ -1,4 +1,4 @@
-import { CoreApp, IActionResult, IAppSettings, ICoreApp, IUser, IUserData } from '@etsoo/appscript';
+import { CoreApp, IActionResult, IAppSettings, ICoreApp, IUser } from '@etsoo/appscript';
 import { NotificationRenderProps, NotificationReturn } from '@etsoo/notificationbase';
 import { DataTypes } from '@etsoo/shared';
 import React from 'react';
@@ -28,7 +28,7 @@ export declare function ReactAppStateDetector(props: IStateProps): React.Functio
 /**
  * Core application interface
  */
-export interface IReactApp<S extends IAppSettings, D extends IUser, P extends IPageData> extends ICoreApp<S, React.ReactNode, NotificationReactCallProps> {
+export interface IReactApp<S extends IAppSettings, D extends IUser, P extends IPageData> extends ICoreApp<D, S, React.ReactNode, NotificationReactCallProps> {
     /**
      * User state
      */
@@ -64,7 +64,7 @@ export interface IReactApp<S extends IAppSettings, D extends IUser, P extends IP
 /**
  * React application
  */
-export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends IPageData> extends CoreApp<S, React.ReactNode, NotificationReactCallProps> implements IReactApp<S, D, P> {
+export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends IPageData> extends CoreApp<D, S, React.ReactNode, NotificationReactCallProps> implements IReactApp<S, D, P> {
     private static _notifierProvider;
     /**
      * Get notifier provider
@@ -181,7 +181,7 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean, dispatch?: boolean): void;
+    userLogin(user: D, refreshToken: string, keep?: boolean, dispatch?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/app/ServiceApp.d.ts

@@ -46,7 +46,6 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param props Props
      */
     refreshToken<D = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
-    private loginFailed;
     /**
      * Service decrypt message
      * @param messageEncrypted Encrypted message

package/lib/app/ServiceApp.js

@@ -184,10 +184,6 @@ export class ServiceApp extends ReactApp {
         }
         return await success(result, callback);
     }
-    loginFailed() {
-        this.userUnauthorized();
-        this.toLoginPage();
-    }
     /**
      * Service decrypt message
      * @param messageEncrypted Encrypted message
@@ -220,21 +216,7 @@ export class ServiceApp extends ReactApp {
             return false;
         // Refresh token
         return await this.refreshToken({
-            callback: (result) => {
-                // Success
-                if (result === true)
-                    return;
-                // Clear cache
-                this.clearCacheData();
-                const message = this.formatRefreshTokenResult(result);
-                if (message == null) {
-                    this.loginFailed();
-                    return;
-                }
-                this.notifier.alert(message, () => {
-                    this.loginFailed();
-                });
-            },
+            callback: (result) => this.doRefreshTokenResult(result),
             data,
             showLoading,
             relogin: true

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.5.55",
+    "version": "1.5.58",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -49,11 +49,11 @@
         "@emotion/css": "^11.10.0",
         "@emotion/react": "^11.10.0",
         "@emotion/styled": "^11.10.0",
-        "@etsoo/appscript": "^1.2.65",
-        "@etsoo/notificationbase": "^1.1.4",
-        "@etsoo/shared": "^1.1.40",
+        "@etsoo/appscript": "^1.2.72",
+        "@etsoo/notificationbase": "^1.1.5",
+        "@etsoo/shared": "^1.1.41",
         "@mui/icons-material": "^5.8.4",
-        "@mui/material": "^5.9.2",
+        "@mui/material": "^5.9.3",
         "@types/pica": "^9.0.1",
         "@types/pulltorefreshjs": "^0.1.5",
         "@types/react": "^18.0.15",
@@ -74,16 +74,16 @@
         "react-window": "^1.8.7"
     },
     "devDependencies": {
-        "@babel/cli": "^7.18.9",
-        "@babel/core": "^7.18.9",
-        "@babel/plugin-transform-runtime": "^7.18.9",
-        "@babel/preset-env": "^7.18.9",
+        "@babel/cli": "^7.18.10",
+        "@babel/core": "^7.18.10",
+        "@babel/plugin-transform-runtime": "^7.18.10",
+        "@babel/preset-env": "^7.18.10",
         "@babel/runtime-corejs3": "^7.18.9",
         "@types/jest": "^28.1.6",
         "@types/react-test-renderer": "^18.0.0",
-        "@typescript-eslint/eslint-plugin": "^5.31.0",
-        "@typescript-eslint/parser": "^5.31.0",
-        "eslint": "^8.20.0",
+        "@typescript-eslint/eslint-plugin": "^5.32.0",
+        "@typescript-eslint/parser": "^5.32.0",
+        "eslint": "^8.21.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-react": "^7.30.1",

package/src/app/CommonApp.ts

@@ -200,11 +200,6 @@ export abstract class CommonApp<
         return success(result, callback);
     }
 
-    private loginFailed() {
-        this.userUnauthorized();
-        this.toLoginPage();
-    }
-
     /**
      * Try login
      * @param data Additional data
@@ -221,19 +216,7 @@ export abstract class CommonApp<
 
         // Refresh token
         return await this.refreshToken({
-            callback: (result) => {
-                if (result === true) return;
-
-                const message = this.formatRefreshTokenResult(result);
-                if (message == null) {
-                    this.loginFailed();
-                    return;
-                }
-
-                this.notifier.alert(message, () => {
-                    this.loginFailed();
-                });
-            },
+            callback: (result) => this.doRefreshTokenResult(result),
             data,
             showLoading,
             relogin: true

package/src/app/ReactApp.ts

@@ -6,8 +6,7 @@ import {
     IActionResult,
     IAppSettings,
     ICoreApp,
-    IUser,
-    IUserData
+    IUser
 } from '@etsoo/appscript';
 import {
     NotificationMessageType,
@@ -94,7 +93,7 @@ export interface IReactApp<
     S extends IAppSettings,
     D extends IUser,
     P extends IPageData
-> extends ICoreApp<S, React.ReactNode, NotificationReactCallProps> {
+> extends ICoreApp<D, S, React.ReactNode, NotificationReactCallProps> {
     /**
      * User state
      */
@@ -142,7 +141,7 @@ export class ReactApp<
         D extends IUser,
         P extends IPageData
     >
-    extends CoreApp<S, React.ReactNode, NotificationReactCallProps>
+    extends CoreApp<D, S, React.ReactNode, NotificationReactCallProps>
     implements IReactApp<S, D, P>
 {
     private static _notifierProvider: React.FunctionComponent<NotificationRenderProps>;
@@ -453,7 +452,7 @@ export class ReactApp<
      * @param dispatch User state dispatch
      */
     override userLogin(
-        user: IUserData,
+        user: D,
         refreshToken: string,
         keep?: boolean,
         dispatch?: boolean

package/src/app/ServiceApp.ts

@@ -271,11 +271,6 @@ export class ServiceApp<
         return await success(result, callback);
     }
 
-    private loginFailed() {
-        this.userUnauthorized();
-        this.toLoginPage();
-    }
-
     /**
      * Service decrypt message
      * @param messageEncrypted Encrypted message
@@ -320,23 +315,7 @@ export class ServiceApp<
 
         // Refresh token
         return await this.refreshToken({
-            callback: (result) => {
-                // Success
-                if (result === true) return;
-
-                // Clear cache
-                this.clearCacheData();
-
-                const message = this.formatRefreshTokenResult(result);
-                if (message == null) {
-                    this.loginFailed();
-                    return;
-                }
-
-                this.notifier.alert(message, () => {
-                    this.loginFailed();
-                });
-            },
+            callback: (result) => this.doRefreshTokenResult(result),
             data,
             showLoading,
             relogin: true