bruce-models 6.4.8 → 6.4.9

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 (13) hide show
  1. package/dist/bruce-models.es5.js +85 -40
  2. package/dist/bruce-models.es5.js.map +1 -1
  3. package/dist/bruce-models.umd.js +85 -40
  4. package/dist/bruce-models.umd.js.map +1 -1
  5. package/dist/lib/account/account.js +29 -15
  6. package/dist/lib/account/account.js.map +1 -1
  7. package/dist/lib/bruce-models.js +1 -1
  8. package/dist/lib/user/user.js +55 -24
  9. package/dist/lib/user/user.js.map +1 -1
  10. package/dist/types/account/account.d.ts +3 -2
  11. package/dist/types/bruce-models.d.ts +1 -1
  12. package/dist/types/user/user.d.ts +8 -5
  13. package/package.json +1 -1
package/dist/lib/account/account.js CHANGED
@@ -51,7 +51,8 @@ var Account;
51
51
  if (!api) {
52
52
  api = environment_1.ENVIRONMENT.Api().GetGuardianApi();
53
53
  }
54
- const cache = api.GetCacheItem(GetCacheKey(id), reqParams);
54
+ const cacheKey = GetCacheKey(api.GetSessionId(), id);
55
+ const cache = api.GetCacheItem(cacheKey, reqParams);
55
56
  if (cache === null || cache === void 0 ? void 0 : cache.found) {
56
57
  return cache.data;
57
58
  }
@@ -75,7 +76,7 @@ var Account;
75
76
  }
76
77
  }));
77
78
  api.SetCacheItem({
78
- key: GetCacheKey(id),
79
+ key: cacheKey,
79
80
  value: prom,
80
81
  req: reqParams
81
82
  });
@@ -94,7 +95,8 @@ var Account;
94
95
  if (!api) {
95
96
  api = environment_1.ENVIRONMENT.Api().GetGuardianApi();
96
97
  }
97
- const cache = api.GetCacheItem(GetCacheKey(subdomain), reqParams);
98
+ const cacheKey = GetCacheKey(api.GetSessionId(), subdomain);
99
+ const cache = api.GetCacheItem(cacheKey, reqParams);
98
100
  if (cache === null || cache === void 0 ? void 0 : cache.found) {
99
101
  return cache.data;
100
102
  }
@@ -118,7 +120,7 @@ var Account;
118
120
  }
119
121
  }));
120
122
  api.SetCacheItem({
121
- key: GetCacheKey(subdomain),
123
+ key: cacheKey,
122
124
  value: prom,
123
125
  req: reqParams
124
126
  });
@@ -137,7 +139,8 @@ var Account;
137
139
  if (!api) {
138
140
  api = environment_1.ENVIRONMENT.Api().GetGuardianApi();
139
141
  }
140
- const cache = api.GetCacheItem(GetListCacheKey(api.GetSessionId(), owned), reqParams);
142
+ const cacheKey = GetListCacheKey(api.GetSessionId(), userId, owned);
143
+ const cache = api.GetCacheItem(cacheKey, reqParams);
141
144
  if (cache === null || cache === void 0 ? void 0 : cache.found) {
142
145
  return cache.data;
143
146
  }
@@ -163,7 +166,7 @@ var Account;
163
166
  }
164
167
  }));
165
168
  api.SetCacheItem({
166
- key: GetListCacheKey(api.GetSessionId(), owned),
169
+ key: cacheKey,
167
170
  value: prom,
168
171
  req: reqParams
169
172
  });
@@ -182,7 +185,8 @@ var Account;
182
185
  if (!api) {
183
186
  api = environment_1.ENVIRONMENT.Api().GetGuardianApi();
184
187
  }
185
- const cache = api.GetCacheItem(GetCacheKey(id, appId), reqParams);
188
+ const cacheKey = GetCacheKey(api.GetSessionId(), id, appId);
189
+ const cache = api.GetCacheItem(cacheKey, reqParams);
186
190
  if (cache === null || cache === void 0 ? void 0 : cache.found) {
187
191
  return cache.data;
188
192
  }
