@etsoo/appscript 1.4.6 → 1.4.8

package/__tests__/app/CoreApp.ts

@@ -163,8 +163,8 @@ test('Tests for encrypt / decrypt', async () => {
     const passphrase = 'My password';
 
     // Act
-    const encrypted = await app.encrypt(input, passphrase);
-    const plain = await app.decrypt(encrypted, passphrase);
+    const encrypted = app.encrypt(input, passphrase);
+    const plain = app.decrypt(encrypted, passphrase);
     expect(plain).toEqual(input);
 });
 
@@ -174,8 +174,8 @@ test('Tests for encryptEnhanced / decryptEnhanced', async () => {
     const passphrase = 'My password';
 
     // Act
-    const encrypted = await app.encryptEnhanced(input, passphrase);
-    const plain = await app.decryptEnhanced(encrypted, passphrase);
+    const encrypted = app.encryptEnhanced(input, passphrase);
+    const plain = app.decryptEnhanced(encrypted, passphrase);
     expect(plain).toEqual(input);
 });
 

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

@@ -59,6 +59,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Storage
      */
     readonly storage: IStorage;
+    /**
+     * Access token
+     */
+    accessToken?: string;
     private _culture;
     /**
      * Culture, like zh-CN

package/lib/cjs/app/CoreApp.js

@@ -223,7 +223,7 @@ class CoreApp {
         const passphraseEncrypted = this.storage.getData(this.fields.devicePassphrase);
         if (passphraseEncrypted) {
             // this.name to identifier different app's secret
-            const passphraseDecrypted = await this.decrypt(passphraseEncrypted, this.name);
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
             if (passphraseDecrypted != null) {
                 // Add the device to the list
                 devices.push(d);
@@ -401,7 +401,7 @@ class CoreApp {
             return false;
         // Decrypt
         // Should be done within 120 seconds after returning from the backend
-        const passphrase = await this.decrypt(data.passphrase, timestamp.toString());
+        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
         if (passphrase == null)
             return false;
         // Update device id and cache it
@@ -413,10 +413,10 @@ class CoreApp {
         this.storage.setPersistedData(this.fields.devices, devices);
         // Current passphrase
         this.passphrase = passphrase;
-        this.storage.setData(this.fields.devicePassphrase, await this.encrypt(passphrase, this.name));
+        this.storage.setData(this.fields.devicePassphrase, this.encrypt(passphrase, this.name));
         // Previous passphrase
         if (data.previousPassphrase) {
-            const prev = await this.decrypt(data.previousPassphrase, timestamp.toString());
+            const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
             // Update
             const fields = this.initCallEncryptedUpdateFields();
             for (const field of fields) {
@@ -431,10 +431,10 @@ class CoreApp {
                 const enhanced = currentValue.indexOf('!') >= 8;
                 let newValueSource;
                 if (enhanced) {
-                    newValueSource = await this.decryptEnhanced(currentValue, prev, 12);
+                    newValueSource = this.decryptEnhanced(currentValue, prev, 12);
                 }
                 else {
-                    newValueSource = await this.decrypt(currentValue, prev);
+                    newValueSource = this.decrypt(currentValue, prev);
                 }
                 if (newValueSource == null || newValueSource === '') {
                     // Reset the field
@@ -442,8 +442,8 @@ class CoreApp {
                     continue;
                 }
                 const newValue = enhanced
-                    ? await this.encryptEnhanced(newValueSource)
-                    : await this.encrypt(newValueSource);
+                    ? this.encryptEnhanced(newValueSource)
+                    : this.encrypt(newValueSource);
                 this.storage.setData(field, newValue);
             }
         }
@@ -473,6 +473,7 @@ class CoreApp {
     authorize(token, refreshToken) {
         var _a;
         // State, when token is null, means logout
+        this.accessToken = token;
         this.authorized = token != null;
         // Token
         this.api.authorize(this.settings.authScheme, token);

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

@@ -6,6 +6,10 @@ export interface IExternalSettings {
      * Core system API endpoint
      */
     readonly endpoint: string;
+    /**
+     * Message hub endpoint
+     */
+    readonly messageHub?: string;
     /**
      * Core system app root url
      */

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

