@etsoo/appscript 1.1.76 → 1.1.77

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 (6) hide show
  1. package/lib/cjs/app/CoreApp.d.ts +5 -2
  2. package/lib/cjs/app/CoreApp.js +17 -4
  3. package/lib/mjs/app/CoreApp.d.ts +5 -2
  4. package/lib/mjs/app/CoreApp.js +17 -4
  5. package/package.json +1 -1
  6. package/src/app/CoreApp.ts +23 -5
package/lib/cjs/app/CoreApp.d.ts CHANGED
@@ -302,8 +302,9 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
302
302
  * User login
303
303
  * @param user User data
304
304
  * @param refreshToken Refresh token
305
+ * @param keep Keep login or not
305
306
  */
306
- userLogin(user: IUserData, refreshToken: string): void;
307
+ userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
307
308
  /**
308
309
  * User logout
309
310
  * @param clearToken Clear refresh token or not
@@ -405,6 +406,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
405
406
  * Passphrase for encryption
406
407
  */
407
408
  protected passphrase: string;
409
+ private cachedRefreshToken?;
408
410
  /**
409
411
  * Protected constructor
410
412
  * @param settings Settings
@@ -649,8 +651,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
649
651
  * User login
650
652
  * @param user User data
651
653
  * @param refreshToken Refresh token
654
+ * @param keep Keep login or not
652
655
  */
653
- userLogin(user: IUserData, refreshToken: string): void;
656
+ userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
654
657
  /**
655
658
  * User logout
656
659
  * @param clearToken Clear refresh token or not
package/lib/cjs/app/CoreApp.js CHANGED
@@ -252,8 +252,10 @@ class CoreApp {
252
252
  // Token countdown
253
253
  if (this.authorized)
254
254
  this.refreshCountdown(this.userData.seconds);
255
- else
255
+ else {
256
+ this.cachedRefreshToken = undefined;
256
257
  this.refreshCountdownClear();
258
+ }
257
259
  }
258
260
  /**
259
261
  * Change country or region
@@ -315,7 +317,8 @@ class CoreApp {
315
317
  * Clear cached token
316
318
  */
317
319
  clearCacheToken() {
318
- shared_1.StorageUtils.setLocalData(this.headerTokenField, null);
320
+ this.cachedRefreshToken = undefined;
321
+ shared_1.StorageUtils.setLocalData(this.headerTokenField, undefined);
319
322
  }
320
323
  /**
321
324
  * Decrypt message
@@ -560,6 +563,9 @@ class CoreApp {
560
563
  * @returns Cached token
561
564
  */