@@ -201,7 +205,7 @@ var Account;
201
205
  }
202
206
  }));
203
207
  api.SetCacheItem({
204
- key: GetCacheKey(id, appId),
208
+ key: cacheKey,
205
209
  value: prom,
206
210
  req: reqParams
207
211
  });
@@ -222,7 +226,7 @@ var Account;
222
226
  api = environment_1.ENVIRONMENT.Api().GetGuardianApi();
223
227
  }
224
228
  const res = yield api.POST(`account/${id}/applicationSettings/${appId}?Override=${override ? "true" : "false"}`, data, reqParams);
225
- api.Cache.RemoveByStartsWith(api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Id + id);
229
+ api.Cache.RemoveByContains(api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Id + id);
226
230
  return {
227
231
  settings: res
228
232
  };
@@ -255,7 +259,7 @@ var Account;
255
259
  const resData = {
256
260
  account: res
257
261
  };
258
- api.Cache.RemoveByStartsWith(GetListCacheKey(api.GetSessionId()));
262
+ api.Cache.RemoveByContains(GetListCacheKey(api.GetSessionId()));
259
263
  return resData;
260
264
  });
261
265
  }
@@ -288,15 +292,19 @@ var Account;
288
292
  * const key = GetCacheKey(1);
289
293
  * api.Cache.Remove(key);
290
294
  * }
295
+ * @param sessionId
291
296
  * @param accountId
292
297
  * @param appSettingsId
293
298
  * @returns
294
299
  */
