@etsoo/appscript 1.1.79 → 1.1.83

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

@@ -2,8 +2,9 @@ import { INotifier, NotificationAlign, NotificationCallProps, NotificationConten
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
+import { InitCallDto } from '../dto/InitCallDto';
 import { IActionResult } from '../result/IActionResult';
-import { InitCallResultData } from '../result/InitCallResult';
+import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUserData } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
@@ -26,7 +27,7 @@ export interface RefreshTokenProps<D extends {}> {
     /**
      * Callback
      */
-    callback?: (result: RefreshTokenResult) => void;
+    callback?: (result: RefreshTokenResult, successData?: string) => void;
     /**
      * Data to pass
      */
@@ -402,6 +403,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Device id field name
      */
     protected deviceIdField: string;
+    /**
+     * Init call Api URL
+     */
+    protected initCallApi: string;
     /**
      * Passphrase for encryption
      */
@@ -416,6 +421,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, name: string);
     protected setApi(api: IApi): void;
+    /**
+     * Api init call
+     * @param data Data
+     * @returns Result
+     */
+    protected apiInitCall(data: InitCallDto): Promise<InitCallResult | undefined>;
     /**
      * Init call
      * @param callback Callback

package/lib/cjs/app/CoreApp.js

@@ -39,6 +39,10 @@ class CoreApp {
          * Device id field name
          */
         this.deviceIdField = 'SmartERPDeviceId';
+        /**
+         * Init call Api URL
+         */
+        this.initCallApi = 'Auth/WebInitCall';
         /**
          * Passphrase for encryption
          */
@@ -127,6 +131,14 @@ class CoreApp {
             }
         };
     }
+    /**
+     * Api init call
+     * @param data Data
+     * @returns Result
+     */
+    async apiInitCall(data) {
+        return await this.api.put(this.initCallApi, data);
+    }
     /**
      * Init call
      * @param callback Callback
@@ -138,7 +150,7 @@ class CoreApp {
             timestamp: new Date().getTime(),
             deviceId: this.deviceId === '' ? undefined : this.deviceId
         };
-        const result = await this.api.put('Auth/WebInitCall', data);
+        const result = await this.apiInitCall(data);
         if (result == null) {
             if (callback)
                 callback(false);
@@ -569,10 +581,7 @@ class CoreApp {
         const refreshToken = shared_1.StorageUtils.getLocalData(this.headerTokenField, '');
         if (refreshToken === '')
             return null;
-        const result = this.decrypt(refreshToken);
-        if (result == undefined)
-            return null;
-        return result;
+        return refreshToken;
     }
     /**
      * Get all regions
@@ -690,7 +699,7 @@ class CoreApp {
      */
     async refreshToken(props) {
         if (props && props.callback)
-            props.callback(true);
+            props.callback(true, undefined);
         return true;
     }
     /**

package/lib/cjs/state/User.d.ts

@@ -28,6 +28,10 @@ export interface IUserData {
      */
     readonly token: string;
 }
+/**
+ * User data property keys
+ */
+export declare type UserKey = keyof IUserData;
 /**
  * User interface
  */
@@ -39,5 +43,5 @@ export interface IUser extends IUserData, IState {
     /**
      * Last update changed fields
      */
-    lastChangedFields?: string[];
+    lastChangedFields?: UserKey[];
 }

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

@@ -2,8 +2,9 @@ import { INotifier, NotificationAlign, NotificationCallProps, NotificationConten
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
+import { InitCallDto } from '../dto/InitCallDto';
 import { IActionResult } from '../result/IActionResult';
-import { InitCallResultData } from '../result/InitCallResult';
+import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUserData } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
@@ -26,7 +27,7 @@ export interface RefreshTokenProps<D extends {}> {
     /**
      * Callback
      */
-    callback?: (result: RefreshTokenResult) => void;
+    callback?: (result: RefreshTokenResult, successData?: string) => void;
     /**
      * Data to pass
      */
@@ -402,6 +403,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Device id field name
      */
     protected deviceIdField: string;
+    /**
+     * Init call Api URL
+     */
+    protected initCallApi: string;
     /**
      * Passphrase for encryption
      */
@@ -416,6 +421,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, name: string);
     protected setApi(api: IApi): void;
+    /**
+     * Api init call
+     * @param data Data
+     * @returns Result
+     */
+    protected apiInitCall(data: InitCallDto): Promise<InitCallResult | undefined>;
     /**
      * Init call
      * @param callback Callback

package/lib/mjs/app/CoreApp.js

@@ -36,6 +36,10 @@ export class CoreApp {
          * Device id field name
          */
         this.deviceIdField = 'SmartERPDeviceId';
+        /**
+         * Init call Api URL
+         */
+        this.initCallApi = 'Auth/WebInitCall';
         /**
          * Passphrase for encryption
          */
