@etsoo/appscript 1.5.85 → 1.5.86

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

@@ -594,11 +594,17 @@ 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
+     */
+    protected refreshTokenSucceed(user: U, token: string): Promise<void>;
     /**
      * Setup callback
      */

package/lib/cjs/app/CoreApp.js

@@ -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,10 @@ 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
+                    callback?.(true);
                     // Exit
                     return;
                 }
@@ -1462,6 +1456,15 @@ class CoreApp {
             });
         }
     }
+    /**
+     * Refresh token with success
+     * @param user User data
+     * @param token Refresh token
+     */
+    async refreshTokenSucceed(user, token) {
+        // User login
+        this.userLogin(user, token);
+    }
     /**
      * Setup callback
      */

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

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

@@ -594,11 +594,17 @@ 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
+     */
+    protected refreshTokenSucceed(user: U, token: string): Promise<void>;
     /**
      * Setup callback
      */

package/lib/mjs/app/CoreApp.js

@@ -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,10 @@ 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
+                    callback?.(true);
                     // Exit
                     return;
                 }
@@ -1459,6 +1453,15 @@ export class CoreApp {
             });
         }
     }
+    /**
+     * Refresh token with success
+     * @param user User data
+     * @param token Refresh token
+     */
+    async refreshTokenSucceed(user, token) {
+        // User login
+        this.userLogin(user, token);
+    }
     /**
      * Setup callback
      */

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

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

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

package/src/app/CoreApp.ts

@@ -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,11 @@ 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);
+          // Further processing
+          await this.refreshTokenSucceed(result.data, token);
 
-          // Callback after
-          if (callback) {
-            await callback(true);
-          }
+          // Callback
+          callback?.(true);
 
           // Exit
           return;
@@ -1985,6 +1976,16 @@ export abstract class CoreApp<
     }
   }
 
+  /**
+   * Refresh token with success
+   * @param user User data
+   * @param token Refresh token
+   */
+  protected async refreshTokenSucceed(user: U, token: string) {
+    // User login
+    this.userLogin(user, token);
+  }
+
   /**
    * Setup callback
    */

package/src/app/IApp.ts

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