@tstdl/base 0.82.53 → 0.82.55

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.
@@ -20,7 +20,8 @@ export declare class AuthenticationService<AdditionalTokenPayload = Record<never
20
20
  private readonly refreshLock;
21
21
  private readonly logger;
22
22
  private readonly disposeToken;
23
- private authenticationData;
23
+ private set authenticationData(value);
24
+ private get authenticationData();
24
25
  readonly error$: Observable<Error>;
25
26
  readonly token$: Observable<TokenPayload<AdditionalTokenPayload> | undefined>;
26
27
  readonly definedToken$: Observable<TokenPayload<AdditionalTokenPayload>>;
@@ -27,6 +27,7 @@ const type_guards_js_1 = require("../../utils/type-guards.js");
27
27
  const rxjs_1 = require("rxjs");
28
28
  const tokens_js_1 = require("./tokens.js");
29
29
  const tokenStorageKey = 'AuthenticationService:token';
30
+ const authenticationDataStorageKey = 'AuthenticationService:authentication-data';
30
31
  const tokenUpdateBusName = 'AuthenticationService:tokenUpdate';
31
32
  const loggedOutBusName = 'AuthenticationService:loggedOut';
32
33
  const refreshLockResource = 'AuthenticationService:refresh';
@@ -40,7 +41,24 @@ let AuthenticationService = class AuthenticationService {
40
41
  refreshLock;
41
42
  logger;
42
43
  disposeToken;
43
- authenticationData;
44
+ set authenticationData(data) {
45
+ if ((0, type_guards_js_1.isUndefined)(data)) {
46
+ localStorage.removeItem(authenticationDataStorageKey);
47
+ }
48
+ else {
49
+ const json = JSON.stringify(data);
50
+ localStorage.setItem(authenticationDataStorageKey, json);
51
+ }
52
+ }
53
+ get authenticationData() {
54
+ try {
55
+ const data = localStorage.getItem(authenticationDataStorageKey);
56
+ return (0, type_guards_js_1.isNull)(data) ? undefined : JSON.parse(data);
57
+ }
58
+ catch {
59
+ return undefined;
60
+ }
61
+ }
44
62
  error$;
45
63
  token$;
46
64
  definedToken$;
@@ -80,8 +98,10 @@ let AuthenticationService = class AuthenticationService {
80
98
  this.tokenUpdateBus = tokenUpdateBus;
81
99
  this.loggedOutBus = loggedOutBus;
82
100
  this.refreshLock = refreshLock;
83
- this.authenticationData = initialAuthenticationData;
84
101
  this.logger = logger;
102
+ if ((0, type_guards_js_1.isUndefined)(this.authenticationData)) {
103
+ this.authenticationData = initialAuthenticationData;
104
+ }
85
105
  this.disposeToken = new cancellation_token_js_1.CancellationToken();
86
106
  this.errorSubject = new rxjs_1.Subject();
87
107
  this.tokenSubject = new rxjs_1.BehaviorSubject(undefined);
@@ -1 +1 @@
1
- {"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../source/authentication/client/authentication.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../source/authentication/client/authentication.service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tstdl/base",
3
- "version": "0.82.53",
3
+ "version": "0.82.55",
4
4
  "author": "Patrick Hein",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -8,9 +8,7 @@ function isPropertyName(value) {
8
8
  return (0, type_guards_js_1.isDefined)(value?.[exports.propertyName]);
9
9
  }
10
10
  exports.isPropertyName = isPropertyName;
11
- function propertyNameProxy() {
12
- throw new Error();
13
- }
11
+ const propertyNameProxy = Symbol('PropertyNameProxy');
14
12
  /**
15
13
  * get the path to a property
16
14
  *
@@ -27,7 +25,7 @@ function propertyNameProxy() {
27
25
  */
28
26
  function getPropertyNameProxy(options = {}) {
29
27
  const { deep = true, flat = false, prefix } = options;
30
- const proxy = new Proxy(propertyNameProxy, {
28
+ const proxy = new Proxy({ [propertyNameProxy]: prefix }, {
31
29
  get: (_target, property) => {
32
30
  if (property == exports.propertyName) {
33
31
  return prefix;
@@ -1 +1 @@
1
- {"version":3,"file":"property-name.js","sourceRoot":"","sources":["../../../source/utils/object/property-name.ts"],"names":[],"mappings":";;;AACA,sDAA2F;AAE9E,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AACtC,QAAA,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AAQnC,SAAgB,cAAc,CAAC,KAAU;IACvC,OAAO,IAAA,0BAAS,EAAE,KAAkC,EAAE,CAAC,oBAAY,CAAC,CAAC,CAAC;AACxE,CAAC;AAFD,wCAEC;AAED,SAAS,iBAAiB;IACxB,MAAM,IAAI,KAAK,EAAE,CAAC;AACpB,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,oBAAoB,CAA4B,UAA+D,EAAE;IAC/H,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEtD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAuB,iBAAoD,EAAE;QAClG,GAAG,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAO,EAAE;YAC9B,IAAI,QAAQ,IAAI,oBAAY,EAAE;gBAC5B,OAAO,MAAM,CAAC;aACf;YAED,IAAI,QAAQ,IAAI,YAAI,EAAE;gBACpB,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;aACpB;YAED,IAAA,6BAAY,EAAC,QAAQ,EAAE,sCAAsC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAEpF,MAAM,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEjD,IAAI,MAAM,EAAE;gBACV,OAAO,KAAK,CAAC;aACd;YAED,IAAI,IAAI,EAAE;gBACR,OAAO,oBAAoB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAA,4BAAW,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,QAAQ,EAAE,EAAE,CAAC,CAAC;aAC/G;YAED,OAAO,oBAAoB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAChE,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AA9BD,oDA8BC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAA4B,UAAgE,EAAE,UAA8B,EAAE;IAC1J,MAAM,IAAI,GAAI,UAAU,CAAC,oBAAoB,CAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAsC,CAA+C,EAAE,CAAC,oBAAY,CAAC,CAAC;IAC1L,OAAO,IAAA,iCAAgB,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;AACtD,CAAC;AAHD,wCAGC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAA4B,UAAoE,EAAE,UAA8B,EAAE;IAClK,MAAM,IAAI,GAAI,UAAU,CAAC,oBAAoB,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAA0C,CAA0D,EAAE,CAAC,oBAAY,CAAC,CAAC;IACrM,OAAO,IAAA,iCAAgB,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;AACtD,CAAC;AAHD,gDAGC"}
1
+ {"version":3,"file":"property-name.js","sourceRoot":"","sources":["../../../source/utils/object/property-name.ts"],"names":[],"mappings":";;;AACA,sDAA2F;AAE9E,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AACtC,QAAA,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AAQnC,SAAgB,cAAc,CAAC,KAAU;IACvC,OAAO,IAAA,0BAAS,EAAE,KAAkC,EAAE,CAAC,oBAAY,CAAC,CAAC,CAAC;AACxE,CAAC;AAFD,wCAEC;AAED,MAAM,iBAAiB,GAAkB,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAErE;;;;;;;;;;;;;GAaG;AACH,SAAgB,oBAAoB,CAA4B,UAA+D,EAAE;IAC/H,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEtD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAuB,EAAE,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAA0B,EAAE;QACrG,GAAG,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAO,EAAE;YAC9B,IAAI,QAAQ,IAAI,oBAAY,EAAE;gBAC5B,OAAO,MAAM,CAAC;aACf;YAED,IAAI,QAAQ,IAAI,YAAI,EAAE;gBACpB,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;aACpB;YAED,IAAA,6BAAY,EAAC,QAAQ,EAAE,sCAAsC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAEpF,MAAM,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEjD,IAAI,MAAM,EAAE;gBACV,OAAO,KAAK,CAAC;aACd;YAED,IAAI,IAAI,EAAE;gBACR,OAAO,oBAAoB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAA,4BAAW,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,QAAQ,EAAE,EAAE,CAAC,CAAC;aAC/G;YAED,OAAO,oBAAoB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAChE,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AA9BD,oDA8BC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAA4B,UAAgE,EAAE,UAA8B,EAAE;IAC1J,MAAM,IAAI,GAAI,UAAU,CAAC,oBAAoB,CAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAsC,CAA+C,EAAE,CAAC,oBAAY,CAAC,CAAC;IAC1L,OAAO,IAAA,iCAAgB,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;AACtD,CAAC;AAHD,wCAGC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAA4B,UAAoE,EAAE,UAA8B,EAAE;IAClK,MAAM,IAAI,GAAI,UAAU,CAAC,oBAAoB,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAA0C,CAA0D,EAAE,CAAC,oBAAY,CAAC,CAAC;IACrM,OAAO,IAAA,iCAAgB,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;AACtD,CAAC;AAHD,gDAGC"}