@@ -124,6 +128,14 @@ export class CoreApp {
             }
         };
     }
+    /**
+     * Api init call
+     * @param data Data
+     * @returns Result
+     */
+    async apiInitCall(data) {
+        return await this.api.put(this.initCallApi, data);
+    }
     /**
      * Init call
      * @param callback Callback
@@ -135,7 +147,7 @@ export class CoreApp {
             timestamp: new Date().getTime(),
             deviceId: this.deviceId === '' ? undefined : this.deviceId
         };
-        const result = await this.api.put('Auth/WebInitCall', data);
+        const result = await this.apiInitCall(data);
         if (result == null) {
             if (callback)
                 callback(false);
@@ -566,10 +578,7 @@ export class CoreApp {
         const refreshToken = StorageUtils.getLocalData(this.headerTokenField, '');
         if (refreshToken === '')
             return null;
-        const result = this.decrypt(refreshToken);
-        if (result == undefined)
-            return null;
-        return result;
+        return refreshToken;
     }
     /**
      * Get all regions
@@ -687,7 +696,7 @@ export class CoreApp {
      */
     async refreshToken(props) {
         if (props && props.callback)
-            props.callback(true);
+            props.callback(true, undefined);
         return true;
     }
     /**

package/lib/mjs/state/User.d.ts

@@ -28,6 +28,10 @@ export interface IUserData {
      */
     readonly token: string;
 }
+/**
+ * User data property keys
+ */
+export declare type UserKey = keyof IUserData;
 /**
  * User interface
  */
@@ -39,5 +43,5 @@ export interface IUser extends IUserData, IState {
     /**
      * Last update changed fields
      */
-    lastChangedFields?: string[];
+    lastChangedFields?: UserKey[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.79",
+    "version": "1.1.83",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/restclient": "^1.0.62",
-        "@etsoo/shared": "^1.0.76",
+        "@etsoo/shared": "^1.0.78",
         "@types/crypto-js": "^4.0.2",
         "crypto-js": "^4.1.1"
     },
@@ -67,7 +67,7 @@
         "@types/jest": "^27.0.3",
         "@typescript-eslint/eslint-plugin": "^5.7.0",
         "@typescript-eslint/parser": "^5.7.0",
-        "eslint": "^8.4.1",
+        "eslint": "^8.5.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
         "jest": "^27.4.5",

package/src/app/CoreApp.ts

@@ -61,7 +61,7 @@ export interface RefreshTokenProps<D extends {}> {
     /**
      * Callback
      */
-    callback?: (result: RefreshTokenResult) => void;
+    callback?: (result: RefreshTokenResult, successData?: string) => void;
 
     /**
      * Data to pass
@@ -557,6 +557,11 @@ export abstract class CoreApp<
      */
     protected deviceIdField: string = 'SmartERPDeviceId';
 
+    /**
+     * Init call Api URL
+     */
+    protected initCallApi: string = 'Auth/WebInitCall';
+
     /**
      * Passphrase for encryption
      */
@@ -631,6 +636,15 @@ export abstract class CoreApp<
         };
     }
 
+    /**
+     * Api init call
+     * @param data Data
+     * @returns Result
+     */
+    protected async apiInitCall(data: InitCallDto) {
+        return await this.api.put<InitCallResult>(this.initCallApi, data);
+    }
+
     /**
      * Init call
      * @param callback Callback
@@ -641,10 +655,7 @@ export abstract class CoreApp<
             timestamp: new Date().getTime(),
             deviceId: this.deviceId === '' ? undefined : this.deviceId
         };
-        const result = await this.api.put<InitCallResult>(
-            'Auth/WebInitCall',
-            data
-        );
+        const result = await this.apiInitCall(data);
         if (result == null) {
             if (callback) callback(false);
             return;
@@ -1180,9 +1191,7 @@ export abstract class CoreApp<
 
         if (refreshToken === '') return null;
 
-        const result = this.decrypt(refreshToken);
-        if (result == undefined) return null;
-        return result;
+        return refreshToken;
     }
 
     /**
@@ -1312,7 +1321,7 @@ export abstract class CoreApp<
      * @param props Props
      */
     async refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>) {
-        if (props && props.callback) props.callback(true);
+        if (props && props.callback) props.callback(true, undefined);
         return true;
     }
 

package/src/state/User.ts

@@ -35,6 +35,11 @@ export interface IUserData {
     readonly token: string;
 }
 
+/**
+ * User data property keys
+ */
+export type UserKey = keyof IUserData;
+
 /**
  * User interface
  */
@@ -47,5 +52,5 @@ export interface IUser extends IUserData, IState {
     /**
      * Last update changed fields
      */
-    lastChangedFields?: string[];
+    lastChangedFields?: UserKey[];
 }