@@ -113,6 +113,10 @@ export interface IApp {
      * Application name
      */
     readonly name: string;
+    /**
+     * Access token
+     */
+    accessToken?: string;
     /**
      * IP data
      */

package/lib/cjs/erp/AuthApi.js

@@ -26,15 +26,15 @@ class AuthApi extends BaseApi_1.BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    async loginId(id, payload) {
+    loginId(id, payload) {
         const { deviceId, region } = this.app;
-        id = await this.app.encrypt(id);
+        id = this.app.encrypt(id);
         const rq = {
             id,
             deviceId,
             region
         };
-        return await this.api.get('Auth/LoginId', rq, payload);
+        return this.api.get('Auth/LoginId', rq, payload);
     }
     /**
      * Reset password

package/lib/cjs/i18n/zhHans.js

@@ -30,7 +30,7 @@ const shared_1 = require("@etsoo/shared");
  * @param localResources Local resources
  * @returns Full culture
  */
-const zhHans = (resources) => shared_1.DomUtils.en(async () => {
+const zhHans = (resources) => shared_1.DomUtils.zhHans(async () => {
     const [r1, r2] = await Promise.all([
         Promise.resolve().then(() => __importStar(require('./zh-Hans.json'))),
         new Promise((resolve) => {

package/lib/cjs/i18n/zhHant.js

@@ -30,7 +30,7 @@ const shared_1 = require("@etsoo/shared");
  * @param localResources Local resources
  * @returns Full culture
  */
-const zhHant = (resources) => shared_1.DomUtils.en(async () => {
+const zhHant = (resources) => shared_1.DomUtils.zhHant(async () => {
     const [r1, r2] = await Promise.all([
         Promise.resolve().then(() => __importStar(require('./zh-Hant.json'))),
         new Promise((resolve) => {

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

@@ -59,6 +59,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Storage
      */
     readonly storage: IStorage;
+    /**
+     * Access token
+     */
+    accessToken?: string;
     private _culture;
     /**
      * Culture, like zh-CN

package/lib/mjs/app/CoreApp.js

@@ -197,7 +197,7 @@ export class CoreApp {
         const passphraseEncrypted = this.storage.getData(this.fields.devicePassphrase);
         if (passphraseEncrypted) {
             // this.name to identifier different app's secret
-            const passphraseDecrypted = await this.decrypt(passphraseEncrypted, this.name);
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
             if (passphraseDecrypted != null) {
                 // Add the device to the list
                 devices.push(d);
@@ -375,7 +375,7 @@ export class CoreApp {
             return false;
         // Decrypt
         // Should be done within 120 seconds after returning from the backend
-        const passphrase = await this.decrypt(data.passphrase, timestamp.toString());
+        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
         if (passphrase == null)
             return false;
         // Update device id and cache it
@@ -387,10 +387,10 @@ export class CoreApp {
         this.storage.setPersistedData(this.fields.devices, devices);
         // Current passphrase
         this.passphrase = passphrase;
-        this.storage.setData(this.fields.devicePassphrase, await this.encrypt(passphrase, this.name));
+        this.storage.setData(this.fields.devicePassphrase, this.encrypt(passphrase, this.name));
         // Previous passphrase
         if (data.previousPassphrase) {
-            const prev = await this.decrypt(data.previousPassphrase, timestamp.toString());
+            const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
             // Update
             const fields = this.initCallEncryptedUpdateFields();
             for (const field of fields) {
@@ -405,10 +405,10 @@ export class CoreApp {
                 const enhanced = currentValue.indexOf('!') >= 8;
                 let newValueSource;
                 if (enhanced) {
-                    newValueSource = await this.decryptEnhanced(currentValue, prev, 12);
+                    newValueSource = this.decryptEnhanced(currentValue, prev, 12);
                 }
                 else {
-                    newValueSource = await this.decrypt(currentValue, prev);
+                    newValueSource = this.decrypt(currentValue, prev);
                 }
                 if (newValueSource == null || newValueSource === '') {
                     // Reset the field
@@ -416,8 +416,8 @@ export class CoreApp {
                     continue;
                 }
                 const newValue = enhanced
-                    ? await this.encryptEnhanced(newValueSource)
-                    : await this.encrypt(newValueSource);
+                    ? this.encryptEnhanced(newValueSource)
+                    : this.encrypt(newValueSource);
                 this.storage.setData(field, newValue);
             }
         }
@@ -447,6 +447,7 @@ export class CoreApp {
     authorize(token, refreshToken) {
         var _a;
         // State, when token is null, means logout
+        this.accessToken = token;
         this.authorized = token != null;
         // Token
         this.api.authorize(this.settings.authScheme, token);

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

@@ -6,6 +6,10 @@ export interface IExternalSettings {
      * Core system API endpoint
      */
     readonly endpoint: string;
+    /**
+     * Message hub endpoint
+     */
+    readonly messageHub?: string;
     /**
      * Core system app root url
      */

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

@@ -113,6 +113,10 @@ export interface IApp {
      * Application name
      */
     readonly name: string;
+    /**
+     * Access token
+     */
+    accessToken?: string;
     /**
      * IP data
      */

package/lib/mjs/erp/AuthApi.js

@@ -23,15 +23,15 @@ export class AuthApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    async loginId(id, payload) {
+    loginId(id, payload) {
         const { deviceId, region } = this.app;
-        id = await this.app.encrypt(id);
+        id = this.app.encrypt(id);
         const rq = {
             id,
             deviceId,
             region
         };
-        return await this.api.get('Auth/LoginId', rq, payload);
+        return this.api.get('Auth/LoginId', rq, payload);
     }
     /**
      * Reset password

package/lib/mjs/i18n/zhHans.js

@@ -4,7 +4,7 @@ import { DomUtils } from '@etsoo/shared';
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHans = (resources) => DomUtils.en(async () => {
+export const zhHans = (resources) => DomUtils.zhHans(async () => {
     const [r1, r2] = await Promise.all([
         import('./zh-Hans.json'),
         new Promise((resolve) => {

package/lib/mjs/i18n/zhHant.js

@@ -4,7 +4,7 @@ import { DomUtils } from '@etsoo/shared';
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHant = (resources) => DomUtils.en(async () => {
+export const zhHant = (resources) => DomUtils.zhHant(async () => {
     const [r1, r2] = await Promise.all([
         import('./zh-Hant.json'),
         new Promise((resolve) => {

package/package.json

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

package/src/app/CoreApp.ts

@@ -113,6 +113,11 @@ export abstract class CoreApp<
      */
     readonly storage: IStorage;
 
+    /**
+     * Access token
+     */
+    accessToken?: string;
+
     private _culture!: string;
     /**
      * Culture, like zh-CN
@@ -362,7 +367,7 @@ export abstract class CoreApp<
         );
         if (passphraseEncrypted) {
             // this.name to identifier different app's secret
-            const passphraseDecrypted = await this.decrypt(
+            const passphraseDecrypted = this.decrypt(
                 passphraseEncrypted,
                 this.name
             );
@@ -578,10 +583,7 @@ export abstract class CoreApp<
 
         // Decrypt
         // Should be done within 120 seconds after returning from the backend
-        const passphrase = await this.decrypt(
-            data.passphrase,
-            timestamp.toString()
-        );
+        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
         if (passphrase == null) return false;
 
         // Update device id and cache it
@@ -600,12 +602,12 @@ export abstract class CoreApp<
         this.passphrase = passphrase;
         this.storage.setData(
             this.fields.devicePassphrase,
-            await this.encrypt(passphrase, this.name)
+            this.encrypt(passphrase, this.name)
         );
 
         // Previous passphrase
         if (data.previousPassphrase) {
-            const prev = await this.decrypt(
+            const prev = this.decrypt(
                 data.previousPassphrase,
                 timestamp.toString()
             );
@@ -626,13 +628,13 @@ export abstract class CoreApp<
                 let newValueSource: string | undefined;
 
                 if (enhanced) {
-                    newValueSource = await this.decryptEnhanced(
+                    newValueSource = this.decryptEnhanced(
                         currentValue,
                         prev,
                         12
                     );
                 } else {
-                    newValueSource = await this.decrypt(currentValue, prev);
+                    newValueSource = this.decrypt(currentValue, prev);
                 }
 
                 if (newValueSource == null || newValueSource === '') {
@@ -642,8 +644,8 @@ export abstract class CoreApp<
                 }
 
                 const newValue = enhanced
-                    ? await this.encryptEnhanced(newValueSource)
-                    : await this.encrypt(newValueSource);
+                    ? this.encryptEnhanced(newValueSource)
+                    : this.encrypt(newValueSource);
 
                 this.storage.setData(field, newValue);
             }
@@ -681,6 +683,7 @@ export abstract class CoreApp<
      */
     authorize(token?: string, refreshToken?: string) {
         // State, when token is null, means logout
+        this.accessToken = token;
         this.authorized = token != null;
 
         // Token

package/src/app/ExternalSettings.ts

@@ -7,6 +7,11 @@ export interface IExternalSettings {
      */
     readonly endpoint: string;
 
+    /**
+     * Message hub endpoint
+     */
+    readonly messageHub?: string;
+
     /**
      * Core system app root url
      */

package/src/app/IApp.ts

@@ -156,6 +156,11 @@ export interface IApp {
      */
     readonly name: string;
 
+    /**
+     * Access token
+     */
+    accessToken?: string;
+
     /**
      * IP data
      */

package/src/erp/AuthApi.ts

@@ -35,15 +35,15 @@ export class AuthApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    async loginId(id: string, payload?: ResultPayload) {
+    loginId(id: string, payload?: ResultPayload) {
         const { deviceId, region } = this.app;
-        id = await this.app.encrypt(id);
+        id = this.app.encrypt(id);
         const rq: LoginIdRQ = {
             id,
             deviceId,
             region
         };
-        return await this.api.get('Auth/LoginId', rq, payload);
+        return this.api.get('Auth/LoginId', rq, payload);
     }
 
     /**

package/src/i18n/zhHans.ts

@@ -6,7 +6,7 @@ import { DataTypes, DomUtils } from '@etsoo/shared';
  * @returns Full culture
  */
 export const zhHans = (resources: object | (() => Promise<object>)) =>
-    DomUtils.en(async () => {
+    DomUtils.zhHans(async () => {
         const [r1, r2] = await Promise.all([
             import('./zh-Hans.json'),
             new Promise<object>((resolve) => {

package/src/i18n/zhHant.ts

@@ -6,7 +6,7 @@ import { DataTypes, DomUtils } from '@etsoo/shared';
  * @returns Full culture
  */
 export const zhHant = (resources: object | (() => Promise<object>)) =>
-    DomUtils.en(async () => {
+    DomUtils.zhHant(async () => {
         const [r1, r2] = await Promise.all([
             import('./zh-Hant.json'),
             new Promise<object>((resolve) => {