295
- function GetCacheKey(accountId, appSettingsId) {
300
+ function GetCacheKey(sessionId, accountId, appSettingsId) {
301
+ if (!sessionId) {
302
+ sessionId = "anonymous";
303
+ }
296
304
  if (appSettingsId) {
297
- return api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Id + accountId + api_1.Api.ECacheKey + appSettingsId;
305
+ return api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Id + accountId + api_1.Api.ECacheKey + appSettingsId + api_1.Api.ECacheKey.Session + api_1.Api.ECacheKey.Id + sessionId;
298
306
  }
299
- return api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Id + accountId;
307
+ return api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Id + accountId + api_1.Api.ECacheKey.Session + api_1.Api.ECacheKey.Id + sessionId;
300
308
  }
301
309
  Account.GetCacheKey = GetCacheKey;
302
310
  /**
@@ -309,11 +317,17 @@ var Account;
309
317
  * @param ssid
310
318
  * @returns
311
319
  */
312
- function GetListCacheKey(ssid, owned) {
320
+ function GetListCacheKey(ssid, userId, owned) {
313
321
  if (!owned) {
314
322
  owned = false;
315
323
  }
316
- return api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Session + api_1.Api.ECacheKey.Id + ssid + api_1.Api.ECacheKey.Id + (owned ? "owned" : "related");
324
+ if (!ssid) {
325
+ ssid = "anonymous";
326
+ }
327
+ if (!userId) {
328
+ userId = "anonymous";
329
+ }
330
+ return api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Session + api_1.Api.ECacheKey.Id + ssid + api_1.Api.ECacheKey.Id + (owned ? "owned" : "related") + api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Id + userId;
317
331
  }
318
332
  Account.GetListCacheKey = GetListCacheKey;
319
333
  /**
package/dist/lib/account/account.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/account/account.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/account/account.ts"],"names":[],"mappings":"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"}
package/dist/lib/bruce-models.js CHANGED
@@ -113,5 +113,5 @@ __exportStar(require("./data-source/data-source"), exports);
113
113
  __exportStar(require("./scenario/scenario"), exports);
114
114
  __exportStar(require("./tracking/tracking"), exports);
115
115
  // This is updated with the package.json version on build.
116
- exports.VERSION = "6.4.8";
116
+ exports.VERSION = "6.4.9";
117
117
  //# sourceMappingURL=bruce-models.js.map
package/dist/lib/user/user.js CHANGED
@@ -81,7 +81,7 @@ var User;
81
81
  if (!api) {
82
82
  api = environment_1.ENVIRONMENT.Api().GetGuardianApi();
83
83
  }
84
- const cacheKey = GetCacheKey(id, accountId);
84
+ const cacheKey = GetCacheKey(api.GetSessionId(), id, accountId);
85
85
  const cache = api.GetCacheItem(cacheKey, reqParams);
86
86
  if (cache === null || cache === void 0 ? void 0 : cache.found) {
87
87
  return cache.data;
@@ -145,10 +145,10 @@ var User;
145
145
  const res = yield api.POST(`user/${data.ID}`, data, reqParams);
146
146
  api.Cache.RemoveByContains(api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Id + data.ID);
147
147
  if (data.Type == EType.AccessToken) {
148
- api.Cache.RemoveByStartsWith(api_1.Api.ECacheKey.AccessToken + api_1.Api.ECacheKey.Account);
148
+ api.Cache.RemoveByContains(api_1.Api.ECacheKey.AccessToken + api_1.Api.ECacheKey.Account);
149
149
  }
150
150
  else if (data.Type == EType.User) {
151
- api.Cache.RemoveByStartsWith(api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Account);
151
+ api.Cache.RemoveByContains(api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Account);
152
152
  }
153
153
  return {
154
154
  user: res
@@ -179,7 +179,7 @@ var User;
179
179
  }
180
180
  const res = yield api.POST("user", data, reqParams);
181
181
  api.Cache.RemoveByContains(api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Id + data.ID);
182
- api.Cache.RemoveByStartsWith(api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Account);
182
+ api.Cache.RemoveByContains(api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Account);
183
183
  return {
184
184
  user: res
185
185
  };
@@ -200,7 +200,8 @@ var User;
200
200
  if (!api) {
201
201
  api = environment_1.ENVIRONMENT.Api().GetGuardianApi();
202
202
  }
203
- const cache = api.GetCacheItem(GetSettingsCacheKey(userId, appId), req);
203
+ const cacheKey = GetSettingsCacheKey(api.GetSessionId(), userId, appId);
204
+ const cache = api.GetCacheItem(cacheKey, req);
204
205
  if (cache === null || cache === void 0 ? void 0 : cache.found) {
205
206
  return cache.data;
206
207
  }
@@ -227,7 +228,7 @@ var User;
227
228
  }
228
229
  }));
229
230
  api.SetCacheItem({
230
- key: GetSettingsCacheKey(userId, appId),
231
+ key: cacheKey,
231
232
  value: prom,
232
233
  req: req
233
234
  });
@@ -257,7 +258,7 @@ var User;
257
258
  UserID: userId
258
259
  };
259
260
  const prom = api.POST(`user/${userId}/application/${appId}/settings?Override=${override ? "true" : "false"}`, postBody, req);
260
- api.Cache.Remove(GetSettingsCacheKey(userId, appId));
261
+ api.Cache.Remove(GetSettingsCacheKey(api.GetSessionId(), userId, appId));
261
262
  return prom;
262
263
  });
263
264
  }
@@ -306,14 +307,20 @@ var User;
306
307
  * @param search
307
308
  * @returns
308
309
  */
309
- function GetListCacheKey(accountId, exclusive, search) {
310
+ function GetListCacheKey(sessionId, accountId, exclusive, search) {
310
311
  if (!exclusive) {
311
312
  exclusive = false;
312
313
  }
313
314
  if (!search) {
314
315
  search = "";
315
316
  }
316
- return api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Id + accountId + api_1.Api.ECacheKey.Id + exclusive + api_1.Api.ECacheKey.Id + search;
317
+ if (!sessionId) {
318
+ sessionId = "anonymous";
319
+ }
320
+ if (!accountId) {
321
+ accountId = "";
322
+ }
323
+ return api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Id + accountId + api_1.Api.ECacheKey.Id + exclusive + api_1.Api.ECacheKey.Id + search + api_1.Api.ECacheKey.Session + api_1.Api.ECacheKey.Id + sessionId;
317
324
  }
318
325
  LoginUser.GetListCacheKey = GetListCacheKey;
319
326
  /**
@@ -330,7 +337,8 @@ var User;
330
337
  if (!api) {
331
338
  api = environment_1.ENVIRONMENT.Api().GetGuardianApi();
332
339
  }
333
- const cache = api.GetCacheItem(GetEmailCacheKey(email, accountId), reqParams);
340
+ const cacheKey = GetEmailCacheKey(api.GetSessionId(), email, accountId);
341
+ const cache = api.GetCacheItem(cacheKey, reqParams);
334
342
  if (cache === null || cache === void 0 ? void 0 : cache.found) {
335
343
  return cache.data;
336
344
  }
@@ -346,7 +354,7 @@ var User;
346
354
  }
347
355
  }));
348
356
  api.SetCacheItem({
349
- key: GetEmailCacheKey(email, accountId),
357
+ key: cacheKey,
350
358
  value: prom,
351
359
  req: reqParams
352
360
  });
@@ -368,7 +376,8 @@ var User;
368
376
  if (!exclusive) {
369
377
  exclusive = false;
370
378
  }
371
- const cacheKey = GetListCacheKey(accountId, exclusive, search);
379
+ const sessionId = api.GetSessionId();
380
+ const cacheKey = GetListCacheKey(sessionId, accountId, exclusive, search);
372
381
  const cache = exclusive ? null : api.GetCacheItem(cacheKey, reqParams);
373
382
  if (cache === null || cache === void 0 ? void 0 : cache.found) {
374
383
  return cache.data;
@@ -398,7 +407,7 @@ var User;
398
407
  const users = data.users;
399
408
  for (let i = 0; i < users.length; i++) {
400
409
  api.SetCacheItem({
401
- key: GetCacheKey(users[i].ID, accountId),
410
+ key: GetCacheKey(sessionId, users[i].ID, accountId),
402
411
  value: {
403
412
  user: users[i]
404
413
  },
@@ -556,11 +565,18 @@ var User;
556
565
  * const key = GetListCacheKey("abc");
557
566
  * api.Cache.Remove(key);
558
567
  * }
568
+ * @param sessionId
559
569
  * @param accountId
560
570
  * @returns
561
571
  */
562
- function GetListCacheKey(accountId) {
563
- return api_1.Api.ECacheKey.AccessToken + api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Id + accountId;
572
+ function GetListCacheKey(sessionId, accountId) {
573
+ if (!sessionId) {
574
+ sessionId = "anonymous";
575
+ }
576
+ if (!accountId) {
577
+ accountId = "";
578
+ }
579
+ return api_1.Api.ECacheKey.AccessToken + api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Id + accountId + api_1.Api.ECacheKey.Session + api_1.Api.ECacheKey.Id + sessionId;
564
580
  }
565
581
  AccessToken.GetListCacheKey = GetListCacheKey;
566
582
  /**
@@ -574,7 +590,8 @@ var User;
574
590
  if (!api) {
575
591
  api = environment_1.ENVIRONMENT.Api().GetGuardianApi();
576
592
  }
577
- const cache = api.GetCacheItem(GetListCacheKey(accountId), reqParams);
593
+ const cacheKey = GetListCacheKey(api.GetSessionId(), accountId);
594
+ const cache = api.GetCacheItem(cacheKey, reqParams);
578
595
  if (cache === null || cache === void 0 ? void 0 : cache.found) {
579
596
  return cache.data;
580
597
  }
@@ -590,7 +607,7 @@ var User;
590
607
  }
591
608
  }));
592
609
  api.SetCacheItem({
593
- key: GetListCacheKey(accountId),
610
+ key: cacheKey,
594
611
  value: req,
595
612
  req: reqParams
596
613
  });
@@ -610,7 +627,7 @@ var User;
610
627
  }
611
628
  yield api.DELETE(`accessToken/${id}`, reqParams);
612
629
  api.Cache.RemoveByContains(api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Id + id);
613
- api.Cache.RemoveByStartsWith(api_1.Api.ECacheKey.AccessToken + api_1.Api.ECacheKey.Account);
630
+ api.Cache.RemoveByContains(api_1.Api.ECacheKey.AccessToken + api_1.Api.ECacheKey.Account);
614
631
  });
615
632
  }
616
633
  AccessToken.Delete = Delete;
@@ -635,7 +652,7 @@ var User;
635
652
  data.Type = EType.AccessToken;
636
653
  }
637
654
  data = yield api.POST("accessToken", data, reqParams);
638
- api.Cache.RemoveByStartsWith(api_1.Api.ECacheKey.AccessToken + api_1.Api.ECacheKey.Account);
655
+ api.Cache.RemoveByContains(api_1.Api.ECacheKey.AccessToken + api_1.Api.ECacheKey.Account);
639
656
  return {
640
657
  user: data
641
658
  };
@@ -670,15 +687,19 @@ var User;
670
687
  * const key = GetCacheKey("abc", "def");
671
688
  * api.Cache.Remove(key);
672
689
  * }
690
+ * @param sessionId
673
691
  * @param userId
674
692
  * @param accountId
675
693
  * @returns
676
694
  */
677
- function GetCacheKey(userId, accountId) {
695
+ function GetCacheKey(sessionId, userId, accountId) {
678
696
  if (!accountId) {
679
697
  accountId = "";
680
698
  }
681
- return api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Id + userId + api_1.Api.ECacheKey.Id + accountId;
699
+ if (!sessionId) {
700
+ sessionId = "anonymous";
701
+ }
702
+ return api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.Id + userId + api_1.Api.ECacheKey.Id + accountId + api_1.Api.ECacheKey.Session + api_1.Api.ECacheKey.Id + sessionId;
682
703
  }
683
704
  User.GetCacheKey = GetCacheKey;
684
705
  /**
@@ -692,11 +713,17 @@ var User;
692
713
  * @param accountId
693
714
  * @returns
694
715
  */
695
- function GetEmailCacheKey(email, accountId) {
716
+ function GetEmailCacheKey(sessionId, email, accountId) {
696
717
  if (!accountId) {
697
718
  accountId = "";
698
719
  }
699
- return api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.UserEmail + email + api_1.Api.ECacheKey.Id + accountId;
720
+ if (!sessionId) {
721
+ sessionId = "anonymous";
722
+ }
723
+ if (!email) {
724
+ email = "";
725
+ }
726
+ return api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.UserEmail + email + api_1.Api.ECacheKey.Id + accountId + api_1.Api.ECacheKey.Session + api_1.Api.ECacheKey.Id + sessionId;
700
727
  }
701
728
  User.GetEmailCacheKey = GetEmailCacheKey;
702
729
  /**
@@ -706,11 +733,15 @@ var User;
706
733
  * const key = GetCacheKey("abc", "def");
707
734
  * api.Cache.Remove(key);
708
735
  * }
736
+ * @param sessionId
709
737
  * @param userId
710
738
  * @param appId
711
739
  * @returns
712
740
  */
713
- function GetSettingsCacheKey(userId, appId) {
741
+ function GetSettingsCacheKey(sessionId, userId, appId) {
742
+ if (!sessionId) {
743
+ sessionId = "anonymous";
744
+ }
714
745
  return api_1.Api.ECacheKey.User + api_1.Api.ECacheKey.UserSettings + userId + api_1.Api.ECacheKey.Id + appId;
715
746
  }
716
747
  User.GetSettingsCacheKey = GetSettingsCacheKey;
package/dist/lib/user/user.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/user/user.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/user/user.ts"],"names":[],"mappings":"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"}
package/dist/types/account/account.d.ts CHANGED
@@ -160,11 +160,12 @@ export declare namespace Account {
160
160
  * const key = GetCacheKey(1);
161
161
  * api.Cache.Remove(key);
162
162
  * }
163
+ * @param sessionId
163
164
  * @param accountId
164
165
  * @param appSettingsId
165
166
  * @returns
166
167
  */
167
- function GetCacheKey(accountId: string, appSettingsId?: string): string;
168
+ function GetCacheKey(sessionId: string, accountId: string, appSettingsId?: string): string;
168
169
  /**
169
170
  * Returns cache identifier for a list of accounts by session ID.
170
171
  * Example: {
@@ -175,7 +176,7 @@ export declare namespace Account {
175
176
  * @param ssid
176
177
  * @returns
177
178
  */
178
- function GetListCacheKey(ssid: string, owned?: boolean): string;
179
+ function GetListCacheKey(ssid?: string, userId?: string, owned?: boolean): string;
179
180
  /**
180
181
  * Returns cache identifier for a list of database regions.
181
182
  * Example: {
package/dist/types/bruce-models.d.ts CHANGED
@@ -95,4 +95,4 @@ export * from "./environment";
95
95
  export * from "./data-source/data-source";
96
96
  export * from "./scenario/scenario";
97
97
  export * from "./tracking/tracking";
98
- export declare const VERSION = "6.4.8";
98
+ export declare const VERSION = "6.4.9";
package/dist/types/user/user.d.ts CHANGED
@@ -143,7 +143,7 @@ export declare namespace User {
143
143
  * @param search
144
144
  * @returns
145
145
  */
146
- function GetListCacheKey(accountId: string, exclusive?: boolean, search?: string): string;
146
+ function GetListCacheKey(sessionId?: string, accountId?: string, exclusive?: boolean, search?: string): string;
147
147
  /**
148
148
  * Returns a user by their email address.
149
149
  * @param params
@@ -241,10 +241,11 @@ export declare namespace User {
241
241
  * const key = GetListCacheKey("abc");
242
242
  * api.Cache.Remove(key);
243
243
  * }
244
+ * @param sessionId
244
245
  * @param accountId
245
246
  * @returns
246
247
  */
247
- function GetListCacheKey(accountId: string): string;
248
+ function GetListCacheKey(sessionId: string, accountId: string): string;
248
249
  /**
249
250
  * Returns a list of access tokens for an account.
250
251
  * @param params
@@ -297,11 +298,12 @@ export declare namespace User {
297
298
  * const key = GetCacheKey("abc", "def");
298
299
  * api.Cache.Remove(key);
299
300
  * }
301
+ * @param sessionId
300
302
  * @param userId
301
303
  * @param accountId
302
304
  * @returns
303
305
  */
304
- function GetCacheKey(userId: string, accountId?: string): string;
306
+ function GetCacheKey(sessionId: string, userId: string, accountId?: string): string;
305
307
  /**
306
308
  * Returns cache identifier for a user.
307
309
  * Example: {
@@ -313,7 +315,7 @@ export declare namespace User {
313
315
  * @param accountId
314
316
  * @returns
315
317
  */
316
- function GetEmailCacheKey(email: string, accountId?: string): string;
318
+ function GetEmailCacheKey(sessionId?: string, email?: string, accountId?: string): string;
317
319
  /**
318
320
  * Returns cache identifier for a user's settings.
319
321
  * Example: {
@@ -321,9 +323,10 @@ export declare namespace User {
321
323
  * const key = GetCacheKey("abc", "def");
322
324
  * api.Cache.Remove(key);
323
325
  * }
326
+ * @param sessionId
324
327
  * @param userId
325
328
  * @param appId
326
329
  * @returns
327
330
  */
328
- function GetSettingsCacheKey(userId: string, appId: string): string;
331
+ function GetSettingsCacheKey(sessionId: string, userId: string, appId: string): string;
329
332
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bruce-models",
3
- "version": "6.4.8",
3
+ "version": "6.4.9",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "main": "dist/bruce-models.umd.js",