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

@etsoo/appscript 1.5.85 → 1.5.87

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

@@ -594,11 +594,18 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
     /**
-     * Refresh token with result
+     * Refresh token
      * @param props Props
      * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult | [U, string]) => boolean | void | Promise<boolean>): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    /**
+     * Refresh token with success
+     * @param user User data
+     * @param token Refresh token
+     * @param callback Callback
+     */
+    protected refreshTokenSucceed(user: U, token: string, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */

package/lib/cjs/app/CoreApp.js CHANGED Viewed

@@ -1389,7 +1389,7 @@ class CoreApp {
         this.notifier.hideLoading(true);
     }
     /**
-     * Refresh token with result
+     * Refresh token
      * @param props Props
      * @param callback Callback
      */
@@ -1420,16 +1420,8 @@ class CoreApp {
                     };
                 }
                 else {
-                    // Callback first
-                    if (callback && (await callback([result.data, token])) === false) {
-                        return;
-                    }
-                    // User login
-                    this.userLogin(result.data, token);
-                    // Callback after
-                    if (callback) {
-                        await callback(true);
-                    }
+                    // Further processing
+                    await this.refreshTokenSucceed(result.data, token, callback);
                     // Exit
                     return;
                 }
@@ -1462,6 +1454,18 @@ class CoreApp {
             });
         }
     }
+    /**
+     * Refresh token with success
+     * @param user User data
+     * @param token Refresh token
+     * @param callback Callback
+     */
+    async refreshTokenSucceed(user, token, callback) {
+        // User login
+        this.userLogin(user, token);
+        // Callback
+        callback?.(true);
+    }
     /**
      * Setup callback
      */

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

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

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

@@ -594,11 +594,18 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
     /**
-     * Refresh token with result
+     * Refresh token
      * @param props Props
      * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult | [U, string]) => boolean | void | Promise<boolean>): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    /**
+     * Refresh token with success
+     * @param user User data
+     * @param token Refresh token
+     * @param callback Callback
+     */
+    protected refreshTokenSucceed(user: U, token: string, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */

package/lib/mjs/app/CoreApp.js CHANGED Viewed

@@ -1386,7 +1386,7 @@ export class CoreApp {
         this.notifier.hideLoading(true);
     }
     /**
-     * Refresh token with result
+     * Refresh token
      * @param props Props
      * @param callback Callback
      */
@@ -1417,16 +1417,8 @@ export class CoreApp {
                     };
                 }
                 else {
-                    // Callback first
-                    if (callback && (await callback([result.data, token])) === false) {
-                        return;
-                    }
-                    // User login
-                    this.userLogin(result.data, token);
-                    // Callback after
-                    if (callback) {
-                        await callback(true);
-                    }
+                    // Further processing
+                    await this.refreshTokenSucceed(result.data, token, callback);
                     // Exit
                     return;
                 }
@@ -1459,6 +1451,18 @@ export class CoreApp {
             });
         }
     }
+    /**
+     * Refresh token with success
+     * @param user User data
+     * @param token Refresh token
+     * @param callback Callback
+     */
+    async refreshTokenSucceed(user, token, callback) {
+        // User login
+        this.userLogin(user, token);
+        // Callback
+        callback?.(true);
+    }
     /**
      * Setup callback
      */

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

@@ -547,12 +547,11 @@ export interface IApp {
      */
     pageExit(): void;
     /**
-     * Refresh token with result
+     * Refresh token
      * @param props Props
      * @param callback Callback
-     * @param api API
      */
-    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult | [IUser, string]) => boolean | void): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => 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.85",
+  "version": "1.5.87",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -71,6 +71,6 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.3"
   }
 }

package/src/app/CoreApp.ts CHANGED Viewed

@@ -1902,15 +1902,13 @@ export abstract class CoreApp<
   abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
   /**
-   * Refresh token with result
+   * Refresh token
    * @param props Props
    * @param callback Callback
    */
   async refreshToken(
     props?: RefreshTokenProps,
-    callback?: (
-      result?: boolean | IActionResult | [U, string]
-    ) => boolean | void | Promise<boolean>
+    callback?: (result?: boolean | IActionResult) => boolean | void
   ) {
     // Check props
     props ??= {};
@@ -1938,18 +1936,8 @@ 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);
-          // Callback after
-          if (callback) {
-            await callback(true);
-          }
+          // Further processing
+          await this.refreshTokenSucceed(result.data, token, callback);
           // Exit
           return;
@@ -1985,6 +1973,24 @@ export abstract class CoreApp<
     }
   }
+  /**
+   * Refresh token with success
+   * @param user User data
+   * @param token Refresh token
+   * @param callback Callback
+   */
+  protected async refreshTokenSucceed(
+    user: U,
+    token: string,
+    callback?: (result?: boolean | IActionResult) => boolean | void
+  ) {
+    // User login
+    this.userLogin(user, token);
+    // Callback
+    callback?.(true);
+  }
   /**
    * Setup callback
    */

package/src/app/IApp.ts CHANGED Viewed

@@ -727,16 +727,13 @@ export interface IApp {
   pageExit(): void;
   /**
-   * Refresh token with result
+   * Refresh token
    * @param props Props
    * @param callback Callback
-   * @param api API
    */
   refreshToken(
     props?: RefreshTokenProps,
-    callback?: (
-      result?: boolean | IActionResult | [IUser, string]
-    ) => boolean | void
+    callback?: (result?: boolean | IActionResult) => boolean | void
   ): Promise<void>;
   /**