@lifeready/core 5.0.10 → 5.0.12

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.
@@ -1715,7 +1715,7 @@
1715
1715
  this.resetKeys();
1716
1716
  this.persistService.clear();
1717
1717
  };
1718
- KeyService.prototype.populateKeys = function (keys) {
1718
+ KeyService.prototype.setKeys = function (keys) {
1719
1719
  this.keys = keys;
1720
1720
  };
1721
1721
  Object.defineProperty(KeyService.prototype, "currentPassKey", {
@@ -1884,7 +1884,7 @@
1884
1884
  return __generator(this, function (_d) {
1885
1885
  switch (_d.label) {
1886
1886
  case 0:
1887
- _b = (_a = this.keyService).populateKeys;
1887
+ _b = (_a = this.keyService).setKeys;
1888
1888
  _c = {
1889
1889
  passKey: userKey.passKey
1890
1890
  };
@@ -3469,6 +3469,11 @@
3469
3469
  // merge the doc synchronously.
3470
3470
  this.lrMutations.forEach(function (lrMutation, idx) {
3471
3471
  var e_1, _a;
3472
+ // Sometimes typing won't catch everything. So need to dynamically check the
3473
+ // type to be sure.
3474
+ if (!(lrMutation instanceof LrMutationBase)) {
3475
+ throw new KcBadLogicException('An mutation in the array is not of type LrMutationBase.');
3476
+ }
3472
3477
  var _b = lrMutation.lrMutationData, mutation = _b.mutation, variables = _b.variables;
3473
3478
  var childMutationNode = getMutation(mutation);
3474
3479
  // Prefixing all mutation fields so they don't conflict.
@@ -6793,7 +6798,7 @@
6793
6798
  _o.sent();
6794
6799
  _o.label = 7;
6795
6800
  case 7:
6796
- this.keyService.populateKeys({
6801
+ this.keyService.setKeys({
6797
6802
  passKey: {
6798
6803
  id: resetUser.passKey.id,
6799
6804
  },
@@ -7267,7 +7272,7 @@
7267
7272
  return __generator(this, function (_b) {
7268
7273
  switch (_b.label) {
7269
7274
  case 0: return [4 /*yield*/, this.api.query({
7270
- query: CurrentUserQuery$1,
7275
+ query: ResetUserQuery,
7271
7276
  processorOptions: {
7272
7277
  hasKeys: false,
7273
7278
  },
@@ -7533,10 +7538,7 @@
7533
7538
  case 5:
7534
7539
  _f.sent();
7535
7540
  _f.label = 6;
7536
- case 6: return [4 /*yield*/, this.keyGraphService.populateKeys(userKeys)];
7537
- case 7:
7538
- _f.sent();
7539
- return [2 /*return*/];
7541
+ case 6: return [2 /*return*/];
7540
7542
  }
7541
7543
  });
7542
7544
  });
@@ -7581,10 +7583,15 @@
7581
7583
  sessionEncryptionKey: currentUser.sessionEncryptionKey,
7582
7584
  })];
7583
7585
  case 2:
7586
+ _b.sent();
7587
+ // Regular user populates all keys
7588
+ return [4 /*yield*/, this.keyGraphService.populateKeys(currentUser.currentUserKey)];
7589
+ case 3:
7590
+ // Regular user populates all keys
7584
7591
  _b.sent();
7585
7592
  username = currentUser.username;
7586
7593
  return [4 /*yield*/, this.cognito.userAttributes(cognitoUser)];
7587
- case 3:
7594
+ case 4:
7588
7595
  userAttributes = _b.sent();
7589
7596
  return [2 /*return*/, {
7590
7597
  username: username,
@@ -7598,27 +7605,36 @@
7598
7605
  };
7599
7606
  Auth2Service.prototype.loadResetUser = function (cognitoUser, password) {
7600
7607
  return __awaiter(this, void 0, void 0, function () {
7601
- var resetUser, username, userAttributes;
7608
+ var resetUser, userKeys, username, userAttributes;
7602
7609
  return __generator(this, function (_b) {
7603
7610
  switch (_b.label) {
7604
7611
  case 0: return [4 /*yield*/, this.fetchResetUser()];
7605
7612
  case 1:
7606
7613
  resetUser = _b.sent();
7607
- this.loadUserKeys({
7608
- userKeys: {
7609
- passKey: {
7610
- id: resetUser.passKey.id,
7611
- },
7612
- masterKey: {
7613
- id: resetUser.masterKey.id,
7614
- },
7614
+ userKeys = {
7615
+ passKey: {
7616
+ id: resetUser.passKey.id,
7617
+ passKeyParams: resetUser.passKey.passKeyParams,
7615
7618
  },
7616
- password: password,
7617
- sessionEncryptionKey: resetUser.sessionEncryptionKey,
7618
- });
7619
+ masterKey: {
7620
+ id: resetUser.masterKey.id,
7621
+ },
7622
+ };
7623
+ return [4 /*yield*/, this.loadUserKeys({
7624
+ userKeys: userKeys,
7625
+ password: password,
7626
+ sessionEncryptionKey: resetUser.sessionEncryptionKey,
7627
+ })];
7628
+ case 2:
7629
+ _b.sent();
7630
+ // Reset user only sets a subset of keys
7631
+ return [4 /*yield*/, this.keyService.setKeys(userKeys)];
7632
+ case 3:
7633
+ // Reset user only sets a subset of keys
7634
+ _b.sent();
7619
7635
  username = resetUser.username;
7620
7636
  return [4 /*yield*/, this.cognito.userAttributes(cognitoUser)];
7621
- case 2:
7637
+ case 4:
7622
7638
  userAttributes = _b.sent();
7623
7639
  return [2 /*return*/, {
7624
7640
  username: username,
@@ -7811,6 +7827,22 @@
7811
7827
  Auth2Service.prototype.debugClearUser = function () {
7812
7828
  this.user = null;
7813
7829
  };
7830
+ Auth2Service.prototype.getCurrentUserAttibutes = function () {
7831
+ return __awaiter(this, void 0, void 0, function () {
7832
+ var cognitoUser, userAttributes;
7833
+ return __generator(this, function (_b) {
7834
+ switch (_b.label) {
7835
+ case 0: return [4 /*yield*/, this.cognito.currentAuthenticatedUser()];
7836
+ case 1:
7837
+ cognitoUser = _b.sent();
7838
+ return [4 /*yield*/, this.cognito.userAttributes(cognitoUser)];
7839
+ case 2:
7840
+ userAttributes = _b.sent();
7841
+ return [2 /*return*/, userAttributes];
7842
+ }
7843
+ });
7844
+ });
7845
+ };
7814
7846
  return Auth2Service;
7815
7847
  }(LrService));
7816
7848
  exports.Auth2Service.CHALLENGE_TIMEOUT = 1000 * 60 * 5;