@lifeready/core 5.0.10 → 5.0.12

package/fesm2015/lifeready-core.js

@@ -1117,7 +1117,7 @@ class KeyService {
         this.resetKeys();
         this.persistService.clear();
     }
-    populateKeys(keys) {
+    setKeys(keys) {
         this.keys = keys;
     }
     get currentPassKey() {
@@ -1230,7 +1230,7 @@ class KeyGraphService {
     }
     populateKeys(userKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.keyService.populateKeys({
+            this.keyService.setKeys({
                 passKey: userKey.passKey,
                 masterKey: yield this.keyService.loadMasterKey(userKey.masterKey.id),
                 rootKey: yield this.unwrapKey(userKey.masterKey.id, userKey.rootKey.id),
@@ -2591,6 +2591,11 @@ class LrMergedMutation extends LrMutationBase {
         // Just wait for everything to resolve because we have to
         // merge the doc synchronously.
         this.lrMutations.forEach((lrMutation, idx) => {
+            // Sometimes typing won't catch everything. So need to dynamically check the
+            // type to be sure.
+            if (!(lrMutation instanceof LrMutationBase)) {
+                throw new KcBadLogicException('An mutation in the array is not of type LrMutationBase.');
+            }
             const { mutation, variables } = lrMutation.lrMutationData;
             const childMutationNode = getMutation(mutation);
             // Prefixing all mutation fields so they don't conflict.
@@ -5869,7 +5874,7 @@ class LifeReadyAuthService {
                 const passKey = (yield this.keyFactory.derivePassKey(Object.assign({ password }, resetUser.passKey.passKeyParams))).jwk;
                 yield this.idleService.persistMasterKey(yield this.keyGraphService.unwrapWithPassKey(resetUser.passKey.id, passKey, resetUser.masterKey.id));
             }
-            this.keyService.populateKeys({
+            this.keyService.setKeys({
                 passKey: {
                     id: resetUser.passKey.id,
                 },
@@ -6301,7 +6306,7 @@ let Auth2Service = Auth2Service_1 = class Auth2Service extends LrService {
     fetchResetUser() {
         return __awaiter(this, void 0, void 0, function* () {
             return (yield this.api.query({
-                query: CurrentUserQuery$1,
+                query: ResetUserQuery,
                 processorOptions: {
                     hasKeys: false,
                 },
@@ -6484,7 +6489,6 @@ let Auth2Service = Auth2Service_1 = class Auth2Service extends LrService {
                 const passKey = (yield this.keyFactoryService.derivePassKey(Object.assign({ password }, userKeys.passKey.passKeyParams))).jwk;
                 yield this.idleService.persistMasterKey(yield this.keyGraphService.unwrapWithPassKey(userKeys.passKey.id, passKey, userKeys.masterKey.id));
             }
-            yield this.keyGraphService.populateKeys(userKeys);
         });
     }
     loadUser(cognitoUser, password) {
@@ -6507,6 +6511,8 @@ let Auth2Service = Auth2Service_1 = class Auth2Service extends LrService {
                 password,
                 sessionEncryptionKey: currentUser.sessionEncryptionKey,
             });
+            // Regular user populates all keys
+            yield this.keyGraphService.populateKeys(currentUser.currentUserKey);
             const { username } = currentUser;
             const userAttributes = yield this.cognito.userAttributes(cognitoUser);
             return {
@@ -6520,18 +6526,22 @@ let Auth2Service = Auth2Service_1 = class Auth2Service extends LrService {
     loadResetUser(cognitoUser, password) {
         return __awaiter(this, void 0, void 0, function* () {
             const resetUser = yield this.fetchResetUser();
-            this.loadUserKeys({
-                userKeys: {
-                    passKey: {
-                        id: resetUser.passKey.id,
-                    },
-                    masterKey: {
-                        id: resetUser.masterKey.id,
-                    },
+            const userKeys = {
+                passKey: {
+                    id: resetUser.passKey.id,
+                    passKeyParams: resetUser.passKey.passKeyParams,
                 },
+                masterKey: {
+                    id: resetUser.masterKey.id,
+                },
+            };
+            yield this.loadUserKeys({
+                userKeys,
                 password,
                 sessionEncryptionKey: resetUser.sessionEncryptionKey,
             });
+            // Reset user only sets a subset of keys
+            yield this.keyService.setKeys(userKeys);
             const { username } = resetUser;
             const userAttributes = yield this.cognito.userAttributes(cognitoUser);
             return {
@@ -6679,6 +6689,13 @@ let Auth2Service = Auth2Service_1 = class Auth2Service extends LrService {
     debugClearUser() {
         this.user = null;
     }
+    getCurrentUserAttibutes() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cognitoUser = yield this.cognito.currentAuthenticatedUser();
+            const userAttributes = yield this.cognito.userAttributes(cognitoUser);
+            return userAttributes;
+        });
+    }
 };
 Auth2Service.CHALLENGE_TIMEOUT = 1000 * 60 * 5;
 Auth2Service.ɵprov = ɵɵdefineInjectable({ factory: function Auth2Service_Factory() { return new Auth2Service(ɵɵinject(NgZone), ɵɵinject(INJECTOR), ɵɵinject(HttpClient), ɵɵinject(AuthClass), ɵɵinject(LrGraphQLService), ɵɵinject(KeyService), ɵɵinject(KeyGraphService), ɵɵinject(KeyFactoryService), ɵɵinject(PasswordService), ɵɵinject(IdleService), ɵɵinject(PersistService), ɵɵinject(EncryptionService), ɵɵinject(TpPasswordResetAssemblyController), ɵɵinject(KC_CONFIG)); }, token: Auth2Service, providedIn: "root" });