562
565
  getCacheToken() {
566
+ // Temp refresh token
567
+ if (this.cachedRefreshToken)
568
+ return this.cachedRefreshToken;
563
569
  const refreshToken = shared_1.StorageUtils.getLocalData(this.headerTokenField, '');
564
570
  if (refreshToken === '')
565
571
  return null;
@@ -764,10 +770,17 @@ class CoreApp {
764
770
  * User login
765
771
  * @param user User data
766
772
  * @param refreshToken Refresh token
773
+ * @param keep Keep login or not
767
774
  */
768
- userLogin(user, refreshToken) {
775
+ userLogin(user, refreshToken, keep) {
769
776
  this.userData = user;
770
- this.authorize(user.token, refreshToken);
777
+ if (keep) {
778
+ this.authorize(user.token, refreshToken);
779
+ }
780
+ else {
781
+ this.cachedRefreshToken = refreshToken;
782
+ this.authorize(user.token, undefined);
783
+ }
771
784
  }
772
785
  /**
773
786
  * User logout
package/lib/mjs/app/CoreApp.d.ts CHANGED
@@ -302,8 +302,9 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
302
302
  * User login
303
303
  * @param user User data
304
304
  * @param refreshToken Refresh token
305
+ * @param keep Keep login or not
305
306
  */
306
- userLogin(user: IUserData, refreshToken: string): void;
307
+ userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
307
308
  /**
308
309
  * User logout
309
310
  * @param clearToken Clear refresh token or not
@@ -405,6 +406,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
405
406
  * Passphrase for encryption
406
407
  */
407
408
  protected passphrase: string;
409
+ private cachedRefreshToken?;
408
410
  /**
409
411
  * Protected constructor
410
412
  * @param settings Settings
@@ -649,8 +651,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
649
651
  * User login
650
652
  * @param user User data
651
653
  * @param refreshToken Refresh token
654
+ * @param keep Keep login or not
652
655
  */
653
- userLogin(user: IUserData, refreshToken: string): void;
656
+ userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
654
657
  /**
655
658
  * User logout
656
659
  * @param clearToken Clear refresh token or not
package/lib/mjs/app/CoreApp.js CHANGED
@@ -249,8 +249,10 @@ export class CoreApp {
249
249
  // Token countdown
250
250
  if (this.authorized)
251
251
  this.refreshCountdown(this.userData.seconds);
252
- else
252
+ else {
253
+ this.cachedRefreshToken = undefined;
253
254
  this.refreshCountdownClear();
255
+ }
254
256
  }
255
257
  /**
256
258
  * Change country or region
@@ -312,7 +314,8 @@ export class CoreApp {
312
314
  * Clear cached token
313
315
  */
314
316
  clearCacheToken() {
315
- StorageUtils.setLocalData(this.headerTokenField, null);
317
+ this.cachedRefreshToken = undefined;
318
+ StorageUtils.setLocalData(this.headerTokenField, undefined);
316
319
  }
317
320
  /**
318
321
  * Decrypt message
@@ -557,6 +560,9 @@ export class CoreApp {
557
560
  * @returns Cached token
558
561
  */
559
562
  getCacheToken() {
563
+ // Temp refresh token
564
+ if (this.cachedRefreshToken)
565
+ return this.cachedRefreshToken;
560
566
  const refreshToken = StorageUtils.getLocalData(this.headerTokenField, '');
561
567
  if (refreshToken === '')
562
568
  return null;
@@ -761,10 +767,17 @@ export class CoreApp {
761
767
  * User login
762
768
  * @param user User data
763
769
  * @param refreshToken Refresh token
770
+ * @param keep Keep login or not
764
771
  */
765
- userLogin(user, refreshToken) {
772
+ userLogin(user, refreshToken, keep) {
766
773
  this.userData = user;
767
- this.authorize(user.token, refreshToken);
774
+ if (keep) {
775
+ this.authorize(user.token, refreshToken);
776
+ }
777
+ else {
778
+ this.cachedRefreshToken = refreshToken;
779
+ this.authorize(user.token, undefined);
780
+ }
768
781
  }
769
782
  /**
770
783
  * User logout
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/appscript",
3
- "version": "1.1.76",
3
+ "version": "1.1.77",
4
4
  "description": "Applications shared TypeScript framework",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
package/src/app/CoreApp.ts CHANGED
@@ -411,8 +411,9 @@ export interface ICoreApp<
411
411
  * User login
412
412
  * @param user User data
413
413
  * @param refreshToken Refresh token
414
+ * @param keep Keep login or not
414
415
  */
415
- userLogin(user: IUserData, refreshToken: string): void;
416
+ userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
416
417
 
417
418
  /**
418
419
  * User logout
@@ -561,6 +562,8 @@ export abstract class CoreApp<
561
562
  */
562
563
  protected passphrase: string = '***';
563
564
 
565
+ private cachedRefreshToken?: string;
566
+
564
567
  /**
565
568
  * Protected constructor
566
569
  * @param settings Settings
@@ -777,12 +780,16 @@ export abstract class CoreApp<
777
780
  if (refreshToken != null) refreshToken = this.encrypt(refreshToken);
778
781
  StorageUtils.setLocalData(this.headerTokenField, refreshToken);
779
782
  }
783
+
780
784
  // Reset tryLogin state
781
785
  this._isTryingLogin = false;
782
786
 
783
787
  // Token countdown
784
788
  if (this.authorized) this.refreshCountdown(this.userData!.seconds);
785
- else this.refreshCountdownClear();
789
+ else {
790
+ this.cachedRefreshToken = undefined;
791
+ this.refreshCountdownClear();
792
+ }
786
793
  }
787
794
 
788
795
  /**
@@ -858,7 +865,8 @@ export abstract class CoreApp<
858
865
  * Clear cached token
859
866
  */
860
867
  clearCacheToken() {
861
- StorageUtils.setLocalData(this.headerTokenField, null);
868
+ this.cachedRefreshToken = undefined;
869
+ StorageUtils.setLocalData(this.headerTokenField, undefined);
862
870
  }
863
871
 
864
872
  /**
@@ -1162,6 +1170,9 @@ export abstract class CoreApp<
1162
1170
  * @returns Cached token
1163
1171
  */
1164
1172
  getCacheToken(): string | null {
1173
+ // Temp refresh token
1174
+ if (this.cachedRefreshToken) return this.cachedRefreshToken;
1175
+
1165
1176
  const refreshToken = StorageUtils.getLocalData<string>(
1166
1177
  this.headerTokenField,
1167
1178
  ''
@@ -1391,10 +1402,17 @@ export abstract class CoreApp<
1391
1402
  * User login
1392
1403
  * @param user User data
1393
1404
  * @param refreshToken Refresh token
1405
+ * @param keep Keep login or not
1394
1406
  */
1395
- userLogin(user: IUserData, refreshToken: string) {
1407
+ userLogin(user: IUserData, refreshToken: string, keep?: boolean) {
1396
1408
  this.userData = user;
1397
- this.authorize(user.token, refreshToken);
1409
+
1410
+ if (keep) {
1411
+ this.authorize(user.token, refreshToken);
1412
+ } else {
1413
+ this.cachedRefreshToken = refreshToken;
1414
+ this.authorize(user.token, undefined);
1415
+ }
1398
1416
  }
1399
1417
 
1400
1418
  /**