@etsoo/appscript 1.5.84 → 1.5.86

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.
@@ -594,11 +594,17 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
594
594
  */
595
595
  abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
596
596
  /**
597
- * Refresh token with result
597
+ * Refresh token
598
598
  * @param props Props
599
599
  * @param callback Callback
600
600
  */
601
601
  refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
602
+ /**
603
+ * Refresh token with success
604
+ * @param user User data
605
+ * @param token Refresh token
606
+ */
607
+ protected refreshTokenSucceed(user: U, token: string): Promise<void>;
602
608
  /**
603
609
  * Setup callback
604
610
  */
@@ -1389,7 +1389,7 @@ class CoreApp {
1389
1389
  this.notifier.hideLoading(true);
1390
1390
  }
1391
1391
  /**
1392
- * Refresh token with result
1392
+ * Refresh token
1393
1393
  * @param props Props
1394
1394
  * @param callback Callback
1395
1395
  */
@@ -1420,10 +1420,10 @@ class CoreApp {
1420
1420
  };
1421
1421
  }
1422
1422
  else {
1423
- // User login
1424
- this.userLogin(result.data, token);
1425
- if (callback)
1426
- callback(true);
1423
+ // Further processing
1424
+ await this.refreshTokenSucceed(result.data, token);
1425
+ // Callback
1426
+ callback?.(true);
1427
1427
  // Exit
1428
1428
  return;
1429
1429
  }
@@ -1456,6 +1456,15 @@ class CoreApp {
1456
1456
  });
1457
1457
  }
1458
1458
  }
1459
+ /**
1460
+ * Refresh token with success
1461
+ * @param user User data
1462
+ * @param token Refresh token
1463
+ */
1464
+ async refreshTokenSucceed(user, token) {
1465
+ // User login
1466
+ this.userLogin(user, token);
1467
+ }
1459
1468
  /**
1460
1469
  * Setup callback
1461
1470
  */
@@ -547,10 +547,9 @@ export interface IApp {
547
547
  */
548
548
  pageExit(): void;
549
549
  /**
550
- * Refresh token with result
550
+ * Refresh token
551
551
  * @param props Props
552
552
  * @param callback Callback
553
- * @param api API
554
553
  */
555
554
  refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
556
555
  /**
@@ -594,11 +594,17 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
594
594
  */
595
595
  abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
596
596
  /**
597
- * Refresh token with result
597
+ * Refresh token
598
598
  * @param props Props
599
599
  * @param callback Callback
600
600
  */
601
601
  refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
602
+ /**
603
+ * Refresh token with success
604
+ * @param user User data
605
+ * @param token Refresh token
606
+ */
607
+ protected refreshTokenSucceed(user: U, token: string): Promise<void>;
602
608
  /**
603
609
  * Setup callback
604
610
  */
@@ -1386,7 +1386,7 @@ export class CoreApp {
1386
1386
  this.notifier.hideLoading(true);
1387
1387
  }
1388
1388
  /**
1389
- * Refresh token with result
1389
+ * Refresh token
1390
1390
  * @param props Props
1391
1391
  * @param callback Callback
1392
1392
  */
@@ -1417,10 +1417,10 @@ export class CoreApp {
1417
1417
  };
1418
1418
  }
1419
1419
  else {
1420
- // User login
1421
- this.userLogin(result.data, token);
1422
- if (callback)
1423
- callback(true);
1420
+ // Further processing
1421
+ await this.refreshTokenSucceed(result.data, token);
1422
+ // Callback
1423
+ callback?.(true);
1424
1424
  // Exit
1425
1425
  return;
1426
1426
  }
@@ -1453,6 +1453,15 @@ export class CoreApp {
1453
1453
  });
1454
1454
  }
1455
1455
  }
1456
+ /**
1457
+ * Refresh token with success
1458
+ * @param user User data
1459
+ * @param token Refresh token
1460
+ */
1461
+ async refreshTokenSucceed(user, token) {
1462
+ // User login
1463
+ this.userLogin(user, token);
1464
+ }
1456
1465
  /**
1457
1466
  * Setup callback
1458
1467
  */
@@ -547,10 +547,9 @@ export interface IApp {
547
547
  */
548
548
  pageExit(): void;
549
549
  /**
550
- * Refresh token with result
550
+ * Refresh token
551
551
  * @param props Props
552
552
  * @param callback Callback
553
- * @param api API
554
553
  */
555
554
  refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
556
555
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/appscript",
3
- "version": "1.5.84",
3
+ "version": "1.5.86",
4
4
  "description": "Applications shared TypeScript framework",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
@@ -1902,7 +1902,7 @@ export abstract class CoreApp<
1902
1902
  abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
1903
1903
 
1904
1904
  /**
1905
- * Refresh token with result
1905
+ * Refresh token
1906
1906
  * @param props Props
1907
1907
  * @param callback Callback
1908
1908
  */
@@ -1936,10 +1936,11 @@ export abstract class CoreApp<
1936
1936
  title: this.get("noData")
1937
1937
  };
1938
1938
  } else {
1939
- // User login
1940
- this.userLogin(result.data, token);
1939
+ // Further processing
1940
+ await this.refreshTokenSucceed(result.data, token);
1941
1941
 
1942
- if (callback) callback(true);
1942
+ // Callback
1943
+ callback?.(true);
1943
1944
 
1944
1945
  // Exit
1945
1946
  return;
@@ -1975,6 +1976,16 @@ export abstract class CoreApp<
1975
1976
  }
1976
1977
  }
1977
1978
 
1979
+ /**
1980
+ * Refresh token with success
1981
+ * @param user User data
1982
+ * @param token Refresh token
1983
+ */
1984
+ protected async refreshTokenSucceed(user: U, token: string) {
1985
+ // User login
1986
+ this.userLogin(user, token);
1987
+ }
1988
+
1978
1989
  /**
1979
1990
  * Setup callback
1980
1991
  */
package/src/app/IApp.ts CHANGED
@@ -727,10 +727,9 @@ export interface IApp {
727
727
  pageExit(): void;
728
728
 
729
729
  /**
730
- * Refresh token with result
730
+ * Refresh token
731
731
  * @param props Props
732
732
  * @param callback Callback
733
- * @param api API
734
733
  */
735
734
  refreshToken(
736
735
  props?: RefreshTokenProps,