@etsoo/appscript 1.5.83 → 1.5.85

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

@@ -165,7 +165,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Get persisted fields
      */
-    protected get persistedFields(): string[];
+    protected readonly persistedFields: string[];
     /**
      * Protected constructor
      * @param settings Settings
@@ -598,7 +598,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param props Props
      * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult | [U, string]) => boolean | void | Promise<boolean>): Promise<void>;
     /**
      * Setup callback
      */

package/lib/cjs/app/CoreApp.js

@@ -133,17 +133,6 @@ class CoreApp {
     set isTryingLogin(value) {
         this._isTryingLogin = value;
     }
-    /**
-     * Get persisted fields
-     */
-    get persistedFields() {
-        return [
-            this.fields.deviceId,
-            this.fields.devicePassphrase,
-            this.fields.serversideDeviceId,
-            this.fields.keepLogin
-        ];
-    }
     /**
      * Protected constructor
      * @param settings Settings
@@ -219,6 +208,13 @@ class CoreApp {
         this.debug = debug;
         // Fields, attach with the name identifier
         this.fields = IApp_1.appFields.reduce((a, v) => ({ ...a, [v]: "smarterp-" + v + "-" + name }), {});
+        // Persisted fields
+        this.persistedFields = [
+            this.fields.deviceId,
+            this.fields.devicePassphrase,
+            this.fields.serversideDeviceId,
+            this.fields.keepLogin
+        ];
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, "");
         // Embedded
@@ -1424,10 +1420,16 @@ class CoreApp {
                     };
                 }
                 else {
+                    // Callback first
+                    if (callback && (await callback([result.data, token])) === false) {
+                        return;
+                    }
                     // User login
                     this.userLogin(result.data, token);
-                    if (callback)
-                        callback(true);
+                    // Callback after
+                    if (callback) {
+                        await callback(true);
+                    }
                     // Exit
                     return;
                 }

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

@@ -552,7 +552,7 @@ export interface IApp {
      * @param callback Callback
      * @param api API
      */
-    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult | [IUser, string]) => boolean | void): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api

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

@@ -165,7 +165,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Get persisted fields
      */
-    protected get persistedFields(): string[];
+    protected readonly persistedFields: string[];
     /**
      * Protected constructor
      * @param settings Settings
@@ -598,7 +598,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param props Props
      * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult | [U, string]) => boolean | void | Promise<boolean>): Promise<void>;
     /**
      * Setup callback
      */

package/lib/mjs/app/CoreApp.js

@@ -130,17 +130,6 @@ export class CoreApp {
     set isTryingLogin(value) {
         this._isTryingLogin = value;
     }
-    /**
-     * Get persisted fields
-     */
-    get persistedFields() {
-        return [
-            this.fields.deviceId,
-            this.fields.devicePassphrase,
-            this.fields.serversideDeviceId,
-            this.fields.keepLogin
-        ];
-    }
     /**
      * Protected constructor
      * @param settings Settings
@@ -216,6 +205,13 @@ export class CoreApp {
         this.debug = debug;
         // Fields, attach with the name identifier
         this.fields = appFields.reduce((a, v) => ({ ...a, [v]: "smarterp-" + v + "-" + name }), {});
+        // Persisted fields
+        this.persistedFields = [
+            this.fields.deviceId,
+            this.fields.devicePassphrase,
+            this.fields.serversideDeviceId,
+            this.fields.keepLogin
+        ];
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, "");
         // Embedded
@@ -1421,10 +1417,16 @@ export class CoreApp {
                     };
                 }
                 else {
+                    // Callback first
+                    if (callback && (await callback([result.data, token])) === false) {
+                        return;
+                    }
                     // User login
                     this.userLogin(result.data, token);
-                    if (callback)
-                        callback(true);
+                    // Callback after
+                    if (callback) {
+                        await callback(true);
+                    }
                     // Exit
                     return;
                 }

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

@@ -552,7 +552,7 @@ export interface IApp {
      * @param callback Callback
      * @param api API
      */
-    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult | [IUser, string]) => boolean | void): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api

package/package.json

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

package/src/app/CoreApp.ts

@@ -317,14 +317,7 @@ export abstract class CoreApp<
   /**
    * Get persisted fields
    */
-  protected get persistedFields() {
-    return [
-      this.fields.deviceId,
-      this.fields.devicePassphrase,
-      this.fields.serversideDeviceId,
-      this.fields.keepLogin
-    ];
-  }
+  protected readonly persistedFields: string[];
 
   /**
    * Protected constructor
@@ -400,6 +393,14 @@ export abstract class CoreApp<
       {} as any
     );
 
+    // Persisted fields
+    this.persistedFields = [
+      this.fields.deviceId,
+      this.fields.devicePassphrase,
+      this.fields.serversideDeviceId,
+      this.fields.keepLogin
+    ];
+
     // Device id
     this._deviceId = storage.getData(this.fields.deviceId, "");
 
@@ -1907,7 +1908,9 @@ export abstract class CoreApp<
    */
   async refreshToken(
     props?: RefreshTokenProps,
-    callback?: (result?: boolean | IActionResult) => boolean | void
+    callback?: (
+      result?: boolean | IActionResult | [U, string]
+    ) => boolean | void | Promise<boolean>
   ) {
     // Check props
     props ??= {};
@@ -1935,10 +1938,18 @@ export abstract class CoreApp<
             title: this.get("noData")
           };
         } else {
+          // Callback first
+          if (callback && (await callback([result.data, token])) === false) {
+            return;
+          }
+
           // User login
           this.userLogin(result.data, token);
 
-          if (callback) callback(true);
+          // Callback after
+          if (callback) {
+            await callback(true);
+          }
 
           // Exit
           return;

package/src/app/IApp.ts

@@ -734,7 +734,9 @@ export interface IApp {
    */
   refreshToken(
     props?: RefreshTokenProps,
-    callback?: (result?: boolean | IActionResult) => boolean | void
+    callback?: (
+      result?: boolean | IActionResult | [IUser, string]
+    ) => boolean | void
   ): Promise<void>;
 
   /**