npm - @etsoo/appscript - Versions diffs - 1.5.84 → 1.5.85 - Mend

@etsoo/appscript 1.5.84 → 1.5.85

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

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

@@ -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 CHANGED Viewed

@@ -1420,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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1417,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 CHANGED Viewed

@@ -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 CHANGED Viewed

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

package/src/app/CoreApp.ts CHANGED Viewed

@@ -1908,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 ??= {};
@@ -1936,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 CHANGED Viewed

@@ -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>;
   /**