@etsoo/appscript 1.2.68 → 1.2.71

package/__tests__/app/CoreApp.ts

@@ -8,7 +8,7 @@ import {
 } from '@etsoo/notificationbase';
 import { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
 import { DataTypes, DomUtils, Utils, WindowStorage } from '@etsoo/shared';
-import { BusinessUtils } from '../../src';
+import { BusinessUtils, IUser } from '../../src';
 import { AddressUtils } from '../../src/address/AddressUtils';
 import { IAppSettings } from '../../src/app/AppSettings';
 import { CoreApp } from '../../src/app/CoreApp';
@@ -49,7 +49,12 @@ class NotificationContainerTest extends NotificationContainer<
 var container = new NotificationContainerTest((update) => {});
 
 // Arrange
-class CoreAppTest extends CoreApp<IAppSettings, {}, NotificationCallProps> {
+class CoreAppTest extends CoreApp<
+    IUser,
+    IAppSettings,
+    {},
+    NotificationCallProps
+> {
     /**
      * Constructor
      * @param settings Settings

package/lib/cjs/app/CoreApp.d.ts

@@ -7,7 +7,7 @@ import { IdLabelDto } from '../dto/IdLabelDto';
 import { InitCallDto } from '../dto/InitCallDto';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
-import { IUserData } from '../state/User';
+import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
 /**
@@ -56,7 +56,7 @@ export declare type IAppFields = {
 /**
  * Core application interface
  */
-export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallProps> {
+export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends NotificationCallProps> {
     /**
      * Settings
      */
@@ -112,7 +112,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     /**
      * User data
      */
-    userData?: IUserData;
+    userData?: U;
     /**
      * Search input element
      */
@@ -139,6 +139,12 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Check the action result is about device invalid
+     * @param result Action result
+     * @returns true means device is invalid
+     */
+    checkDeviceResult(result: IActionResult): boolean;
     /**
      * Clear cache data
      */
@@ -373,7 +379,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param refreshToken Refresh token
      * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: U, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not
@@ -393,7 +399,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
 /**
  * Core application
  */
-export declare abstract class CoreApp<S extends IAppSettings, N, C extends NotificationCallProps> implements ICoreApp<S, N, C> {
+export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N, C extends NotificationCallProps> implements ICoreApp<U, S, N, C> {
     /**
      * Settings
      */
@@ -452,8 +458,8 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * User data
      */
-    get userData(): IUserData | undefined;
-    protected set userData(value: IUserData | undefined);
+    get userData(): U | undefined;
+    protected set userData(value: U | undefined);
     private ipDetectCallbacks?;
     /**
      * Search input element
@@ -533,7 +539,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param result Action result
      * @returns true means device is invalid
      */
-    protected checkDeviceResult(result: IActionResult): boolean;
+    checkDeviceResult(result: IActionResult): boolean;
     /**
      * Init call
      * @param callback Callback
@@ -816,7 +822,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param refreshToken Refresh token
      * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: U, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/cjs/app/CoreApp.js

@@ -727,10 +727,18 @@ class CoreApp {
     doRefreshTokenResult(result, initCallCallback, silent = false) {
         if (result === true)
             return;
-        if (initCallCallback &&
-            typeof result === 'object' &&
+        if (typeof result === 'object' &&
             !(result instanceof restclient_1.ApiDataError) &&
             this.checkDeviceResult(result)) {
+            initCallCallback !== null && initCallCallback !== void 0 ? initCallCallback : (initCallCallback = (result) => {
+                var _a;
+                if (!result)
+                    return;
+                this.notifier.alert((_a = this.get('environmentChanged')) !== null && _a !== void 0 ? _a : 'Environment changed', () => {
+                    // Reload the page
+                    history.go(0);
+                });
+            });
             this.initCall(initCallCallback, true);
             return;
         }

package/lib/mjs/app/CoreApp.d.ts

@@ -7,7 +7,7 @@ import { IdLabelDto } from '../dto/IdLabelDto';
 import { InitCallDto } from '../dto/InitCallDto';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
-import { IUserData } from '../state/User';
+import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
 /**
@@ -56,7 +56,7 @@ export declare type IAppFields = {
 /**
  * Core application interface
  */
-export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallProps> {
+export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends NotificationCallProps> {
     /**
      * Settings
      */
@@ -112,7 +112,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     /**
      * User data
      */
-    userData?: IUserData;
+    userData?: U;
     /**
      * Search input element
      */
@@ -139,6 +139,12 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Check the action result is about device invalid
+     * @param result Action result
+     * @returns true means device is invalid
+     */
+    checkDeviceResult(result: IActionResult): boolean;
     /**
      * Clear cache data
      */
@@ -373,7 +379,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param refreshToken Refresh token
      * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: U, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not
@@ -393,7 +399,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
 /**
  * Core application
  */
-export declare abstract class CoreApp<S extends IAppSettings, N, C extends NotificationCallProps> implements ICoreApp<S, N, C> {
+export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N, C extends NotificationCallProps> implements ICoreApp<U, S, N, C> {
     /**
      * Settings
      */
@@ -452,8 +458,8 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * User data
      */
-    get userData(): IUserData | undefined;
-    protected set userData(value: IUserData | undefined);
+    get userData(): U | undefined;
+    protected set userData(value: U | undefined);
     private ipDetectCallbacks?;
     /**
      * Search input element
@@ -533,7 +539,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param result Action result
      * @returns true means device is invalid
      */
-    protected checkDeviceResult(result: IActionResult): boolean;
+    checkDeviceResult(result: IActionResult): boolean;
     /**
      * Init call
      * @param callback Callback
@@ -816,7 +822,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param refreshToken Refresh token
      * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: U, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/mjs/app/CoreApp.js

@@ -724,10 +724,18 @@ export class CoreApp {
     doRefreshTokenResult(result, initCallCallback, silent = false) {
         if (result === true)
             return;
-        if (initCallCallback &&
-            typeof result === 'object' &&
+        if (typeof result === 'object' &&
             !(result instanceof ApiDataError) &&
             this.checkDeviceResult(result)) {
+            initCallCallback !== null && initCallCallback !== void 0 ? initCallCallback : (initCallCallback = (result) => {
+                var _a;
+                if (!result)
+                    return;
+                this.notifier.alert((_a = this.get('environmentChanged')) !== null && _a !== void 0 ? _a : 'Environment changed', () => {
+                    // Reload the page
+                    history.go(0);
+                });
+            });
             this.initCall(initCallCallback, true);
             return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.68",
+    "version": "1.2.71",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -37,7 +37,7 @@ import { InitCallDto } from '../dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
-import { IUserData } from '../state/User';
+import { IUser, IUserData } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
 
@@ -104,6 +104,7 @@ export type IAppFields = { [key in typeof appFields[number]]: string };
  * Core application interface
  */
 export interface ICoreApp<
+    U extends IUser,
     S extends IAppSettings,
     N,
     C extends NotificationCallProps
@@ -176,7 +177,7 @@ export interface ICoreApp<
     /**
      * User data
      */
-    userData?: IUserData;
+    userData?: U;
 
     /**
      * Search input element
@@ -212,6 +213,13 @@ export interface ICoreApp<
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
 
+    /**
+     * Check the action result is about device invalid
+     * @param result Action result
+     * @returns true means device is invalid
+     */
+    checkDeviceResult(result: IActionResult): boolean;
+
     /**
      * Clear cache data
      */
@@ -511,7 +519,7 @@ export interface ICoreApp<
      * @param refreshToken Refresh token
      * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: U, refreshToken: string, keep?: boolean): void;
 
     /**
      * User logout
@@ -536,10 +544,11 @@ export interface ICoreApp<
  * Core application
  */
 export abstract class CoreApp<
+    U extends IUser,
     S extends IAppSettings,
     N,
     C extends NotificationCallProps
-> implements ICoreApp<S, N, C>
+> implements ICoreApp<U, S, N, C>
 {
     /**
      * Settings
@@ -621,14 +630,14 @@ export abstract class CoreApp<
         this._ipData = value;
     }
 
-    private _userData?: IUserData;
+    private _userData?: U;
     /**
      * User data
      */
     get userData() {
         return this._userData;
     }
-    protected set userData(value: IUserData | undefined) {
+    protected set userData(value: U | undefined) {
         this._userData = value;
     }
 
@@ -901,7 +910,7 @@ export abstract class CoreApp<
      * @param result Action result
      * @returns true means device is invalid
      */
-    protected checkDeviceResult(result: IActionResult): boolean {
+    checkDeviceResult(result: IActionResult): boolean {
         if (result.type === 'NoValidData' && result.field === 'Device')
             return true;
         return false;
@@ -1470,11 +1479,22 @@ export abstract class CoreApp<
         if (result === true) return;
 
         if (
-            initCallCallback &&
             typeof result === 'object' &&
             !(result instanceof ApiDataError) &&
             this.checkDeviceResult(result)
         ) {
+            initCallCallback ??= (result) => {
+                if (!result) return;
+                this.notifier.alert(
+                    this.get<string>('environmentChanged') ??
+                        'Environment changed',
+                    () => {
+                        // Reload the page
+                        history.go(0);
+                    }
+                );
+            };
+
             this.initCall(initCallCallback, true);
             return;
         }
@@ -1852,7 +1872,7 @@ export abstract class CoreApp<
      * @param refreshToken Refresh token
      * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean) {
+    userLogin(user: U, refreshToken: string, keep?: boolean) {
         this.userData = user;
 
         // Cache the encrypted serverside device id