@lifeready/core 5.0.10 → 5.0.11

package/bundles/lifeready-core.umd.js

@@ -1715,7 +1715,7 @@
             this.resetKeys();
             this.persistService.clear();
         };
-        KeyService.prototype.populateKeys = function (keys) {
+        KeyService.prototype.setKeys = function (keys) {
             this.keys = keys;
         };
         Object.defineProperty(KeyService.prototype, "currentPassKey", {
@@ -1884,7 +1884,7 @@
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
-                            _b = (_a = this.keyService).populateKeys;
+                            _b = (_a = this.keyService).setKeys;
                             _c = {
                                 passKey: userKey.passKey
                             };
@@ -6793,7 +6793,7 @@
                             _o.sent();
                             _o.label = 7;
                         case 7:
-                            this.keyService.populateKeys({
+                            this.keyService.setKeys({
                                 passKey: {
                                     id: resetUser.passKey.id,
                                 },
@@ -7267,7 +7267,7 @@
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0: return [4 /*yield*/, this.api.query({
-                                query: CurrentUserQuery$1,
+                                query: ResetUserQuery,
                                 processorOptions: {
                                     hasKeys: false,
                                 },
@@ -7533,10 +7533,7 @@
                         case 5:
                             _f.sent();
                             _f.label = 6;
-                        case 6: return [4 /*yield*/, this.keyGraphService.populateKeys(userKeys)];
-                        case 7:
-                            _f.sent();
-                            return [2 /*return*/];
+                        case 6: return [2 /*return*/];
                     }
                 });
             });
@@ -7581,10 +7578,15 @@
                                     sessionEncryptionKey: currentUser.sessionEncryptionKey,
                                 })];
                         case 2:
+                            _b.sent();
+                            // Regular user populates all keys
+                            return [4 /*yield*/, this.keyGraphService.populateKeys(currentUser.currentUserKey)];
+                        case 3:
+                            // Regular user populates all keys
                             _b.sent();
                             username = currentUser.username;
                             return [4 /*yield*/, this.cognito.userAttributes(cognitoUser)];
-                        case 3:
+                        case 4:
                             userAttributes = _b.sent();
                             return [2 /*return*/, {
                                     username: username,
@@ -7598,27 +7600,36 @@
         };
         Auth2Service.prototype.loadResetUser = function (cognitoUser, password) {
             return __awaiter(this, void 0, void 0, function () {
-                var resetUser, username, userAttributes;
+                var resetUser, userKeys, username, userAttributes;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0: return [4 /*yield*/, this.fetchResetUser()];
                         case 1:
                             resetUser = _b.sent();
-                            this.loadUserKeys({
-                                userKeys: {
-                                    passKey: {
-                                        id: resetUser.passKey.id,
-                                    },
-                                    masterKey: {
-                                        id: resetUser.masterKey.id,
-                                    },
+                            userKeys = {
+                                passKey: {
+                                    id: resetUser.passKey.id,
+                                    passKeyParams: resetUser.passKey.passKeyParams,
                                 },
-                                password: password,
-                                sessionEncryptionKey: resetUser.sessionEncryptionKey,
-                            });
+                                masterKey: {
+                                    id: resetUser.masterKey.id,
+                                },
+                            };
+                            return [4 /*yield*/, this.loadUserKeys({
+                                    userKeys: userKeys,
+                                    password: password,
+                                    sessionEncryptionKey: resetUser.sessionEncryptionKey,
+                                })];
+                        case 2:
+                            _b.sent();
+                            // Reset user only sets a subset of keys
+                            return [4 /*yield*/, this.keyService.setKeys(userKeys)];
+                        case 3:
+                            // Reset user only sets a subset of keys
+                            _b.sent();
                             username = resetUser.username;
                             return [4 /*yield*/, this.cognito.userAttributes(cognitoUser)];
-                        case 2:
+                        case 4:
                             userAttributes = _b.sent();
                             return [2 /*return*/, {
                                     username: username,