@etsoo/appscript 1.1.80 → 1.1.84

package/__tests__/app/CoreApp.ts

@@ -129,6 +129,18 @@ test('Tests for encrypt / decrypt', () => {
     expect(plain).toEqual(input);
 });
 
+test('Tests for encryptEnhanced / decryptEnhanced', () => {
+    // Arrange
+    const input = 'Hello, world!';
+    const passphrase = 'My password';
+
+    // Act
+    const encrypted = app.encryptEnhanced(input, passphrase);
+    console.log(encrypted);
+    const plain = app.decryptEnhanced(encrypted, passphrase);
+    expect(plain).toEqual(input);
+});
+
 test('Tests for initCallUpdateLocal', () => {
     // Act
     const passphrase = app.initCallUpdateLocal(

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

@@ -2,8 +2,10 @@ import { INotifier, NotificationAlign, NotificationCallProps, NotificationConten
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
+import { IdLabelDto } from '../dto/IdLabelDto';
+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 +28,7 @@ export interface RefreshTokenProps<D extends {}> {
     /**
      * Callback
      */
-    callback?: (result: RefreshTokenResult) => void;
+    callback?: (result: RefreshTokenResult, successData?: string) => void;
     /**
      * Data to pass
      */
@@ -277,6 +279,13 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param apiUrl Signout API URL
      */
     signout(apiUrl?: string): Promise<void>;
+    /**
+     * Get organization list
+     * @param items Max items
+     * @param serviceId Service id
+     * @returns Result
+     */
+    orgList(items?: number, serviceId?: number): Promise<IdLabelDto[] | undefined>;
     /**
      * Switch organization
      * @param apiOrOrg API URL or organization id
@@ -402,6 +411,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 +429,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
@@ -626,11 +645,18 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param apiUrl Signout API URL
      */
     signout(apiUrl?: string): Promise<void>;
+    /**
+     * Get organization list
+     * @param items Max items
+     * @param serviceId Service id
+     * @returns Result
+     */
+    orgList(items?: number, serviceId?: number): Promise<IdLabelDto<number>[] | undefined>;
     /**
      * Switch organization
-     * @param apiOrOrg API URL or organization id
+     * @param id Organization id
      */
-    switchOrg(apiOrOrg: string | number): Promise<boolean | undefined>;
+    switchOrg(id: number): Promise<boolean | undefined>;
     /**
      * Go to the login page
      */

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;
     }
     /**
@@ -714,14 +723,24 @@ class CoreApp {
         // Go to login page
         this.toLoginPage();
     }
+    /**
+     * Get organization list
+     * @param items Max items
+     * @param serviceId Service id
+     * @returns Result
+     */
+    async orgList(items, serviceId) {
+        return await this.api.post('Organization/List', {
+            items,
+            serviceId
+        }, { defaultValue: [], showLoading: false });
+    }
     /**
      * Switch organization
-     * @param apiOrOrg API URL or organization id
+     * @param id Organization id
      */
-    async switchOrg(apiOrOrg) {
-        const api = typeof apiOrOrg === 'number'
-            ? `Organization/Switch/${apiOrOrg}`
-            : apiOrOrg;
+    async switchOrg(id) {
+        const api = `Organization/Switch/${id}`;
         const result = await this.api.put(api);
         if (result)
             return await this.refreshToken();

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

@@ -2,8 +2,10 @@ import { INotifier, NotificationAlign, NotificationCallProps, NotificationConten
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
+import { IdLabelDto } from '../dto/IdLabelDto';
+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 +28,7 @@ export interface RefreshTokenProps<D extends {}> {
     /**
      * Callback
      */
-    callback?: (result: RefreshTokenResult) => void;
+    callback?: (result: RefreshTokenResult, successData?: string) => void;
     /**
      * Data to pass
      */
@@ -277,6 +279,13 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param apiUrl Signout API URL
      */
     signout(apiUrl?: string): Promise<void>;
+    /**
+     * Get organization list
+     * @param items Max items
+     * @param serviceId Service id
+     * @returns Result
+     */
+    orgList(items?: number, serviceId?: number): Promise<IdLabelDto[] | undefined>;
     /**
      * Switch organization
      * @param apiOrOrg API URL or organization id
@@ -402,6 +411,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 +429,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
@@ -626,11 +645,18 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param apiUrl Signout API URL
      */
     signout(apiUrl?: string): Promise<void>;
+    /**
+     * Get organization list
+     * @param items Max items
+     * @param serviceId Service id
+     * @returns Result
+     */
+    orgList(items?: number, serviceId?: number): Promise<IdLabelDto<number>[] | undefined>;
     /**
      * Switch organization
-     * @param apiOrOrg API URL or organization id
+     * @param id Organization id
      */
-    switchOrg(apiOrOrg: string | number): Promise<boolean | undefined>;
+    switchOrg(id: number): Promise<boolean | undefined>;
     /**
      * Go to the login page
      */

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;
     }
     /**
@@ -711,14 +720,24 @@ export class CoreApp {
         // Go to login page
         this.toLoginPage();
     }
+    /**
+     * Get organization list
+     * @param items Max items
+     * @param serviceId Service id
+     * @returns Result
+     */
+    async orgList(items, serviceId) {
+        return await this.api.post('Organization/List', {
+            items,
+            serviceId
+        }, { defaultValue: [], showLoading: false });
+    }
     /**
      * Switch organization
-     * @param apiOrOrg API URL or organization id
+     * @param id Organization id
      */
-    async switchOrg(apiOrOrg) {
-        const api = typeof apiOrOrg === 'number'
-            ? `Organization/Switch/${apiOrOrg}`
-            : apiOrOrg;
+    async switchOrg(id) {
+        const api = `Organization/Switch/${id}`;
         const result = await this.api.put(api);
         if (result)
             return await this.refreshToken();

package/package.json

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

package/src/app/CoreApp.ts

@@ -28,6 +28,7 @@ import {
 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
+import { IdLabelDto } from '../dto/IdLabelDto';
 import { InitCallDto } from '../dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
 import { IActionResult } from '../result/IActionResult';
@@ -61,7 +62,7 @@ export interface RefreshTokenProps<D extends {}> {
     /**
      * Callback
      */
-    callback?: (result: RefreshTokenResult) => void;
+    callback?: (result: RefreshTokenResult, successData?: string) => void;
 
     /**
      * Data to pass
@@ -382,6 +383,17 @@ export interface ICoreApp<
      */
     signout(apiUrl?: string): Promise<void>;
 
+    /**
+     * Get organization list
+     * @param items Max items
+     * @param serviceId Service id
+     * @returns Result
+     */
+    orgList(
+        items?: number,
+        serviceId?: number
+    ): Promise<IdLabelDto[] | undefined>;
+
     /**
      * Switch organization
      * @param apiOrOrg API URL or organization id
@@ -557,6 +569,11 @@ export abstract class CoreApp<
      */
     protected deviceIdField: string = 'SmartERPDeviceId';
 
+    /**
+     * Init call Api URL
+     */
+    protected initCallApi: string = 'Auth/WebInitCall';
+
     /**
      * Passphrase for encryption
      */
@@ -631,6 +648,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 +667,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 +1203,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 +1333,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;
     }
 
@@ -1341,15 +1362,29 @@ export abstract class CoreApp<
         this.toLoginPage();
     }
 
+    /**
+     * Get organization list
+     * @param items Max items
+     * @param serviceId Service id
+     * @returns Result
+     */
+    async orgList(items?: number, serviceId?: number) {
+        return await this.api.post<IdLabelDto[]>(
+            'Organization/List',
+            {
+                items,
+                serviceId
+            },
+            { defaultValue: [], showLoading: false }
+        );
+    }
+
     /**
      * Switch organization
-     * @param apiOrOrg API URL or organization id
+     * @param id Organization id
      */
-    async switchOrg(apiOrOrg: string | number) {
-        const api =
-            typeof apiOrOrg === 'number'
-                ? `Organization/Switch/${apiOrOrg}`
-                : apiOrOrg;
+    async switchOrg(id: number) {
+        const api = `Organization/Switch/${id}`;
         const result = await this.api.put<boolean>(api);
         if (result) return await this.refreshToken();
         return result;