@lifeready/core 5.0.9 → 5.0.11

package/bundles/lifeready-core.umd.js

@@ -2,7 +2,7 @@
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('apollo-angular'), require('@dagrejs/graphlib'), require('lodash'), require('node-jose'), require('@aws-amplify/auth/lib-esm/Auth'), require('graphql-tag'), require('moment'), require('@apollo/client/core'), require('@apollo/client/link/context'), require('@apollo/client/link/retry'), require('ngx-cookie-service'), require('graphql/language/printer'), require('@aws-amplify/auth'), require('@angular/common/http'), require('@aws-amplify/core'), require('rxjs'), require('@ng-idle/core'), require('@ng-idle/keepalive'), require('slip39')) :
     typeof define === 'function' && define.amd ? define('@lifeready/core', ['exports', '@angular/core', 'apollo-angular', '@dagrejs/graphlib', 'lodash', 'node-jose', '@aws-amplify/auth/lib-esm/Auth', 'graphql-tag', 'moment', '@apollo/client/core', '@apollo/client/link/context', '@apollo/client/link/retry', 'ngx-cookie-service', 'graphql/language/printer', '@aws-amplify/auth', '@angular/common/http', '@aws-amplify/core', 'rxjs', '@ng-idle/core', '@ng-idle/keepalive', 'slip39'], factory) :
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.lifeready = global.lifeready || {}, global.lifeready.core = {}), global.ng.core, global['apollo-angular'], global['@dagrejs/graphlib'], global.lodash, global['node-jose'], global['@aws-amplify/auth/lib-esm/Auth'], global['graphql-tag'], global.moment, global['@apollo/client/core'], global['@apollo/client/link/context'], global['@apollo/client/link/retry'], global['ngx-cookie-service'], global['graphql/language/printer'], global['@aws-amplify/auth'], global.ng.common.http, global['@aws-amplify/core'], global.rxjs, global['@ng-idle/core'], global['@ng-idle/keepalive'], global.slip39));
-}(this, (function (exports, i0, i1, graphlib, _, nodeJose, i4, gql, moment_, core, context, retry, i2, gqlPrinter, Auth, i2$1, core$1, rxjs, i3, i4$1, slip39) { 'use strict';
+}(this, (function (exports, i0, i1, graphlib, _, nodeJose, i2, gql, moment_, core, context, retry, i2$1, gqlPrinter, Auth, i2$2, core$1, rxjs, i3, i4, slip39) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -788,14 +788,14 @@
         };
         return TimeService;
     }());
-    TimeService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TimeService_Factory() { return new TimeService(i0.ɵɵinject(i4.AuthClass), i0.ɵɵinject(i1.Apollo)); }, token: TimeService, providedIn: "root" });
+    TimeService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TimeService_Factory() { return new TimeService(i0.ɵɵinject(i2.AuthClass), i0.ɵɵinject(i1.Apollo)); }, token: TimeService, providedIn: "root" });
     TimeService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
     TimeService.ctorParameters = function () { return [
-        { type: i4.AuthClass },
+        { type: i2.AuthClass },
         { type: i1.Apollo }
     ]; };
     var templateObject_1;
@@ -1670,7 +1670,7 @@
         };
         return PersistService;
     }());
-    PersistService.ɵprov = i0.ɵɵdefineInjectable({ factory: function PersistService_Factory() { return new PersistService(i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(i2.CookieService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(i0.INJECTOR)); }, token: PersistService, providedIn: "root" });
+    PersistService.ɵprov = i0.ɵɵdefineInjectable({ factory: function PersistService_Factory() { return new PersistService(i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(i2$1.CookieService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(i0.INJECTOR)); }, token: PersistService, providedIn: "root" });
     PersistService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -1678,7 +1678,7 @@
     ];
     PersistService.ctorParameters = function () { return [
         { type: KeyFactoryService },
-        { type: i2.CookieService },
+        { type: i2$1.CookieService },
         { type: EncryptionService },
         { type: i0.Injector }
     ]; };
@@ -1715,24 +1715,44 @@
             this.resetKeys();
             this.persistService.clear();
         };
-        KeyService.prototype.populateKeys = function (keys) {
+        KeyService.prototype.setKeys = function (keys) {
             this.keys = keys;
         };
-        KeyService.prototype.getCurrentPassKey = function () {
-            return this.keys.passKey;
-        };
-        KeyService.prototype.getCurrentMasterKey = function () {
-            return this.keys.masterKey;
-        };
-        KeyService.prototype.getCurrentRootKey = function () {
-            return this.keys.rootKey;
-        };
-        KeyService.prototype.getCurrentPxk = function () {
-            return this.keys.pxk;
-        };
-        KeyService.prototype.getCurrentSigPxk = function () {
-            return this.keys.sigPxk;
-        };
+        Object.defineProperty(KeyService.prototype, "currentPassKey", {
+            get: function () {
+                return this.keys.passKey;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(KeyService.prototype, "currentMasterKey", {
+            get: function () {
+                return this.keys.masterKey;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(KeyService.prototype, "currentRootKey", {
+            get: function () {
+                return this.keys.rootKey;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(KeyService.prototype, "currentPxk", {
+            get: function () {
+                return this.keys.pxk;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(KeyService.prototype, "currentSigPxk", {
+            get: function () {
+                return this.keys.sigPxk;
+            },
+            enumerable: false,
+            configurable: true
+        });
         KeyService.prototype.expiresAfter = function (seconds) {
             return new Date(Date.now() + 1000 * seconds);
         };
@@ -1864,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
                             };
@@ -2049,7 +2069,7 @@
                                 return [2 /*return*/, key];
                             }
                             else {
-                                return [2 /*return*/, this.unwrapKey(this.keyService.getCurrentMasterKey().id, keyId)];
+                                return [2 /*return*/, this.unwrapKey(this.keyService.currentMasterKey.id, keyId)];
                             }
                             return [2 /*return*/];
                     }
@@ -3889,11 +3909,6 @@
         }
         return LoginResult;
     }());
-    var RegisterResult = /** @class */ (function () {
-        function RegisterResult() {
-        }
-        return RegisterResult;
-    }());
     (function (RecoveryStatus) {
         RecoveryStatus["NONE"] = "none";
         RecoveryStatus["NEW_PASSWORD"] = "new-password";
@@ -4094,7 +4109,7 @@
         };
         return IdleService;
     }());
-    IdleService.ɵprov = i0.ɵɵdefineInjectable({ factory: function IdleService_Factory() { return new IdleService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2$1.HttpClient), i0.ɵɵinject(i3.Idle), i0.ɵɵinject(i4$1.Keepalive), i0.ɵɵinject(KeyService), i0.ɵɵinject(i4.AuthClass)); }, token: IdleService, providedIn: "root" });
+    IdleService.ɵprov = i0.ɵɵdefineInjectable({ factory: function IdleService_Factory() { return new IdleService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2$2.HttpClient), i0.ɵɵinject(i3.Idle), i0.ɵɵinject(i4.Keepalive), i0.ɵɵinject(KeyService), i0.ɵɵinject(i2.AuthClass)); }, token: IdleService, providedIn: "root" });
     IdleService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -4102,11 +4117,11 @@
     ];
     IdleService.ctorParameters = function () { return [
         { type: undefined, decorators: [{ type: i0.Inject, args: [KC_CONFIG,] }] },
-        { type: i2$1.HttpClient },
+        { type: i2$2.HttpClient },
         { type: i3.Idle },
-        { type: i4$1.Keepalive },
+        { type: i4.Keepalive },
         { type: KeyService },
-        { type: i4.AuthClass }
+        { type: i2.AuthClass }
     ]; };
 
     var ContactCardFields = "\nid\npublicData\npublicSearchable\ncipherData\nkey {\n  id\n}\n";
@@ -4378,7 +4393,7 @@
                             wrappedKeys = _g.sent();
                             return [3 /*break*/, 5];
                         case 3:
-                            rootKey = this.keyService.getCurrentRootKey();
+                            rootKey = this.keyService.currentRootKey;
                             _b = (_a = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, key.toJSON(true))];
                         case 4:
@@ -4874,16 +4889,15 @@
                 var sigPxk, publicDataSig, _a, _b, publicSearchableSig, _c, _d, plainDataJson, plainDataSig, _e, _f;
                 return __generator(this, function (_g) {
                     switch (_g.label) {
-                        case 0: return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 1:
-                            sigPxk = _g.sent();
+                        case 0:
+                            sigPxk = this.keyService.currentSigPxk;
                             _b = (_a = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, '')];
-                        case 2:
+                        case 1:
                             publicDataSig = _b.apply(_a, [_g.sent()]);
                             _d = (_c = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, '')];
-                        case 3:
+                        case 2:
                             publicSearchableSig = _d.apply(_c, [_g.sent()]);
                             plainDataJson = {
                                 // contactCard.name.value may have additional attributes such as the id of the contact card.
@@ -4892,7 +4906,7 @@
                             };
                             _f = (_e = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, plainDataJson)];
-                        case 4:
+                        case 3:
                             plainDataSig = _f.apply(_e, [_g.sent()]);
                             return [2 /*return*/, {
                                     sigPxkId: sigPxk.id,
@@ -5026,7 +5040,7 @@
         };
         return ProfileService;
     }());
-    ProfileService.ɵprov = i0.ɵɵdefineInjectable({ factory: function ProfileService_Factory() { return new ProfileService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2$1.HttpClient), i0.ɵɵinject(LrApolloService), i0.ɵɵinject(KeyService), i0.ɵɵinject(KeyMetaService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(EncryptionService)); }, token: ProfileService, providedIn: "root" });
+    ProfileService.ɵprov = i0.ɵɵdefineInjectable({ factory: function ProfileService_Factory() { return new ProfileService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2$2.HttpClient), i0.ɵɵinject(LrApolloService), i0.ɵɵinject(KeyService), i0.ɵɵinject(KeyMetaService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(EncryptionService)); }, token: ProfileService, providedIn: "root" });
     ProfileService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -5034,7 +5048,7 @@
     ];
     ProfileService.ctorParameters = function () { return [
         { type: undefined, decorators: [{ type: i0.Inject, args: [KC_CONFIG,] }] },
-        { type: i2$1.HttpClient },
+        { type: i2$2.HttpClient },
         { type: LrApolloService },
         { type: KeyService },
         { type: KeyMetaService },
@@ -5426,7 +5440,7 @@
         };
         return PasswordService;
     }());
-    PasswordService.ɵprov = i0.ɵɵdefineInjectable({ factory: function PasswordService_Factory() { return new PasswordService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2$1.HttpClient), i0.ɵɵinject(LrApolloService), i0.ɵɵinject(i4.AuthClass), i0.ɵɵinject(ProfileService), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(WebCryptoService)); }, token: PasswordService, providedIn: "root" });
+    PasswordService.ɵprov = i0.ɵɵdefineInjectable({ factory: function PasswordService_Factory() { return new PasswordService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2$2.HttpClient), i0.ɵɵinject(LrApolloService), i0.ɵɵinject(i2.AuthClass), i0.ɵɵinject(ProfileService), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(WebCryptoService)); }, token: PasswordService, providedIn: "root" });
     PasswordService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -5434,9 +5448,9 @@
     ];
     PasswordService.ctorParameters = function () { return [
         { type: undefined, decorators: [{ type: i0.Inject, args: [KC_CONFIG,] }] },
-        { type: i2$1.HttpClient },
+        { type: i2$2.HttpClient },
         { type: LrApolloService },
-        { type: i4.AuthClass },
+        { type: i2.AuthClass },
         { type: ProfileService },
         { type: KeyFactoryService },
         { type: EncryptionService },
@@ -5899,23 +5913,22 @@
                 var rootKey, subjectKey, rootKeyWrappedSubjectKey, _a, assemblyKey, rawAssemblyKey, assemblyKeyParams, assemblyInput, slipAssembly, tpIds, tps, _c, createSubAssemblies, subjectCipherData;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
-                        case 0: return [4 /*yield*/, this.keyService.getCurrentRootKey()];
-                        case 1:
-                            rootKey = _d.sent();
+                        case 0:
+                            rootKey = this.keyService.currentRootKey;
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 2:
+                        case 1:
                             subjectKey = _d.sent();
                             return [4 /*yield*/, this.keyGraph.wrapKey(rootKey, subjectKey)];
-                        case 3:
+                        case 2:
                             rootKeyWrappedSubjectKey = _d.sent();
                             return [4 /*yield*/, this.prepareAssembly({
                                     rootKey: rootKey.jwk,
                                     subjectKey: subjectKey,
                                 })];
-                        case 4:
+                        case 3:
                             _a = _d.sent(), assemblyKey = _a.assemblyKey, rawAssemblyKey = _a.rawAssemblyKey, assemblyKeyParams = _a.assemblyKeyParams, assemblyInput = __rest(_a, ["assemblyKey", "rawAssemblyKey", "assemblyKeyParams"]);
                             return [4 /*yield*/, this.prepareSlip39(input.createSubAssemblies, input.quorum, rawAssemblyKey)];
-                        case 5:
+                        case 4:
                             slipAssembly = _d.sent();
                             tpIds = this.getInputApprovers(input.createSubAssemblies);
                             _c = mapEdges;
@@ -5925,7 +5938,7 @@
                                         ids: tpIds,
                                     },
                                 })];
-                        case 6:
+                        case 5:
                             tps = _c.apply(void 0, [(_d.sent()).tps]);
                             // Fill in wrappingKeyId if not present
                             this.fillWrappingKeyId(input.createSubAssemblies, tps);
@@ -5935,10 +5948,10 @@
                                     slipSubAssemblies: slipAssembly.subAssemblies,
                                     subjectKey: subjectKey,
                                 })];
-                        case 7:
+                        case 6:
                             createSubAssemblies = _d.sent();
                             return [4 /*yield*/, this.encryptionService.encryptToString(subjectKey, input.subjectCipherDataClearJson || '')];
-                        case 8:
+                        case 7:
                             subjectCipherData = _d.sent();
                             return [2 /*return*/, {
                                     assemblyKey: assemblyKey,
@@ -5975,17 +5988,15 @@
                                 deleteSubAssembliesInput.length === 0) {
                                 throw new KcBadArgumentException('Must specify at least one of: [createSubAssemblies, updateSubAssemblies, deleteSubAssemblies]');
                             }
-                            return [4 /*yield*/, this.keyService.getCurrentRootKey()];
-                        case 1:
-                            rootKey = _d.sent();
+                            rootKey = this.keyService.currentRootKey;
                             return [4 /*yield*/, this.keyGraph.getKey(assembly.subjectKey.id)];
-                        case 2:
+                        case 1:
                             subjectKey = _d.sent();
                             return [4 /*yield*/, this.prepareAssembly({
                                     rootKey: rootKey.jwk,
                                     subjectKey: subjectKey.jwk,
                                 })];
-                        case 3:
+                        case 2:
                             _b = _d.sent(), assemblyKey = _b.assemblyKey, rawAssemblyKey = _b.rawAssemblyKey, assemblyKeyParams = _b.assemblyKeyParams, assemblyInput = __rest(_b, ["assemblyKey", "rawAssemblyKey", "assemblyKeyParams"]);
                             tpIds = this.getAssemblyApprovers(assembly).concat(this.getInputApprovers(createSubAssembliesInput), this.getInputApprovers(updateSubAssembliesInput));
                             _c = mapEdges;
@@ -5995,7 +6006,7 @@
                                         ids: tpIds,
                                     },
                                 })];
-                        case 4:
+                        case 3:
                             tps = _c.apply(void 0, [(_d.sent()).tps]);
                             // Auto fill the updateSubAssemblies with existing sub assemblies if they are not
                             // explicitly deleted.
@@ -6026,19 +6037,19 @@
                             // Fill in wrappingKeyId if not present
                             this.fillWrappingKeyId(createSubAssembliesInput, tps);
                             this.fillWrappingKeyId(updateSubAssembliesInput, tps);
-                            _d.label = 5;
-                        case 5:
-                            _d.trys.push([5, 7, , 8]);
+                            _d.label = 4;
+                        case 4:
+                            _d.trys.push([4, 6, , 7]);
                             return [4 /*yield*/, this.prepareSlip39((createSubAssembliesInput || []).concat(updateSubAssembliesInput || []), input.quorum, rawAssemblyKey)];
-                        case 6:
+                        case 5:
                             slipAssembly = _d.sent();
-                            return [3 /*break*/, 8];
-                        case 7:
+                            return [3 /*break*/, 7];
+                        case 6:
                             error_1 = _d.sent();
                             // TODO this sometimes happens. Maybe missing await.
                             console.log('Error while creating slip assembly', error_1);
-                            return [3 /*break*/, 8];
-                        case 8:
+                            return [3 /*break*/, 7];
+                        case 7:
                             common = {
                                 assemblyKeyParams: assemblyKeyParams,
                                 subjectKey: subjectKey.jwk,
@@ -6046,15 +6057,15 @@
                             return [4 /*yield*/, this.prepareCreateSubAssemblies(Object.assign(Object.assign({}, common), { input: createSubAssembliesInput,
                                     // Need to match the slip sub assemblies to the input
                                     slipSubAssemblies: slipAssembly.subAssemblies.slice(0, createSubAssembliesInput.length) }))];
-                        case 9:
+                        case 8:
                             createSubAssemblies = _d.sent();
                             return [4 /*yield*/, this.prepareUpdateSubAssemblies(Object.assign(Object.assign({}, common), { input: updateSubAssembliesInput,
                                     // Add an offset to the sub assemblies to skip the one that are created.
                                     slipSubAssemblies: slipAssembly.subAssemblies.slice(createSubAssembliesInput.length), subAssemblies: assembly.subAssemblies }))];
-                        case 10:
+                        case 9:
                             updateSubAssemblies = _d.sent();
                             return [4 /*yield*/, this.encryptionService.encryptToString(subjectKey.jwk, (_a = input.subjectCipherDataClearJson) !== null && _a !== void 0 ? _a : assembly.subjectCipherDataClearJson)];
-                        case 11:
+                        case 10:
                             subjectCipherData = _d.sent();
                             return [2 /*return*/, {
                                     assemblyKey: assemblyKey,
@@ -6782,7 +6793,7 @@
                             _o.sent();
                             _o.label = 7;
                         case 7:
-                            this.keyService.populateKeys({
+                            this.keyService.setKeys({
                                 passKey: {
                                     id: resetUser.passKey.id,
                                 },
@@ -6964,7 +6975,7 @@
         };
         return LifeReadyAuthService;
     }());
-    LifeReadyAuthService.ɵprov = i0.ɵɵdefineInjectable({ factory: function LifeReadyAuthService_Factory() { return new LifeReadyAuthService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i4.AuthClass), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(KeyService), i0.ɵɵinject(ProfileService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(PasswordService), i0.ɵɵinject(IdleService), i0.ɵɵinject(exports.ɵf), i0.ɵɵinject(exports.ɵg), i0.ɵɵinject(PersistService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(exports.ɵi), i0.ɵɵinject(i2$1.HttpClient)); }, token: LifeReadyAuthService, providedIn: "root" });
+    LifeReadyAuthService.ɵprov = i0.ɵɵdefineInjectable({ factory: function LifeReadyAuthService_Factory() { return new LifeReadyAuthService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2.AuthClass), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(KeyService), i0.ɵɵinject(ProfileService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(PasswordService), i0.ɵɵinject(IdleService), i0.ɵɵinject(exports.ɵf), i0.ɵɵinject(exports.ɵg), i0.ɵɵinject(PersistService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(exports.ɵi), i0.ɵɵinject(i2$2.HttpClient)); }, token: LifeReadyAuthService, providedIn: "root" });
     LifeReadyAuthService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -6972,7 +6983,7 @@
     ];
     LifeReadyAuthService.ctorParameters = function () { return [
         { type: undefined, decorators: [{ type: i0.Inject, args: [KC_CONFIG,] }] },
-        { type: i4.AuthClass },
+        { type: i2.AuthClass },
         { type: KeyFactoryService },
         { type: KeyService },
         { type: ProfileService },
@@ -6984,140 +6995,995 @@
         { type: PersistService },
         { type: EncryptionService },
         { type: exports.ɵi },
-        { type: i2$1.HttpClient }
+        { type: i2$2.HttpClient }
     ]; };
 
-    (function (FileType) {
-        FileType["RecordContent"] = "record-content";
-        FileType["RecordAttachment"] = "record-attachment";
-    })(exports.FileType || (exports.FileType = {}));
-    var RecordContentFilter = JSON.stringify({
-        filter: [
-            {
-                contains: {
-                    fileType: exports.FileType.RecordContent,
-                },
-            },
-        ],
-    });
-    var RecordAttachmentFilter = JSON.stringify({
-        filter: [
-            {
-                contains: {
-                    fileType: exports.FileType.RecordAttachment,
-                },
+    var KeyContainer = /** @class */ (function () {
+        function KeyContainer(_key, timeout) {
+            var _this = this;
+            this._key = _key;
+            this.timer = setTimeout(function () {
+                _this._key = null;
+            }, timeout);
+        }
+        Object.defineProperty(KeyContainer.prototype, "key", {
+            get: function () {
+                return this._key;
             },
-        ],
+            enumerable: false,
+            configurable: true
+        });
+        /**
+         * Clears the reference to the key, clears the timer, return the key.
+         * It's important to call this function when the key is no longer needed because
+         * the anonymous function in setTimeout() holds a reference to "this", and hence
+         * keeps the "this._key" reference until the timer expired. So if we have used
+         * the key before it expired, we should clear the "this._key" reference immediately.
+         */
+        KeyContainer.prototype.pop = function () {
+            var ret = this._key;
+            this._key = null;
+            if (this.timer) {
+                clearTimeout(this.timer);
+                this.timer = null;
+            }
+            return ret;
+        };
+        return KeyContainer;
+    }());
+
+    var CurrentUserQuery$1 = gqlTyped(templateObject_1$d || (templateObject_1$d = __makeTemplateObject(["\nquery {\n  currentUser {\n    id\n    username\n    currentUserKey {\n      passKey {\n        id\n        passKeyParams\n        passIdpParams\n        wrappedPassIdpVerifierPrk\n        created\n      }\n      masterKey {\n        id\n      }\n      rootKey {\n        id\n      }\n      pxk {\n        id\n      }\n      sigPxk {\n        id\n      }\n    }\n    sessionEncryptionKey\n  }\n  keyGraph {\n    ...KeyGraphFragment\n  }\n}\n", "\n"], ["\nquery {\n  currentUser {\n    id\n    username\n    currentUserKey {\n      passKey {\n        id\n        passKeyParams\n        passIdpParams\n        wrappedPassIdpVerifierPrk\n        created\n      }\n      masterKey {\n        id\n      }\n      rootKey {\n        id\n      }\n      pxk {\n        id\n      }\n      sigPxk {\n        id\n      }\n    }\n    sessionEncryptionKey\n  }\n  keyGraph {\n    ...KeyGraphFragment\n  }\n}\n", "\n"])), KeyGraphFragment);
+    var ResetUserQuery = gqlTyped(templateObject_2$a || (templateObject_2$a = __makeTemplateObject(["\nquery ResetUserQuery {\n  tpPasswordResetUser {\n    username\n    sessionEncryptionKey\n    state\n    passKey {\n      id\n      passKeyParams\n      passIdpParams\n    }\n    masterKey {\n      id\n    }\n    pxk {\n      id\n    }\n    assembly {\n      singleReject\n      quorum\n      subAssemblies {\n        singleReject\n        quorum\n        approvers {\n          name\n          email\n          state\n        }\n      }\n    }\n    approvals {\n      id\n      modified\n      approverEmail\n      receiverCipher\n      receiverCipherPartialAssemblyKey\n    }\n    assemblyCipherData\n    wrappedAssemblyKeyVerifierPrk\n  }\n}"], ["\nquery ResetUserQuery {\n  tpPasswordResetUser {\n    username\n    sessionEncryptionKey\n    state\n    passKey {\n      id\n      passKeyParams\n      passIdpParams\n    }\n    masterKey {\n      id\n    }\n    pxk {\n      id\n    }\n    assembly {\n      singleReject\n      quorum\n      subAssemblies {\n        singleReject\n        quorum\n        approvers {\n          name\n          email\n          state\n        }\n      }\n    }\n    approvals {\n      id\n      modified\n      approverEmail\n      receiverCipher\n      receiverCipherPartialAssemblyKey\n    }\n    assemblyCipherData\n    wrappedAssemblyKeyVerifierPrk\n  }\n}"])));
+    var templateObject_1$d, templateObject_2$a;
+
+    var RecoveryStatus;
+    (function (RecoveryStatus) {
+        RecoveryStatus["NONE"] = "NONE";
+        RecoveryStatus["NEW_PASSWORD"] = "NEW_PASSWORD";
+        RecoveryStatus["OLD_PASSWORD"] = "OLD_PASSWORD";
+    })(RecoveryStatus || (RecoveryStatus = {}));
+    // TODO restrict this type
+    // export type AuthResetUser = TpPasswordResetUserNode;
+    var PasswordChangeStatus;
+    (function (PasswordChangeStatus) {
+        PasswordChangeStatus["IN_PROGRESS"] = "IN_PROGRESS";
+        PasswordChangeStatus["RECOVERY"] = "RECOVERY";
+    })(PasswordChangeStatus || (PasswordChangeStatus = {}));
+    var CognitoChallengeName;
+    (function (CognitoChallengeName) {
+        CognitoChallengeName["NEW_PASSWORD_REQUIRED"] = "NEW_PASSWORD_REQUIRED";
+        CognitoChallengeName["SMS_MFA"] = "SMS_MFA";
+        CognitoChallengeName["SOFTWARE_TOKEN_MFA"] = "SOFTWARE_TOKEN_MFA";
+        CognitoChallengeName["MFA_SETUP"] = "MFA_SETUP";
+    })(CognitoChallengeName || (CognitoChallengeName = {}));
+
+    var auth2_types = /*#__PURE__*/Object.freeze({
+        __proto__: null,
+        get RecoveryStatus () { return RecoveryStatus; },
+        get PasswordChangeStatus () { return PasswordChangeStatus; },
+        get CognitoChallengeName () { return CognitoChallengeName; }
     });
-    var GetRecordQuery = function (depth) {
-        if (depth === void 0) { depth = DEFAULT_BREADCRUMB_DEPTH; }
-        return gql__default['default'](templateObject_1$d || (templateObject_1$d = __makeTemplateObject(["\nquery Record(\n  $id: LrRelayIdInput!,\n  $cachedKeyIds: [LrRelayIdInput!],\n  $categoryFilter: LrJSONFilter,\n  $contentFilter: LrJSONFilter,\n  $attachmentsFilter: LrJSONFilter,\n) {\n  record: directory(id: $id) {\n    id\n    keyId\n    archived\n    plainMeta\n    cipherMeta\n    created\n    modified\n    confidentiality {\n      isConfidential\n      method\n    }\n    ", "\n    content: childFileLinks(plainMeta: $contentFilter) {\n      edges {\n        node {\n          childFile {\n            id\n            keyId\n            archived\n            currentVersion {\n              state {\n                id\n                keyId\n                plainMeta\n                cipherMeta\n                created\n                modified\n              }\n            }\n            versions {\n              edges {\n                node {\n                  operation\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n    attachments: childFileLinks(plainMeta: $attachmentsFilter) {\n      edges {\n        node {\n          childFile {\n            id\n            keyId\n            archived\n            currentVersion {\n              state {\n                id\n                keyId\n                plainMeta\n                cipherMeta\n                contentResource\n              }\n            }\n            versions {\n              edges {\n                node {\n                  operation\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n  keyGraph(cachedKeyIds: $cachedKeyIds) {\n    ...KeyGraphFragment\n  }\n}\n", "\n"], ["\nquery Record(\n  $id: LrRelayIdInput!,\n  $cachedKeyIds: [LrRelayIdInput!],\n  $categoryFilter: LrJSONFilter,\n  $contentFilter: LrJSONFilter,\n  $attachmentsFilter: LrJSONFilter,\n) {\n  record: directory(id: $id) {\n    id\n    keyId\n    archived\n    plainMeta\n    cipherMeta\n    created\n    modified\n    confidentiality {\n      isConfidential\n      method\n    }\n    ", "\n    content: childFileLinks(plainMeta: $contentFilter) {\n      edges {\n        node {\n          childFile {\n            id\n            keyId\n            archived\n            currentVersion {\n              state {\n                id\n                keyId\n                plainMeta\n                cipherMeta\n                created\n                modified\n              }\n            }\n            versions {\n              edges {\n                node {\n                  operation\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n    attachments: childFileLinks(plainMeta: $attachmentsFilter) {\n      edges {\n        node {\n          childFile {\n            id\n            keyId\n            archived\n            currentVersion {\n              state {\n                id\n                keyId\n                plainMeta\n                cipherMeta\n                contentResource\n              }\n            }\n            versions {\n              edges {\n                node {\n                  operation\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n  keyGraph(cachedKeyIds: $cachedKeyIds) {\n    ...KeyGraphFragment\n  }\n}\n", "\n"])), parentCategoriesField(depth), KeyGraphFragment);
-    };
-    var CreateRecordContainerMutation = gql__default['default'](templateObject_2$a || (templateObject_2$a = __makeTemplateObject(["\n  mutation CreateRecordContainer(\n    $plainMeta: LrJSONString\n    $cipherMeta: String\n    $parentDirectories: [ParentDirectoryInput!]\n    $parentRootDirectory: ParentRootDirectoryInput\n  ) {\n    new: createDirectory(\n      input: {\n        plainMeta: $plainMeta\n        cipherMeta: $cipherMeta\n        parentDirectories: $parentDirectories\n        parentRootDirectory: $parentRootDirectory\n      }\n    ) {\n      category: directory {\n        id\n        keyId\n      }\n    }\n  }\n"], ["\n  mutation CreateRecordContainer(\n    $plainMeta: LrJSONString\n    $cipherMeta: String\n    $parentDirectories: [ParentDirectoryInput!]\n    $parentRootDirectory: ParentRootDirectoryInput\n  ) {\n    new: createDirectory(\n      input: {\n        plainMeta: $plainMeta\n        cipherMeta: $cipherMeta\n        parentDirectories: $parentDirectories\n        parentRootDirectory: $parentRootDirectory\n      }\n    ) {\n      category: directory {\n        id\n        keyId\n      }\n    }\n  }\n"])));
-    var CreateRecordMutation = gql__default['default'](templateObject_3$8 || (templateObject_3$8 = __makeTemplateObject(["\n  mutation CreateFile($input: CreateFileInput!) {\n    createFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"], ["\n  mutation CreateFile($input: CreateFileInput!) {\n    createFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"])));
-    var UpdateRecordContainerMutation = gql__default['default'](templateObject_4$6 || (templateObject_4$6 = __makeTemplateObject(["\n  mutation UpdateRecord($input: UpdateDirectoryInput!) {\n    updateDirectory(input: $input) {\n      directory {\n        id\n      }\n    }\n  }\n"], ["\n  mutation UpdateRecord($input: UpdateDirectoryInput!) {\n    updateDirectory(input: $input) {\n      directory {\n        id\n      }\n    }\n  }\n"])));
-    var UpdateRecordMutation = gql__default['default'](templateObject_5$6 || (templateObject_5$6 = __makeTemplateObject(["\n  mutation UpdateFile($input: UpdateFileInput!) {\n    updateFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"], ["\n  mutation UpdateFile($input: UpdateFileInput!) {\n    updateFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"])));
-    var DeleteRecordMutation = gql__default['default'](templateObject_6$5 || (templateObject_6$5 = __makeTemplateObject(["\n  mutation DeleteRecord($recordId: LrRelayIdInput!) {\n    deleteDirectory(input: { directoryId: $recordId }) {\n      id\n    }\n  }\n"], ["\n  mutation DeleteRecord($recordId: LrRelayIdInput!) {\n    deleteDirectory(input: { directoryId: $recordId }) {\n      id\n    }\n  }\n"])));
-    var CreateFileMutation = gql__default['default'](templateObject_7$4 || (templateObject_7$4 = __makeTemplateObject(["\n  mutation CreateFile($input: CreateFileInput!) {\n    createFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"], ["\n  mutation CreateFile($input: CreateFileInput!) {\n    createFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"])));
-    var DeleteFileMutation = gql__default['default'](templateObject_8$4 || (templateObject_8$4 = __makeTemplateObject(["\n  mutation DeleteFile($fileId: LrRelayIdInput!) {\n    deleteFile(input: { fileId: $fileId }) {\n      id\n    }\n  }\n"], ["\n  mutation DeleteFile($fileId: LrRelayIdInput!) {\n    deleteFile(input: { fileId: $fileId }) {\n      id\n    }\n  }\n"])));
-    var templateObject_1$d, templateObject_2$a, templateObject_3$8, templateObject_4$6, templateObject_5$6, templateObject_6$5, templateObject_7$4, templateObject_8$4;
 
-    var CategoryService = /** @class */ (function () {
-        function CategoryService(lrApollo, keyMetaService, keyGraph) {
-            this.lrApollo = lrApollo;
-            this.keyMetaService = keyMetaService;
-            this.keyGraph = keyGraph;
+    var Auth2Service_1;
+    exports.Auth2Service = Auth2Service_1 = /** @class */ (function (_super) {
+        __extends(Auth2Service, _super);
+        function Auth2Service(ngZone, injector, http, cognito, api, keyService, keyGraphService, keyFactoryService, passwordService, idleService, persistService, encryptionService, assemblyController, kcConfig) {
+            var _this = _super.call(this, injector) || this;
+            _this.ngZone = ngZone;
+            _this.injector = injector;
+            _this.http = http;
+            _this.cognito = cognito;
+            _this.api = api;
+            _this.keyService = keyService;
+            _this.keyGraphService = keyGraphService;
+            _this.keyFactoryService = keyFactoryService;
+            _this.passwordService = passwordService;
+            _this.idleService = idleService;
+            _this.persistService = persistService;
+            _this.encryptionService = encryptionService;
+            _this.assemblyController = assemblyController;
+            _this.kcConfig = kcConfig;
+            // Could use rxjs observables here. But trying to have kc-client use as little angular
+            // features as possible. Rxjs is not used anywhere else in kc-client.
+            _this.logoutListeners = new Set();
+            // Stores the password for use after mfa verification to decrypt masterKey.
+            _this.password = null;
+            if (!i0.isDevMode()) {
+                if (_this.kcConfig.debug != null) {
+                    throw new KcBadRequestException('In production mode, "KcConfig.debug" must be set to null');
+                }
+            }
+            return _this;
         }
-        CategoryService.prototype.getRootDirectoryIds = function (input) {
-            if (input === void 0) { input = null; }
+        Auth2Service.prototype.importPassword = function (plainPassword) {
+            return this.keyFactoryService.importPassword(plainPassword);
+        };
+        Auth2Service.prototype.logout = function () {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var rootDirectories;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
-                        case 0: return [4 /*yield*/, this.lrApollo.query({
-                                query: GetRootDirectoryIdsQuery,
-                                variables: {
-                                    archived: input && input.archived,
-                                },
-                            })];
+                        case 0: 
+                        // Notify all listeners to clean up.
+                        return [4 /*yield*/, Promise.all(__spread(this.logoutListeners).map(function (callback) { return callback(); }))];
                         case 1:
-                            rootDirectories = (_b.sent()).rootDirectories;
-                            return [2 /*return*/, rootDirectories.edges.map(function (edge) { return edge.node.id; })];
+                            // Notify all listeners to clean up.
+                            _b.sent();
+                            this.user = null;
+                            this.keyService.purgeKeys();
+                            this.keyGraphService.purgeKeys();
+                            // Sign out on both cognito and kc-server
+                            return [4 /*yield*/, Promise.all([this.cognito.signOut(), this.kcLogout()])];
+                        case 2:
+                            // Sign out on both cognito and kc-server
+                            _b.sent();
+                            if ((_a = this.kcConfig.debug) === null || _a === void 0 ? void 0 : _a.username) {
+                                this.kcConfig.debug.username = null;
+                            }
+                            return [2 /*return*/];
                     }
                 });
             });
         };
-        CategoryService.prototype.getDefaultVault = function () {
+        Auth2Service.prototype.addLogoutListener = function (callback) {
+            this.logoutListeners.add(callback);
+        };
+        Auth2Service.prototype.removeLogoutListener = function (callback) {
+            this.logoutListeners.delete(callback);
+        };
+        Auth2Service.prototype.login = function (emailOrPhone, password, _b) {
+            var _c = _b === void 0 ? {} : _b, _d = _c.tpPasswordResetAutoComplete, tpPasswordResetAutoComplete = _d === void 0 ? true : _d;
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var list, defaultVaults;
+                var loginResult;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
-                        case 0: return [4 /*yield*/, this.lrApollo.query({
-                                query: GetVaultsQuery,
-                                variables: {
-                                    plainMetaFilter: DefaultVaultFilter,
-                                },
-                            })];
+                        case 0: return [4 /*yield*/, this.loginImpl(emailOrPhone, password)];
                         case 1:
-                            list = (_b.sent()).list;
-                            return [4 /*yield*/, this.mapVaults(list)];
-                        case 2:
-                            defaultVaults = _b.sent();
-                            if (defaultVaults.length > 1) {
-                                throw new KcBadStateException('There are more than one default vaults');
+                            loginResult = _b.sent();
+                            // Save the password for use after meeting challenge.
+                            if (loginResult.challenge) {
+                                this.password = new KeyContainer(password, Auth2Service_1.CHALLENGE_TIMEOUT);
+                                return [2 /*return*/, loginResult];
                             }
-                            return [2 /*return*/, defaultVaults[0] || null];
+                            if (!(tpPasswordResetAutoComplete &&
+                                ((_a = loginResult.user.resetUser) === null || _a === void 0 ? void 0 : _a.state) === exports.TpClaimState.APPROVED)) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this.completeResetRequest(password)];
+                        case 2:
+                            _b.sent();
+                            return [4 /*yield*/, this.loginImpl(emailOrPhone, password)];
+                        case 3:
+                            loginResult = _b.sent();
+                            _b.label = 4;
+                        case 4: return [2 /*return*/, loginResult];
                     }
                 });
             });
         };
-        CategoryService.prototype.getCategories = function (input) {
-            var _a;
+        Auth2Service.prototype.verifyLogin = function (options) {
             return __awaiter(this, void 0, void 0, function () {
-                var vaultDirectoryId, _b, res;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var challenge, code, rememberMe, VALID_CHALLENGE_NAMES, cognitoUser, user;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
-                            _b = (input === null || input === void 0 ? void 0 : input.vaultDirectoryId);
-                            if (_b) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.getDefaultVault()];
+                            challenge = options.challenge, code = options.code, rememberMe = options.rememberMe;
+                            VALID_CHALLENGE_NAMES = [
+                                CognitoChallengeName.SMS_MFA,
+                                CognitoChallengeName.SOFTWARE_TOKEN_MFA,
+                            ];
+                            if (!VALID_CHALLENGE_NAMES.includes(challenge.cognitoUser.challengeName)) {
+                                throw new KcBadRequestException("challengeName must be one of " + VALID_CHALLENGE_NAMES);
+                            }
+                            return [4 /*yield*/, this.cognito.confirmSignIn(challenge.cognitoUser, code, challenge.cognitoUser.challengeName)];
                         case 1:
-                            _b = ((_a = (_c.sent())) === null || _a === void 0 ? void 0 : _a.id);
-                            _c.label = 2;
+                            cognitoUser = _b.sent();
+                            return [4 /*yield*/, this.handlePostAuth(challenge.recoveryStatus)];
                         case 2:
-                            vaultDirectoryId = _b;
-                            if (!vaultDirectoryId) {
-                                console.error('There is no default vault.');
-                                return [2 /*return*/, []];
-                            }
-                            return [4 /*yield*/, this.lrApollo.query({
-                                    query: GetCategoriesQuery,
-                                    variables: {
-                                        vaultDirectoryId: vaultDirectoryId,
-                                        categoryFilter: CategoryFilter,
-                                        recordFilter: RecordFilter,
-                                        archived: input === null || input === void 0 ? void 0 : input.archived,
-                                    },
-                                })];
+                            _b.sent();
+                            return [4 /*yield*/, this.loadUser(cognitoUser, this.password.pop())];
                         case 3:
-                            res = _c.sent();
-                            return [2 /*return*/, this.mapCategories(res.directory.childDirectoryLinks)];
+                            user = _b.sent();
+                            // This is not strictly necessary since the this.password.pop() already clears the
+                            // password inside the container. But doesn't hurt either.
+                            this.password = null;
+                            if (rememberMe) {
+                                cognitoUser.setDeviceStatusRemembered({
+                                    onSuccess: function () {
+                                        return;
+                                    },
+                                    onFailure: function (e) { return console.error(e); },
+                                });
+                            }
+                            return [2 /*return*/, {
+                                    user: user,
+                                }];
                     }
                 });
             });
         };
-        CategoryService.prototype.getTrustedPartyCategories = function (trustedPartyId) {
+        Auth2Service.prototype.getUser = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var tp, _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0: return [4 /*yield*/, this.lrApollo.query({
-                                query: GetTrustedPartyCategoriesQuery,
-                                variables: {
-                                    trustedPartyId: trustedPartyId,
-                                    categoryFilter: CategoryFilter,
-                                    recordFilter: RecordFilter,
-                                    contentFilter: RecordContentFilter,
+                var cognitoUser;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (this.user) {
+                                return [2 /*return*/, this.user];
+                            }
+                            return [4 /*yield*/, this.cognito.currentAuthenticatedUser()];
+                        case 1:
+                            cognitoUser = _b.sent();
+                            return [2 /*return*/, this.loadUser(cognitoUser)];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.refreshAccessToken = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var cognitoUser, refreshToken;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.cognito.currentAuthenticatedUser()];
+                        case 1:
+                            cognitoUser = _b.sent();
+                            refreshToken = cognitoUser.getSignInUserSession().getRefreshToken();
+                            console.log('Token refresh...');
+                            return [2 /*return*/, new Promise(function (resolve, reject) {
+                                    cognitoUser.refreshSession(refreshToken, function (err) {
+                                        if (err) {
+                                            console.error('Error refreshing token: ', err);
+                                            reject(err);
+                                        }
+                                        else {
+                                            console.log('Token refresh complete');
+                                            resolve(0);
+                                        }
+                                    });
+                                })];
+                    }
+                });
+            });
+        };
+        // ----------------------------------------------------------------------------------------------------
+        // Helpers
+        // ----------------------------------------------------------------------------------------------------
+        Auth2Service.prototype.fetchCurrentUser = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.api.query({
+                                query: CurrentUserQuery$1,
+                                processorOptions: {
+                                    hasKeys: false,
+                                },
+                            })];
+                        case 1: return [2 /*return*/, (_b.sent()).currentUser];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.fetchResetUser = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.api.query({
+                                query: ResetUserQuery,
+                                processorOptions: {
+                                    hasKeys: false,
+                                },
+                            })];
+                        case 1: return [2 /*return*/, (_b.sent()).tpPasswordResetUser];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.kcLogout = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.http
+                                .post(this.kcConfig.authUrl + "auth/sign-out/", null, {
+                                withCredentials: true,
+                                responseType: 'text',
+                            })
+                                .toPromise()];
+                        case 1:
+                            _b.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.fetchPassIdpParams = function (emailOrPhone) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.http
+                                .get(this.kcConfig.authUrl + "users/pass-idp-params/?login_name=" + encodeURIComponent(emailOrPhone))
+                                .toPromise()];
+                        case 1: return [2 /*return*/, _b.sent()];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.loginImpl = function (emailOrPhone, password) {
+            return __awaiter(this, void 0, void 0, function () {
+                var loginIdpResult, user;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.logout()];
+                        case 1:
+                            _b.sent();
+                            return [4 /*yield*/, this.loginIdp(emailOrPhone, password)];
+                        case 2:
+                            loginIdpResult = _b.sent();
+                            // Can't get the user yet because we still ned to meet MFA challenges
+                            if ([
+                                CognitoChallengeName.SMS_MFA,
+                                CognitoChallengeName.SOFTWARE_TOKEN_MFA,
+                            ].includes(loginIdpResult.cognitoUser.challengeName)) {
+                                return [2 /*return*/, {
+                                        challenge: {
+                                            cognitoUser: loginIdpResult.cognitoUser,
+                                            recoveryStatus: loginIdpResult.recoveryStatus,
+                                        },
+                                    }];
+                            }
+                            return [4 /*yield*/, this.handlePostAuth(loginIdpResult.recoveryStatus)];
+                        case 3:
+                            _b.sent();
+                            return [4 /*yield*/, this.loadUser(loginIdpResult.cognitoUser, password)];
+                        case 4:
+                            user = _b.sent();
+                            return [2 /*return*/, {
+                                    user: user,
+                                }];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.loginIdp = function (emailOrPhone, password) {
+            return __awaiter(this, void 0, void 0, function () {
+                var passIdpApiResult, user_1, _b, error_1, user_2, _c, error_2, reset, user_3, _d, err_1, user, _e;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
+                        case 0: return [4 /*yield*/, this.fetchPassIdpParams(emailOrPhone)];
+                        case 1:
+                            passIdpApiResult = _f.sent();
+                            if (passIdpApiResult.passwordChangeStatus === PasswordChangeStatus.IN_PROGRESS) {
+                                throw new KcConcurrentAccessException('A password change is in progress');
+                            }
+                            if (!(passIdpApiResult.passwordChangeStatus === PasswordChangeStatus.RECOVERY)) return [3 /*break*/, 8];
+                            console.log('In recovery mode.');
+                            _f.label = 2;
+                        case 2:
+                            _f.trys.push([2, 4, , 5]);
+                            _b = {};
+                            return [4 /*yield*/, this.loginIdpImpl(emailOrPhone, password, passIdpApiResult.newPassIdpParams)];
+                        case 3:
+                            user_1 = (_b.cognitoUser = _f.sent(),
+                                _b.recoveryStatus = RecoveryStatus.NEW_PASSWORD,
+                                _b);
+                            // New password worked. Let's set to the current password
+                            // --Potential Failure Point 1--
+                            // if changePasswordComplete() doesn't get called, then it should remain
+                            console.log('New password works!');
+                            return [2 /*return*/, user_1];
+                        case 4:
+                            error_1 = _f.sent();
+                            // Just bubble up any other type of error.
+                            if (error_1.code !== 'NotAuthorizedException') {
+                                throw error_1;
+                            }
+                            return [3 /*break*/, 5];
+                        case 5:
+                            _f.trys.push([5, 7, , 8]);
+                            _c = {};
+                            return [4 /*yield*/, this.loginIdpImpl(emailOrPhone, password, passIdpApiResult.currentPassIdpParams)];
+                        case 6:
+                            user_2 = (_c.cognitoUser = _f.sent(),
+                                _c.recoveryStatus = RecoveryStatus.OLD_PASSWORD,
+                                _c);
+                            // Old password worked.
+                            console.log('Old password works!');
+                            return [2 /*return*/, user_2];
+                        case 7:
+                            error_2 = _f.sent();
+                            // Just bubble up any other type of error.
+                            throw error_2.code === 'NotAuthorizedException'
+                                ? new KcBadRequestException('The password change request was interrupted, please try to login with both your new and old password')
+                                : error_2;
+                        case 8:
+                            if (!passIdpApiResult.tpPasswordReset) return [3 /*break*/, 12];
+                            _f.label = 9;
+                        case 9:
+                            _f.trys.push([9, 11, , 12]);
+                            reset = passIdpApiResult.tpPasswordReset;
+                            _d = {};
+                            return [4 /*yield*/, this.loginIdpImpl(reset.resetUsername, password, reset.passIdpParams)];
+                        case 10:
+                            user_3 = (_d.cognitoUser = _f.sent(),
+                                _d.recoveryStatus = RecoveryStatus.NONE,
+                                _d);
+                            return [2 /*return*/, user_3];
+                        case 11:
+                            err_1 = _f.sent();
+                            return [3 /*break*/, 12];
+                        case 12:
+                            _e = {};
+                            return [4 /*yield*/, this.loginIdpImpl(emailOrPhone, password, passIdpApiResult.currentPassIdpParams)];
+                        case 13:
+                            user = (_e.cognitoUser = _f.sent(),
+                                _e.recoveryStatus = RecoveryStatus.NONE,
+                                _e);
+                            return [2 /*return*/, user];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.loginIdpImpl = function (emailOrPhone, password, passIdpParams) {
+            return __awaiter(this, void 0, void 0, function () {
+                var passIdpResult;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.keyFactoryService.derivePassIdp(Object.assign({ password: password }, passIdpParams))];
+                        case 1:
+                            passIdpResult = _b.sent();
+                            // Use the derived password to signin with cognito
+                            return [2 /*return*/, this.cognito.signIn(emailOrPhone, this.passwordService.getPassIdpString(passIdpResult.jwk))];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.handlePostAuth = function (recoveryStatus) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.handlePasswordRecovery(recoveryStatus)];
+                        case 1:
+                            _b.sent();
+                            return [4 /*yield*/, this.handleSessionEncryptionKey()];
+                        case 2:
+                            _b.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.handlePasswordRecovery = function (recoveryStatus) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (!(recoveryStatus !== RecoveryStatus.NONE)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.passwordService.changePasswordComplete({
+                                    useNewPassword: recoveryStatus === RecoveryStatus.NEW_PASSWORD,
+                                })];
+                        case 1:
+                            _b.sent();
+                            _b.label = 2;
+                        case 2: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.handleSessionEncryptionKey = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var msg, sessionEncryptionKey;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (!this.kcConfig.disableSessionEncryptionKey) return [3 /*break*/, 1];
+                            if (!i0.isDevMode()) {
+                                msg = 'You should not set disableSessionEncryptionKey=True in mode prod. It defaults to false.';
+                                console.error(msg);
+                                throw new KcInternalErrorException(msg);
+                            }
+                            else {
+                                console.warn('You have set disableSessionEncryptionKey=True. Make sure not to do this in prod mode.');
+                            }
+                            return [3 /*break*/, 4];
+                        case 1: return [4 /*yield*/, this.keyFactoryService.createKey()];
+                        case 2:
+                            sessionEncryptionKey = _b.sent();
+                            return [4 /*yield*/, this.lrGraphQL.lrMutate(new LrMutation({
+                                    mutation: SetSessionEncryptionKeyMutation,
+                                    variables: {
+                                        input: {
+                                            sessionEncryptionKey: JSON.stringify(sessionEncryptionKey.toJSON(true)),
+                                        },
+                                    },
+                                }), {
+                                    includeKeyGraph: false,
+                                })];
+                        case 3:
+                            _b.sent();
+                            this.persistService.setServerSessionEncryptionKey(sessionEncryptionKey);
+                            _b.label = 4;
+                        case 4: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.getCognitoUserAttribute = function (attributeName, userAttributes) {
+            var userAttribute = userAttributes.find(function (x) { return x.getName() === attributeName; });
+            return userAttribute ? userAttribute.getValue() : null;
+        };
+        Auth2Service.prototype.loadUserKeys = function (options) {
+            return __awaiter(this, void 0, void 0, function () {
+                var userKeys, password, sessionEncryptionKey, _b, _c, passKey, _d, _e;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
+                        case 0:
+                            userKeys = options.userKeys, password = options.password, sessionEncryptionKey = options.sessionEncryptionKey;
+                            if (!sessionEncryptionKey) return [3 /*break*/, 2];
+                            _c = (_b = this.persistService).setServerSessionEncryptionKey;
+                            return [4 /*yield*/, nodeJose.JWK.asKey(sessionEncryptionKey)];
+                        case 1:
+                            _c.apply(_b, [_f.sent()]);
+                            _f.label = 2;
+                        case 2:
+                            if (!password) return [3 /*break*/, 6];
+                            return [4 /*yield*/, this.keyFactoryService.derivePassKey(Object.assign({ password: password }, userKeys.passKey.passKeyParams))];
+                        case 3:
+                            passKey = (_f.sent()).jwk;
+                            _e = (_d = this.idleService).persistMasterKey;
+                            return [4 /*yield*/, this.keyGraphService.unwrapWithPassKey(userKeys.passKey.id, passKey, userKeys.masterKey.id)];
+                        case 4: return [4 /*yield*/, _e.apply(_d, [_f.sent()])];
+                        case 5:
+                            _f.sent();
+                            _f.label = 6;
+                        case 6: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.loadUser = function (cognitoUser, password) {
+            return __awaiter(this, void 0, void 0, function () {
+                var _b, _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            if (!cognitoUser.getUsername().endsWith(TP_PASSWORD_RESET_USERNAME_SUFFIX)) return [3 /*break*/, 2];
+                            _b = this;
+                            return [4 /*yield*/, this.loadResetUser(cognitoUser, password)];
+                        case 1:
+                            _b.user = _d.sent();
+                            return [3 /*break*/, 4];
+                        case 2:
+                            _c = this;
+                            return [4 /*yield*/, this.loadRegularUser(cognitoUser, password)];
+                        case 3:
+                            _c.user = _d.sent();
+                            _d.label = 4;
+                        case 4: return [4 /*yield*/, this.idleService.start()];
+                        case 5:
+                            _d.sent(); // Run idleService whenever user is logged in.
+                            return [2 /*return*/, this.user];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.loadRegularUser = function (cognitoUser, password) {
+            return __awaiter(this, void 0, void 0, function () {
+                var currentUser, username, userAttributes;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.fetchCurrentUser()];
+                        case 1:
+                            currentUser = _b.sent();
+                            return [4 /*yield*/, this.loadUserKeys({
+                                    userKeys: currentUser.currentUserKey,
+                                    password: password,
+                                    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 4:
+                            userAttributes = _b.sent();
+                            return [2 /*return*/, {
+                                    username: username,
+                                    sub: this.getCognitoUserAttribute('sub', userAttributes),
+                                    loginEmail: this.getCognitoUserAttribute('email', userAttributes),
+                                    resetUser: null,
+                                }];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.loadResetUser = function (cognitoUser, password) {
+            return __awaiter(this, void 0, void 0, function () {
+                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();
+                            userKeys = {
+                                passKey: {
+                                    id: resetUser.passKey.id,
+                                    passKeyParams: resetUser.passKey.passKeyParams,
+                                },
+                                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 4:
+                            userAttributes = _b.sent();
+                            return [2 /*return*/, {
+                                    username: username,
+                                    sub: this.getCognitoUserAttribute('sub', userAttributes),
+                                    loginEmail: this.getCognitoUserAttribute('email', userAttributes),
+                                    resetUser: {
+                                        state: resetUser.state,
+                                    },
+                                }];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.recoverAssemblyKey = function (resetUser) {
+            return __awaiter(this, void 0, void 0, function () {
+                var prk, partials;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.keyGraphService.getKey(resetUser.pxk.id)];
+                        case 1:
+                            prk = _b.sent();
+                            return [4 /*yield*/, Promise.all(resetUser.approvals
+                                    .filter(function (approval) { return !!approval.receiverCipherPartialAssemblyKey; })
+                                    .map(function (approval) { return _this.encryptionService.decrypt(prk, approval.receiverCipherPartialAssemblyKey); }))];
+                        case 2:
+                            partials = _b.sent();
+                            return [2 /*return*/, this.assemblyController.recoverAssemblyKey(partials)];
+                    }
+                });
+            });
+        };
+        Auth2Service.prototype.completeResetRequest = function (newPassword) {
+            return __awaiter(this, void 0, void 0, function () {
+                var resetUser, assemblyKey, rootKey, rootKeyJwk, masterKey, masterKeyWrappedRootKey, newPassIdpResult, newIdpPassword, challenge, assemblyKeyVerifierPrk, signedChallenge, tempIdpPassword, retPromise, user;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.fetchResetUser()];
+                        case 1:
+                            resetUser = _b.sent();
+                            if (resetUser.state !== exports.TpClaimState.APPROVED) {
+                                throw new KcBadStateException('Password reset request has not been approved.');
+                            }
+                            return [4 /*yield*/, this.recoverAssemblyKey(resetUser)];
+                        case 2:
+                            assemblyKey = _b.sent();
+                            return [4 /*yield*/, this.encryptionService.decrypt(assemblyKey, resetUser.assemblyCipherData)];
+                        case 3:
+                            rootKey = (_b.sent()).rootKey;
+                            return [4 /*yield*/, nodeJose.JWK.asKey(rootKey)];
+                        case 4:
+                            rootKeyJwk = _b.sent();
+                            return [4 /*yield*/, this.keyGraphService.getKey(resetUser.masterKey.id)];
+                        case 5:
+                            masterKey = _b.sent();
+                            return [4 /*yield*/, this.encryptionService.encryptToString(masterKey.jwk, rootKeyJwk.toJSON(true))];
+                        case 6:
+                            masterKeyWrappedRootKey = _b.sent();
+                            return [4 /*yield*/, this.keyFactoryService.derivePassIdp(Object.assign({ password: newPassword }, resetUser.passKey.passIdpParams))];
+                        case 7:
+                            newPassIdpResult = _b.sent();
+                            newIdpPassword = this.passwordService.getPassIdpString(newPassIdpResult.jwk);
+                            return [4 /*yield*/, this.lrGraphQL.lrMutate(new LrMutation({
+                                    mutation: CreateTpAssemblyKeyChallengeMutation,
+                                    variables: {
+                                        input: {},
+                                    },
+                                }), {
+                                    includeKeyGraph: false,
+                                })];
+                        case 8:
+                            challenge = (_b.sent()).createTpAssemblyKeyChallenge.challenge;
+                            // Sign the challenge
+                            // Generate a client side nonce that's no in the server's control.
+                            challenge.clientNonce = this.keyFactoryService.randomString(TP_PASSWORD_RESET_CLIENT_NONCE_LENGTH);
+                            return [4 /*yield*/, this.encryptionService.decrypt(assemblyKey, resetUser.wrappedAssemblyKeyVerifierPrk)];
+                        case 9:
+                            assemblyKeyVerifierPrk = _b.sent();
+                            return [4 /*yield*/, this.encryptionService.sign(assemblyKeyVerifierPrk, challenge)];
+                        case 10:
+                            signedChallenge = _b.sent();
+                            return [4 /*yield*/, this.lrGraphQL.lrMutate(new LrMutation({
+                                    mutation: PreCompleteTpPasswordResetRequestMutation,
+                                    variables: {
+                                        input: {
+                                            signedChallenge: JSON.stringify(signedChallenge),
+                                        },
+                                    },
+                                }), {
+                                    includeKeyGraph: false,
+                                })];
+                        case 11:
+                            tempIdpPassword = (_b.sent()).preCompleteTpPasswordResetRequest.idpPassword;
+                            retPromise = new Promise(function (resolve) {
+                                var listener = function (data) { return __awaiter(_this, void 0, void 0, function () {
+                                    return __generator(this, function (_b) {
+                                        switch (_b.label) {
+                                            case 0:
+                                                if (data.payload.event !== 'signIn') {
+                                                    return [2 /*return*/];
+                                                }
+                                                core$1.Hub.remove('auth', listener);
+                                                return [4 /*yield*/, this.cognito.signIn(resetUser.username, newIdpPassword)];
+                                            case 1:
+                                                _b.sent();
+                                                // Switch over to the new set of keys
+                                                return [4 /*yield*/, this.lrGraphQL.lrMutate(new LrMutation({
+                                                        mutation: CompleteTpPasswordResetRequestMutation,
+                                                        variables: {
+                                                            input: {
+                                                                masterKeyWrappedRootKey: masterKeyWrappedRootKey,
+                                                                masterKeyId: masterKey.id,
+                                                            },
+                                                        },
+                                                    }))];
+                                            case 2:
+                                                // Switch over to the new set of keys
+                                                _b.sent();
+                                                resolve();
+                                                return [2 /*return*/];
+                                        }
+                                    });
+                                }); };
+                                core$1.Hub.listen('auth', listener);
+                            });
+                            return [4 /*yield*/, this.cognito.signIn(resetUser.username, tempIdpPassword, {
+                                    noProxy: 'true',
+                                })];
+                        case 12:
+                            user = _b.sent();
+                            if (user.challengeName !== 'NEW_PASSWORD_REQUIRED') {
+                                throw new KcInternalErrorException('Expecting Cognito to have done a password reset after call to PreCompleteTpPasswordResetRequestMutation.');
+                            }
+                            return [4 /*yield*/, this.cognito.completeNewPassword(user, newIdpPassword, {})];
+                        case 13:
+                            // Set new password on Idp
+                            // the awsFetch() function passes NEW_PASSWORD_REQUIRED directly to AWS without
+                            // going through the proxy.
+                            user = _b.sent();
+                            return [2 /*return*/, retPromise];
+                    }
+                });
+            });
+        };
+        // ------------------------------------------------------
+        // Debug utilities
+        // ------------------------------------------------------
+        Auth2Service.prototype.debugLogin = function (username, password) {
+            // This will fail if debug is null. But when debug is null, this function
+            // should not be called.
+            this.kcConfig.debug.username = username;
+            return this.debugLoadUser(password);
+        };
+        Auth2Service.prototype.debugLoadUser = function (password) {
+            return __awaiter(this, void 0, void 0, function () {
+                var currentUser, username, currentUserKey, passKey, masterKey;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.fetchCurrentUser()];
+                        case 1:
+                            currentUser = _b.sent();
+                            username = currentUser.username, currentUserKey = currentUser.currentUserKey;
+                            return [4 /*yield*/, this.keyFactoryService.derivePassKey(Object.assign({ password: password }, currentUserKey.passKey.passKeyParams))];
+                        case 2:
+                            passKey = (_b.sent()).jwk;
+                            return [4 /*yield*/, this.keyGraphService.unwrapWithPassKey(currentUserKey.passKey.id, passKey, currentUserKey.masterKey.id)];
+                        case 3:
+                            masterKey = _b.sent();
+                            return [4 /*yield*/, this.idleService.persistMasterKey(masterKey)];
+                        case 4:
+                            _b.sent();
+                            return [4 /*yield*/, this.keyGraphService.populateKeys(currentUserKey)];
+                        case 5:
+                            _b.sent();
+                            this.user = {
+                                username: username,
+                                resetUser: null,
+                                sub: 'DEBUG_MODE',
+                                loginEmail: 'DEBUG_MODE',
+                            };
+                            return [2 /*return*/, this.user];
+                    }
+                });
+            });
+        };
+        /**
+         * Clears the caches user. So we can simulate a page refresh and test getUser().
+         */
+        Auth2Service.prototype.debugClearUser = function () {
+            this.user = null;
+        };
+        return Auth2Service;
+    }(LrService));
+    exports.Auth2Service.CHALLENGE_TIMEOUT = 1000 * 60 * 5;
+    exports.Auth2Service.ɵprov = i0.ɵɵdefineInjectable({ factory: function Auth2Service_Factory() { return new exports.Auth2Service(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(i2$2.HttpClient), i0.ɵɵinject(i2.AuthClass), i0.ɵɵinject(exports.ɵf), i0.ɵɵinject(KeyService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(PasswordService), i0.ɵɵinject(IdleService), i0.ɵɵinject(PersistService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(exports.ɵi), i0.ɵɵinject(KC_CONFIG)); }, token: exports.Auth2Service, providedIn: "root" });
+    exports.Auth2Service.decorators = [
+        { type: i0.Injectable, args: [{
+                    providedIn: 'root',
+                },] }
+    ];
+    exports.Auth2Service.ctorParameters = function () { return [
+        { type: i0.NgZone },
+        { type: i0.Injector },
+        { type: i2$2.HttpClient },
+        { type: i2.AuthClass },
+        { type: exports.ɵf },
+        { type: KeyService },
+        { type: KeyGraphService },
+        { type: KeyFactoryService },
+        { type: PasswordService },
+        { type: IdleService },
+        { type: PersistService },
+        { type: EncryptionService },
+        { type: exports.ɵi },
+        { type: undefined, decorators: [{ type: i0.Inject, args: [KC_CONFIG,] }] }
+    ]; };
+    exports.Auth2Service = Auth2Service_1 = __decorate([
+        RunOutsideAngular({
+            ngZoneName: 'ngZone',
+        })
+    ], exports.Auth2Service);
+
+    (function (FileType) {
+        FileType["RecordContent"] = "record-content";
+        FileType["RecordAttachment"] = "record-attachment";
+    })(exports.FileType || (exports.FileType = {}));
+    var RecordContentFilter = JSON.stringify({
+        filter: [
+            {
+                contains: {
+                    fileType: exports.FileType.RecordContent,
+                },
+            },
+        ],
+    });
+    var RecordAttachmentFilter = JSON.stringify({
+        filter: [
+            {
+                contains: {
+                    fileType: exports.FileType.RecordAttachment,
+                },
+            },
+        ],
+    });
+    var GetRecordQuery = function (depth) {
+        if (depth === void 0) { depth = DEFAULT_BREADCRUMB_DEPTH; }
+        return gql__default['default'](templateObject_1$e || (templateObject_1$e = __makeTemplateObject(["\nquery Record(\n  $id: LrRelayIdInput!,\n  $cachedKeyIds: [LrRelayIdInput!],\n  $categoryFilter: LrJSONFilter,\n  $contentFilter: LrJSONFilter,\n  $attachmentsFilter: LrJSONFilter,\n) {\n  record: directory(id: $id) {\n    id\n    keyId\n    archived\n    plainMeta\n    cipherMeta\n    created\n    modified\n    confidentiality {\n      isConfidential\n      method\n    }\n    ", "\n    content: childFileLinks(plainMeta: $contentFilter) {\n      edges {\n        node {\n          childFile {\n            id\n            keyId\n            archived\n            currentVersion {\n              state {\n                id\n                keyId\n                plainMeta\n                cipherMeta\n                created\n                modified\n              }\n            }\n            versions {\n              edges {\n                node {\n                  operation\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n    attachments: childFileLinks(plainMeta: $attachmentsFilter) {\n      edges {\n        node {\n          childFile {\n            id\n            keyId\n            archived\n            currentVersion {\n              state {\n                id\n                keyId\n                plainMeta\n                cipherMeta\n                contentResource\n              }\n            }\n            versions {\n              edges {\n                node {\n                  operation\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n  keyGraph(cachedKeyIds: $cachedKeyIds) {\n    ...KeyGraphFragment\n  }\n}\n", "\n"], ["\nquery Record(\n  $id: LrRelayIdInput!,\n  $cachedKeyIds: [LrRelayIdInput!],\n  $categoryFilter: LrJSONFilter,\n  $contentFilter: LrJSONFilter,\n  $attachmentsFilter: LrJSONFilter,\n) {\n  record: directory(id: $id) {\n    id\n    keyId\n    archived\n    plainMeta\n    cipherMeta\n    created\n    modified\n    confidentiality {\n      isConfidential\n      method\n    }\n    ", "\n    content: childFileLinks(plainMeta: $contentFilter) {\n      edges {\n        node {\n          childFile {\n            id\n            keyId\n            archived\n            currentVersion {\n              state {\n                id\n                keyId\n                plainMeta\n                cipherMeta\n                created\n                modified\n              }\n            }\n            versions {\n              edges {\n                node {\n                  operation\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n    attachments: childFileLinks(plainMeta: $attachmentsFilter) {\n      edges {\n        node {\n          childFile {\n            id\n            keyId\n            archived\n            currentVersion {\n              state {\n                id\n                keyId\n                plainMeta\n                cipherMeta\n                contentResource\n              }\n            }\n            versions {\n              edges {\n                node {\n                  operation\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n  keyGraph(cachedKeyIds: $cachedKeyIds) {\n    ...KeyGraphFragment\n  }\n}\n", "\n"])), parentCategoriesField(depth), KeyGraphFragment);
+    };
+    var CreateRecordContainerMutation = gql__default['default'](templateObject_2$b || (templateObject_2$b = __makeTemplateObject(["\n  mutation CreateRecordContainer(\n    $plainMeta: LrJSONString\n    $cipherMeta: String\n    $parentDirectories: [ParentDirectoryInput!]\n    $parentRootDirectory: ParentRootDirectoryInput\n  ) {\n    new: createDirectory(\n      input: {\n        plainMeta: $plainMeta\n        cipherMeta: $cipherMeta\n        parentDirectories: $parentDirectories\n        parentRootDirectory: $parentRootDirectory\n      }\n    ) {\n      category: directory {\n        id\n        keyId\n      }\n    }\n  }\n"], ["\n  mutation CreateRecordContainer(\n    $plainMeta: LrJSONString\n    $cipherMeta: String\n    $parentDirectories: [ParentDirectoryInput!]\n    $parentRootDirectory: ParentRootDirectoryInput\n  ) {\n    new: createDirectory(\n      input: {\n        plainMeta: $plainMeta\n        cipherMeta: $cipherMeta\n        parentDirectories: $parentDirectories\n        parentRootDirectory: $parentRootDirectory\n      }\n    ) {\n      category: directory {\n        id\n        keyId\n      }\n    }\n  }\n"])));
+    var CreateRecordMutation = gql__default['default'](templateObject_3$8 || (templateObject_3$8 = __makeTemplateObject(["\n  mutation CreateFile($input: CreateFileInput!) {\n    createFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"], ["\n  mutation CreateFile($input: CreateFileInput!) {\n    createFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"])));
+    var UpdateRecordContainerMutation = gql__default['default'](templateObject_4$6 || (templateObject_4$6 = __makeTemplateObject(["\n  mutation UpdateRecord($input: UpdateDirectoryInput!) {\n    updateDirectory(input: $input) {\n      directory {\n        id\n      }\n    }\n  }\n"], ["\n  mutation UpdateRecord($input: UpdateDirectoryInput!) {\n    updateDirectory(input: $input) {\n      directory {\n        id\n      }\n    }\n  }\n"])));
+    var UpdateRecordMutation = gql__default['default'](templateObject_5$6 || (templateObject_5$6 = __makeTemplateObject(["\n  mutation UpdateFile($input: UpdateFileInput!) {\n    updateFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"], ["\n  mutation UpdateFile($input: UpdateFileInput!) {\n    updateFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"])));
+    var DeleteRecordMutation = gql__default['default'](templateObject_6$5 || (templateObject_6$5 = __makeTemplateObject(["\n  mutation DeleteRecord($recordId: LrRelayIdInput!) {\n    deleteDirectory(input: { directoryId: $recordId }) {\n      id\n    }\n  }\n"], ["\n  mutation DeleteRecord($recordId: LrRelayIdInput!) {\n    deleteDirectory(input: { directoryId: $recordId }) {\n      id\n    }\n  }\n"])));
+    var CreateFileMutation = gql__default['default'](templateObject_7$4 || (templateObject_7$4 = __makeTemplateObject(["\n  mutation CreateFile($input: CreateFileInput!) {\n    createFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"], ["\n  mutation CreateFile($input: CreateFileInput!) {\n    createFile(input: $input) {\n      file {\n        id\n      }\n    }\n  }\n"])));
+    var DeleteFileMutation = gql__default['default'](templateObject_8$4 || (templateObject_8$4 = __makeTemplateObject(["\n  mutation DeleteFile($fileId: LrRelayIdInput!) {\n    deleteFile(input: { fileId: $fileId }) {\n      id\n    }\n  }\n"], ["\n  mutation DeleteFile($fileId: LrRelayIdInput!) {\n    deleteFile(input: { fileId: $fileId }) {\n      id\n    }\n  }\n"])));
+    var templateObject_1$e, templateObject_2$b, templateObject_3$8, templateObject_4$6, templateObject_5$6, templateObject_6$5, templateObject_7$4, templateObject_8$4;
+
+    var CategoryService = /** @class */ (function () {
+        function CategoryService(lrApollo, keyMetaService, keyGraph) {
+            this.lrApollo = lrApollo;
+            this.keyMetaService = keyMetaService;
+            this.keyGraph = keyGraph;
+        }
+        CategoryService.prototype.getRootDirectoryIds = function (input) {
+            if (input === void 0) { input = null; }
+            return __awaiter(this, void 0, void 0, function () {
+                var rootDirectories;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.lrApollo.query({
+                                query: GetRootDirectoryIdsQuery,
+                                variables: {
+                                    archived: input && input.archived,
+                                },
+                            })];
+                        case 1:
+                            rootDirectories = (_b.sent()).rootDirectories;
+                            return [2 /*return*/, rootDirectories.edges.map(function (edge) { return edge.node.id; })];
+                    }
+                });
+            });
+        };
+        CategoryService.prototype.getDefaultVault = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var list, defaultVaults;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.lrApollo.query({
+                                query: GetVaultsQuery,
+                                variables: {
+                                    plainMetaFilter: DefaultVaultFilter,
+                                },
+                            })];
+                        case 1:
+                            list = (_b.sent()).list;
+                            return [4 /*yield*/, this.mapVaults(list)];
+                        case 2:
+                            defaultVaults = _b.sent();
+                            if (defaultVaults.length > 1) {
+                                throw new KcBadStateException('There are more than one default vaults');
+                            }
+                            return [2 /*return*/, defaultVaults[0] || null];
+                    }
+                });
+            });
+        };
+        CategoryService.prototype.getCategories = function (input) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function () {
+                var vaultDirectoryId, _b, res;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            _b = (input === null || input === void 0 ? void 0 : input.vaultDirectoryId);
+                            if (_b) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.getDefaultVault()];
+                        case 1:
+                            _b = ((_a = (_c.sent())) === null || _a === void 0 ? void 0 : _a.id);
+                            _c.label = 2;
+                        case 2:
+                            vaultDirectoryId = _b;
+                            if (!vaultDirectoryId) {
+                                console.error('There is no default vault.');
+                                return [2 /*return*/, []];
+                            }
+                            return [4 /*yield*/, this.lrApollo.query({
+                                    query: GetCategoriesQuery,
+                                    variables: {
+                                        vaultDirectoryId: vaultDirectoryId,
+                                        categoryFilter: CategoryFilter,
+                                        recordFilter: RecordFilter,
+                                        archived: input === null || input === void 0 ? void 0 : input.archived,
+                                    },
+                                })];
+                        case 3:
+                            res = _c.sent();
+                            return [2 /*return*/, this.mapCategories(res.directory.childDirectoryLinks)];
+                    }
+                });
+            });
+        };
+        CategoryService.prototype.getTrustedPartyCategories = function (trustedPartyId) {
+            return __awaiter(this, void 0, void 0, function () {
+                var tp, _b;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0: return [4 /*yield*/, this.lrApollo.query({
+                                query: GetTrustedPartyCategoriesQuery,
+                                variables: {
+                                    trustedPartyId: trustedPartyId,
+                                    categoryFilter: CategoryFilter,
+                                    recordFilter: RecordFilter,
+                                    contentFilter: RecordContentFilter,
                                 },
                             })];
                         case 1:
@@ -7705,14 +8571,14 @@
         };
         return CategoryMetaService;
     }());
-    CategoryMetaService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CategoryMetaService_Factory() { return new CategoryMetaService(i0.ɵɵinject(i2$1.HttpClient), i0.ɵɵinject(CategoryService)); }, token: CategoryMetaService, providedIn: "root" });
+    CategoryMetaService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CategoryMetaService_Factory() { return new CategoryMetaService(i0.ɵɵinject(i2$2.HttpClient), i0.ɵɵinject(CategoryService)); }, token: CategoryMetaService, providedIn: "root" });
     CategoryMetaService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
     CategoryMetaService.ctorParameters = function () { return [
-        { type: i2$1.HttpClient },
+        { type: i2$2.HttpClient },
         { type: CategoryService }
     ]; };
 
@@ -7776,10 +8642,10 @@
         return Vault;
     }());
 
-    var CreateContactCardMutation$2 = gqlTyped(templateObject_1$e || (templateObject_1$e = __makeTemplateObject(["\nmutation CreateContactCardMutation(\n  $input: CreateContactCardInput!\n) {\n  createContactCard(input: $input) {\n    contactCard {\n      id\n    }\n  }\n}\n"], ["\nmutation CreateContactCardMutation(\n  $input: CreateContactCardInput!\n) {\n  createContactCard(input: $input) {\n    contactCard {\n      id\n    }\n  }\n}\n"])));
-    var UpdateContactCardMutation$2 = gqlTyped(templateObject_2$b || (templateObject_2$b = __makeTemplateObject(["\nmutation UpdateContactCardMutation($input: UpdateContactCardInput!) {\n  updateContactCard(input: $input) {\n    contactCard {\n      id\n    }\n  }\n}\n"], ["\nmutation UpdateContactCardMutation($input: UpdateContactCardInput!) {\n  updateContactCard(input: $input) {\n    contactCard {\n      id\n    }\n  }\n}\n"])));
+    var CreateContactCardMutation$2 = gqlTyped(templateObject_1$f || (templateObject_1$f = __makeTemplateObject(["\nmutation CreateContactCardMutation(\n  $input: CreateContactCardInput!\n) {\n  createContactCard(input: $input) {\n    contactCard {\n      id\n    }\n  }\n}\n"], ["\nmutation CreateContactCardMutation(\n  $input: CreateContactCardInput!\n) {\n  createContactCard(input: $input) {\n    contactCard {\n      id\n    }\n  }\n}\n"])));
+    var UpdateContactCardMutation$2 = gqlTyped(templateObject_2$c || (templateObject_2$c = __makeTemplateObject(["\nmutation UpdateContactCardMutation($input: UpdateContactCardInput!) {\n  updateContactCard(input: $input) {\n    contactCard {\n      id\n    }\n  }\n}\n"], ["\nmutation UpdateContactCardMutation($input: UpdateContactCardInput!) {\n  updateContactCard(input: $input) {\n    contactCard {\n      id\n    }\n  }\n}\n"])));
     var DeleteContactCardMutation$1 = gqlTyped(templateObject_3$9 || (templateObject_3$9 = __makeTemplateObject(["\nmutation DeleteContactCardMutation($input: DeleteContactCardInput!) {\n  deleteContactCard(input: $input) {\n    id\n  }\n}\n"], ["\nmutation DeleteContactCardMutation($input: DeleteContactCardInput!) {\n  deleteContactCard(input: $input) {\n    id\n  }\n}\n"])));
-    var templateObject_1$e, templateObject_2$b, templateObject_3$9;
+    var templateObject_1$f, templateObject_2$c, templateObject_3$9;
 
     var OwnerPlainDataJson = /** @class */ (function () {
         function OwnerPlainDataJson() {
@@ -7800,20 +8666,19 @@
                 var rootKey, key, wrappedKey, cipherData, params;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.keyService.getCurrentRootKey()];
-                        case 1:
-                            rootKey = _a.sent();
+                        case 0:
+                            rootKey = this.keyService.currentRootKey;
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 2:
+                        case 1:
                             key = _a.sent();
                             return [4 /*yield*/, this.keyGraph.encryptToString(rootKey.jwk, key.toJSON(true))];
-                        case 3:
+                        case 2:
                             wrappedKey = _a.sent();
                             return [4 /*yield*/, this.keyGraph.encryptToString(key, input.plainCipherDataJson)];
-                        case 4:
+                        case 3:
                             cipherData = _a.sent();
                             return [4 /*yield*/, this.prepareContactCardInput(input)];
-                        case 5:
+                        case 4:
                             params = _a.sent();
                             return [2 /*return*/, new LrMutation({
                                     mutation: CreateContactCardMutation$2,
@@ -7862,20 +8727,19 @@
                 var sigPxk, publicDataSig, _a, _b, publicSearchableSig, _c, _d, plainDataSig, _e, _f;
                 return __generator(this, function (_g) {
                     switch (_g.label) {
-                        case 0: return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 1:
-                            sigPxk = _g.sent();
+                        case 0:
+                            sigPxk = this.keyService.currentSigPxk;
                             _b = (_a = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, input.publicDataJson)];
-                        case 2:
+                        case 1:
                             publicDataSig = _b.apply(_a, [_g.sent()]);
                             _d = (_c = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, input.publicSearchableJson)];
-                        case 3:
+                        case 2:
                             publicSearchableSig = _d.apply(_c, [_g.sent()]);
                             _f = (_e = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, input.plainDataJson)];
-                        case 4:
+                        case 3:
                             plainDataSig = _f.apply(_e, [_g.sent()]);
                             return [2 /*return*/, {
                                     sigPxkId: sigPxk.id,
@@ -7989,7 +8853,7 @@
         };
         return FileUploadService;
     }());
-    FileUploadService.ɵprov = i0.ɵɵdefineInjectable({ factory: function FileUploadService_Factory() { return new FileUploadService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2$1.HttpClient), i0.ɵɵinject(i4.AuthClass)); }, token: FileUploadService, providedIn: "root" });
+    FileUploadService.ɵprov = i0.ɵɵdefineInjectable({ factory: function FileUploadService_Factory() { return new FileUploadService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2$2.HttpClient), i0.ɵɵinject(i2.AuthClass)); }, token: FileUploadService, providedIn: "root" });
     FileUploadService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -7997,15 +8861,15 @@
     ];
     FileUploadService.ctorParameters = function () { return [
         { type: undefined, decorators: [{ type: i0.Inject, args: [KC_CONFIG,] }] },
-        { type: i2$1.HttpClient },
-        { type: i4.AuthClass }
+        { type: i2$2.HttpClient },
+        { type: i2.AuthClass }
     ]; };
 
-    var LockFragment = gqlTyped(templateObject_1$f || (templateObject_1$f = __makeTemplateObject(["\nfragment LockFragment on LockField {\n  created\n  modified\n  version\n  expiryTime\n  state\n}"], ["\nfragment LockFragment on LockField {\n  created\n  modified\n  version\n  expiryTime\n  state\n}"])));
-    var UpdateLockMutation = gqlTyped(templateObject_2$c || (templateObject_2$c = __makeTemplateObject(["\nmutation UpdateLockMutation($input: UpdateLockInput!) {\n  updateLock(input: $input) {\n    lock {\n      ...LockFragment\n    }\n  }\n}\n", "\n"], ["\nmutation UpdateLockMutation($input: UpdateLockInput!) {\n  updateLock(input: $input) {\n    lock {\n      ...LockFragment\n    }\n  }\n}\n", "\n"])), LockFragment);
+    var LockFragment = gqlTyped(templateObject_1$g || (templateObject_1$g = __makeTemplateObject(["\nfragment LockFragment on LockField {\n  created\n  modified\n  version\n  expiryTime\n  state\n}"], ["\nfragment LockFragment on LockField {\n  created\n  modified\n  version\n  expiryTime\n  state\n}"])));
+    var UpdateLockMutation = gqlTyped(templateObject_2$d || (templateObject_2$d = __makeTemplateObject(["\nmutation UpdateLockMutation($input: UpdateLockInput!) {\n  updateLock(input: $input) {\n    lock {\n      ...LockFragment\n    }\n  }\n}\n", "\n"], ["\nmutation UpdateLockMutation($input: UpdateLockInput!) {\n  updateLock(input: $input) {\n    lock {\n      ...LockFragment\n    }\n  }\n}\n", "\n"])), LockFragment);
     var AcquireLockMutation = gqlTyped(templateObject_3$a || (templateObject_3$a = __makeTemplateObject(["\nmutation AcquireLockMutation($input: AcquireLockInput!) {\n  acquireLock(input: $input) {\n    lock {\n      ...LockFragment\n    }\n  }\n}\n", "\n"], ["\nmutation AcquireLockMutation($input: AcquireLockInput!) {\n  acquireLock(input: $input) {\n    lock {\n      ...LockFragment\n    }\n  }\n}\n", "\n"])), LockFragment);
     var ReleaseLockMutation = gqlTyped(templateObject_4$7 || (templateObject_4$7 = __makeTemplateObject(["\nmutation ReleaseLockMutation($input: ReleaseLockInput!) {\n  releaseLock(input: $input) {\n    lock {\n      ...LockFragment\n    }\n  }\n}\n", "\n"], ["\nmutation ReleaseLockMutation($input: ReleaseLockInput!) {\n  releaseLock(input: $input) {\n    lock {\n      ...LockFragment\n    }\n  }\n}\n", "\n"])), LockFragment);
-    var templateObject_1$f, templateObject_2$c, templateObject_3$a, templateObject_4$7;
+    var templateObject_1$g, templateObject_2$d, templateObject_3$a, templateObject_4$7;
 
     exports.LockService = /** @class */ (function (_super) {
         __extends(LockService, _super);
@@ -8067,8 +8931,8 @@
         })
     ], exports.LockService);
 
-    var CreateDirectoryMutation = gqlTyped(templateObject_1$g || (templateObject_1$g = __makeTemplateObject(["\nmutation CreateDirectoryMutation($input: CreateDirectoryInput!) {\n  createDirectory(input: $input) {\n    directory {\n      id\n      keyId\n    }\n  }\n}\n"], ["\nmutation CreateDirectoryMutation($input: CreateDirectoryInput!) {\n  createDirectory(input: $input) {\n    directory {\n      id\n      keyId\n    }\n  }\n}\n"])));
-    var UpdateDirectoryMutation = gqlTyped(templateObject_2$d || (templateObject_2$d = __makeTemplateObject(["\nmutation UpdateDirectoryMutation($input: UpdateDirectoryInput!) {\n  updateDirectory(input: $input) {\n    directory {\n      id\n      modified\n    }\n  }\n}\n"], ["\nmutation UpdateDirectoryMutation($input: UpdateDirectoryInput!) {\n  updateDirectory(input: $input) {\n    directory {\n      id\n      modified\n    }\n  }\n}\n"])));
+    var CreateDirectoryMutation = gqlTyped(templateObject_1$h || (templateObject_1$h = __makeTemplateObject(["\nmutation CreateDirectoryMutation($input: CreateDirectoryInput!) {\n  createDirectory(input: $input) {\n    directory {\n      id\n      keyId\n    }\n  }\n}\n"], ["\nmutation CreateDirectoryMutation($input: CreateDirectoryInput!) {\n  createDirectory(input: $input) {\n    directory {\n      id\n      keyId\n    }\n  }\n}\n"])));
+    var UpdateDirectoryMutation = gqlTyped(templateObject_2$e || (templateObject_2$e = __makeTemplateObject(["\nmutation UpdateDirectoryMutation($input: UpdateDirectoryInput!) {\n  updateDirectory(input: $input) {\n    directory {\n      id\n      modified\n    }\n  }\n}\n"], ["\nmutation UpdateDirectoryMutation($input: UpdateDirectoryInput!) {\n  updateDirectory(input: $input) {\n    directory {\n      id\n      modified\n    }\n  }\n}\n"])));
     var DeleteDirectoryMutation = gqlTyped(templateObject_3$b || (templateObject_3$b = __makeTemplateObject(["\nmutation DeleteDirectoryMutation($input: DeleteDirectoryInput!) {\n  deleteDirectory(input: $input) {\n    id\n  }\n}\n"], ["\nmutation DeleteDirectoryMutation($input: DeleteDirectoryInput!) {\n  deleteDirectory(input: $input) {\n    id\n  }\n}\n"])));
     var CreateFileMutation$1 = gqlTyped(templateObject_4$8 || (templateObject_4$8 = __makeTemplateObject(["\nmutation CreateFileMutation($input: CreateFileInput!) {\n  createFile(input: $input) {\n    file {\n      id\n      keyId\n    }\n  }\n}\n"], ["\nmutation CreateFileMutation($input: CreateFileInput!) {\n  createFile(input: $input) {\n    file {\n      id\n      keyId\n    }\n  }\n}\n"])));
     var UpdateFileMutation = gqlTyped(templateObject_5$7 || (templateObject_5$7 = __makeTemplateObject(["\nmutation UpdateFileMutation($input: UpdateFileInput!) {\n  updateFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"], ["\nmutation UpdateFileMutation($input: UpdateFileInput!) {\n  updateFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"])));
@@ -8084,17 +8948,17 @@
     var TempDirectoryQuery = gqlTyped(templateObject_15 || (templateObject_15 = __makeTemplateObject(["\nquery TempDirectoryQuery($plainMeta: LrJSONFilter!) {\n  rootDirectories(plainMeta: $plainMeta, first: 2, orderBy: \"created\") {\n    edges {\n      node {\n        id\n        keyId\n      }\n    }\n  }\n  lock {\n    version\n  }\n}\n"], ["\nquery TempDirectoryQuery($plainMeta: LrJSONFilter!) {\n  rootDirectories(plainMeta: $plainMeta, first: 2, orderBy: \"created\") {\n    edges {\n      node {\n        id\n        keyId\n      }\n    }\n  }\n  lock {\n    version\n  }\n}\n"])));
     var SetFileConfidentialMutation = gqlTyped(templateObject_16 || (templateObject_16 = __makeTemplateObject(["\nmutation SetFileConfidentialMutation($input: SetFileConfidentialInput!) {\n  setFileConfidential(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"], ["\nmutation SetFileConfidentialMutation($input: SetFileConfidentialInput!) {\n  setFileConfidential(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"])));
     var SetDirectoryConfidentialMutation = gqlTyped(templateObject_17 || (templateObject_17 = __makeTemplateObject(["\nmutation SetDirectoryConfidentialMutation($input: SetDirectoryConfidentialInput!) {\n  setDirectoryConfidential(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"], ["\nmutation SetDirectoryConfidentialMutation($input: SetDirectoryConfidentialInput!) {\n  setDirectoryConfidential(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"])));
-    var templateObject_1$g, templateObject_2$d, templateObject_3$b, templateObject_4$8, templateObject_5$7, templateObject_6$6, templateObject_7$5, templateObject_8$5, templateObject_9$3, templateObject_10$2, templateObject_11$1, templateObject_12$1, templateObject_13$1, templateObject_14, templateObject_15, templateObject_16, templateObject_17;
+    var templateObject_1$h, templateObject_2$e, templateObject_3$b, templateObject_4$8, templateObject_5$7, templateObject_6$6, templateObject_7$5, templateObject_8$5, templateObject_9$3, templateObject_10$2, templateObject_11$1, templateObject_12$1, templateObject_13$1, templateObject_14, templateObject_15, templateObject_16, templateObject_17;
 
-    var DirectoryKeyQuery = gqlTyped(templateObject_1$h || (templateObject_1$h = __makeTemplateObject(["\nquery DirectoryKeyQuery($id: LrRelayIdInput!) {\n  directory(id: $id) {\n    keyId\n  }\n}\n"], ["\nquery DirectoryKeyQuery($id: LrRelayIdInput!) {\n  directory(id: $id) {\n    keyId\n  }\n}\n"])));
-    var FileKeyQuery = gqlTyped(templateObject_2$e || (templateObject_2$e = __makeTemplateObject(["\nquery FileKeyQuery($id: LrRelayIdInput!) {\n  file(id: $id) {\n    keyId\n  }\n}\n"], ["\nquery FileKeyQuery($id: LrRelayIdInput!) {\n  file(id: $id) {\n    keyId\n  }\n}\n"])));
+    var DirectoryKeyQuery = gqlTyped(templateObject_1$i || (templateObject_1$i = __makeTemplateObject(["\nquery DirectoryKeyQuery($id: LrRelayIdInput!) {\n  directory(id: $id) {\n    keyId\n  }\n}\n"], ["\nquery DirectoryKeyQuery($id: LrRelayIdInput!) {\n  directory(id: $id) {\n    keyId\n  }\n}\n"])));
+    var FileKeyQuery = gqlTyped(templateObject_2$f || (templateObject_2$f = __makeTemplateObject(["\nquery FileKeyQuery($id: LrRelayIdInput!) {\n  file(id: $id) {\n    keyId\n  }\n}\n"], ["\nquery FileKeyQuery($id: LrRelayIdInput!) {\n  file(id: $id) {\n    keyId\n  }\n}\n"])));
     var FileStateKeyQuery = gqlTyped(templateObject_3$c || (templateObject_3$c = __makeTemplateObject(["\nquery FileStateKeyQuery($id: LrRelayIdInput!) {\n  fileState(id: $id) {\n    keyId\n  }\n}\n"], ["\nquery FileStateKeyQuery($id: LrRelayIdInput!) {\n  fileState(id: $id) {\n    keyId\n  }\n}\n"])));
-    var templateObject_1$h, templateObject_2$e, templateObject_3$c;
+    var templateObject_1$i, templateObject_2$f, templateObject_3$c;
 
     var Item2Service_1;
     exports.Item2Service = Item2Service_1 = /** @class */ (function (_super) {
         __extends(Item2Service, _super);
-        function Item2Service(ngZone, injector, fileUploadService, keyService, keyFactory, keyGraph, lockService, authService) {
+        function Item2Service(ngZone, injector, fileUploadService, keyService, keyFactory, keyGraph, lockService, auth2Service) {
             var _this = _super.call(this, injector) || this;
             _this.ngZone = ngZone;
             _this.injector = injector;
@@ -8103,10 +8967,10 @@
             _this.keyFactory = keyFactory;
             _this.keyGraph = keyGraph;
             _this.lockService = lockService;
-            _this.authService = authService;
+            _this.auth2Service = auth2Service;
             // Caching the temp directory.
             _this.tempDirectory = null;
-            _this.authService.addLogoutListener(function () { return _this.onLogout(); });
+            _this.auth2Service.addLogoutListener(function () { return _this.onLogout(); });
             return _this;
         }
         Item2Service.prototype.downloadFileContent = function (options) {
@@ -8792,7 +9656,7 @@
                         case 2:
                             parentDirectories = _e.sent();
                             if (!options.asRootDirectory) return [3 /*break*/, 4];
-                            rootKey = this.keyService.getCurrentRootKey();
+                            rootKey = this.keyService.currentRootKey;
                             _d = {
                                 wrappingKeyId: rootKey.id
                             };
@@ -8895,147 +9759,69 @@
             });
         };
         Item2Service.prototype.prepareChangeFileParents = function (options) {
-            return __awaiter(this, void 0, void 0, function () {
-                var fileKey, input;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
-                        case 0: return [4 /*yield*/, this.getFileKey(options.fileId, options.fileKeyId)];
-                        case 1:
-                            fileKey = _d.sent();
-                            return [4 /*yield*/, this.prepareChangeItemParents(options, fileKey.jwk)];
-                        case 2:
-                            input = _d.sent();
-                            return [2 /*return*/, Object.assign(Object.assign({}, input), { fileId: options.fileId })];
-                    }
-                });
-            });
-        };
-        Item2Service.prototype.onLogout = function () {
-            // Clear all cached data.
-            this.tempDirectory = null;
-        };
-        return Item2Service;
-    }(LrService));
-    exports.Item2Service.TEMP_DIRECTORY_PLAIN_META = { kcType: 'temp' };
-    exports.Item2Service.TEMP_DIRECTORY_PLAIN_META_FILTER = JSON.stringify({
-        filter: [
-            {
-                contains: Item2Service_1.TEMP_DIRECTORY_PLAIN_META,
-            },
-        ],
-    });
-    exports.Item2Service.ɵprov = i0.ɵɵdefineInjectable({ factory: function Item2Service_Factory() { return new exports.Item2Service(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(FileUploadService), i0.ɵɵinject(KeyService), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(exports.LockService), i0.ɵɵinject(LifeReadyAuthService)); }, token: exports.Item2Service, providedIn: "root" });
-    exports.Item2Service.decorators = [
-        { type: i0.Injectable, args: [{
-                    providedIn: 'root',
-                },] }
-    ];
-    exports.Item2Service.ctorParameters = function () { return [
-        { type: i0.NgZone },
-        { type: i0.Injector },
-        { type: FileUploadService },
-        { type: KeyService },
-        { type: KeyFactoryService },
-        { type: KeyGraphService },
-        { type: exports.LockService },
-        { type: LifeReadyAuthService }
-    ]; };
-    exports.Item2Service = Item2Service_1 = __decorate([
-        RunOutsideAngular({
-            ngZoneName: 'ngZone',
-        })
-    ], exports.Item2Service);
-
-    var KeyExchangeFields = "\n  id\n  token\n  state\n  mode\n  isInitiator\n  initiator {\n    id\n    username\n  }\n  responder {\n    id\n    username\n  }\n  created\n  modified\n  tokenExpiryTime\n  isExpired\n  initiatorRootKeyCipher\n  initiatorActionRequired\n  responderActionRequired\n  responderEmailAddress\n  otk {\n    state\n    otKeyParams\n    otKeyCipher\n    sharedKey {\n      id\n    }\n    mkSharedKey {\n      id\n    }\n    initiatorSigPxk {\n      id\n    }\n    responderSigPxk {\n      id\n    }\n    initiatorOneTimePbkCipher\n    responderPbkCipher\n}";
-    var UserSharedKeyFields = "\n  userSigPrk {\n    id\n  }\n  otherSigPbk {\n    id\n  }\n  sharedKey {\n    id\n  }\n  mkSharedKey {\n    id\n  }\n  mkPxk {\n    id\n    pbk\n  }\n  mkReshareRequestCipher\n  mkReshareResponseCipher\n  mkReshareRequestSent\n  mkReshareResponseSent\n";
-    var CurrentUserSharedKeyQuery = gql__default['default'](templateObject_1$i || (templateObject_1$i = __makeTemplateObject(["\nquery CurrentUserSharedKeyQuery(\n  $username: String\n  $userId: LrRelayIdInput\n  $cachedKeyIds: [LrRelayIdInput!]\n) {\n  currentUserSharedKey(\n    username: $username\n    userId: $userId\n  ) {\n    userSharedKey {\n      ", "\n    }\n  }\n  keyGraph(cachedKeyIds: $cachedKeyIds) {\n    ...KeyGraphFragment\n  }\n}\n", ""], ["\nquery CurrentUserSharedKeyQuery(\n  $username: String\n  $userId: LrRelayIdInput\n  $cachedKeyIds: [LrRelayIdInput!]\n) {\n  currentUserSharedKey(\n    username: $username\n    userId: $userId\n  ) {\n    userSharedKey {\n      ", "\n    }\n  }\n  keyGraph(cachedKeyIds: $cachedKeyIds) {\n    ...KeyGraphFragment\n  }\n}\n", ""])), UserSharedKeyFields, KeyGraphFragment);
-    var KeyExchangesQuery = gql__default['default'](templateObject_2$f || (templateObject_2$f = __makeTemplateObject(["\nquery KeyExchangeQuery(\n$orderBy: String\n$isExpired: Boolean\n$initiatorActionRequired: Boolean\n$responderActionRequired: Boolean\n$initiator: ID\n$responder: ID\n$state: String\n) {\nkeyExchanges(\n  orderBy: $orderBy\n  isExpired: $isExpired\n  initiatorActionRequired: $initiatorActionRequired\n  responderActionRequired: $responderActionRequired\n  initiator: $initiator\n  responder: $responder\n  state: $state\n) {\n  edges {\n    node {\n      ", "\n    }\n  }\n}\nkeyGraph {\n  ...KeyGraphFragment\n}\n}\n", "\n"], ["\nquery KeyExchangeQuery(\n$orderBy: String\n$isExpired: Boolean\n$initiatorActionRequired: Boolean\n$responderActionRequired: Boolean\n$initiator: ID\n$responder: ID\n$state: String\n) {\nkeyExchanges(\n  orderBy: $orderBy\n  isExpired: $isExpired\n  initiatorActionRequired: $initiatorActionRequired\n  responderActionRequired: $responderActionRequired\n  initiator: $initiator\n  responder: $responder\n  state: $state\n) {\n  edges {\n    node {\n      ", "\n    }\n  }\n}\nkeyGraph {\n  ...KeyGraphFragment\n}\n}\n", "\n"])), KeyExchangeFields, KeyGraphFragment);
-    var KeyExchangeQuery = gql__default['default'](templateObject_3$d || (templateObject_3$d = __makeTemplateObject(["\nquery KeyExchangeQuery(\n  $id: LrRelayIdInput!\n) {\n  keyExchange(\n    id: $id\n  ) {\n    ", "\n  }\n  keyGraph {\n    ...KeyGraphFragment\n  }\n}\n", "\n"], ["\nquery KeyExchangeQuery(\n  $id: LrRelayIdInput!\n) {\n  keyExchange(\n    id: $id\n  ) {\n    ", "\n  }\n  keyGraph {\n    ...KeyGraphFragment\n  }\n}\n", "\n"])), KeyExchangeFields, KeyGraphFragment);
-    // Key graph is only available for authenticated users. This query
-    // is for unauthenticated users.
-    var KeyExchangeTokenQuery = gql__default['default'](templateObject_4$9 || (templateObject_4$9 = __makeTemplateObject(["\nquery KeyExchangeQuery(\n  $id: LrRelayIdInput!\n  $token: String\n) {\n  keyExchange(\n    id: $id\n    token: $token\n  ) {\n    ", "\n  }\n}"], ["\nquery KeyExchangeQuery(\n  $id: LrRelayIdInput!\n  $token: String\n) {\n  keyExchange(\n    id: $id\n    token: $token\n  ) {\n    ", "\n  }\n}"])), KeyExchangeFields);
-    var InitiateOtkMutation = gql__default['default'](templateObject_5$8 || (templateObject_5$8 = __makeTemplateObject(["\nmutation InitiateKeyExchangeOtk(\n$input: InitiateKeyExchangeOtkInput!\n) {\ninitiateKeyExchangeOtk(input: $input) {\n  keyExchange {\n    ", "\n  }\n}\n", "\n}"], ["\nmutation InitiateKeyExchangeOtk(\n$input: InitiateKeyExchangeOtkInput!\n) {\ninitiateKeyExchangeOtk(input: $input) {\n  keyExchange {\n    ", "\n  }\n}\n", "\n}"])), KeyExchangeFields, FetchKeyGraphField);
-    var RespondOtkMutation = gql__default['default'](templateObject_6$7 || (templateObject_6$7 = __makeTemplateObject(["\nmutation RespondKeyExchangeOtk(\n  $input: RespondKeyExchangeOtkInput!\n) {\n  respondKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n    }\n  }\n}"], ["\nmutation RespondKeyExchangeOtk(\n  $input: RespondKeyExchangeOtkInput!\n) {\n  respondKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n    }\n  }\n}"])), KeyExchangeFields, UserSharedKeyFields);
-    var CompleteOtkMutation = gql__default['default'](templateObject_7$6 || (templateObject_7$6 = __makeTemplateObject(["\nmutation CompleteKeyExchangeOtk(\n  $input: CompleteKeyExchangeOtkInput!\n) {\n  completeKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n    }\n  }\n}"], ["\nmutation CompleteKeyExchangeOtk(\n  $input: CompleteKeyExchangeOtkInput!\n) {\n  completeKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n    }\n  }\n}"])), KeyExchangeFields, UserSharedKeyFields);
-    var templateObject_1$i, templateObject_2$f, templateObject_3$d, templateObject_4$9, templateObject_5$8, templateObject_6$7, templateObject_7$6;
-
-    var RequestUserDeleteMutation = gql__default['default'](templateObject_1$j || (templateObject_1$j = __makeTemplateObject(["\n  mutation RequestUserDelete($input: RequestUserDeleteInput!) {\n    requestUserDelete(input: $input) {\n      userDelete {\n        state\n        created\n      }\n    }\n  }\n"], ["\n  mutation RequestUserDelete($input: RequestUserDeleteInput!) {\n    requestUserDelete(input: $input) {\n      userDelete {\n        state\n        created\n      }\n    }\n  }\n"])));
-    var CancelUserDeleteMutation = gql__default['default'](templateObject_2$g || (templateObject_2$g = __makeTemplateObject(["\n  mutation CancelUserDelete($input: CancelUserDeleteInput!) {\n    cancelUserDelete(input: $input) {\n      id\n    }\n  }\n"], ["\n  mutation CancelUserDelete($input: CancelUserDeleteInput!) {\n    cancelUserDelete(input: $input) {\n      id\n    }\n  }\n"])));
-    var LoginHistoryQuery = gql__default['default'](templateObject_3$e || (templateObject_3$e = __makeTemplateObject(["\n  query LoginHistory($first: Int, $after: String) {\n    loginHistory(first: $first, after: $after) {\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      events\n    }\n  }\n"], ["\n  query LoginHistory($first: Int, $after: String) {\n    loginHistory(first: $first, after: $after) {\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      events\n    }\n  }\n"])));
-    var templateObject_1$j, templateObject_2$g, templateObject_3$e;
-
-    var UserService = /** @class */ (function () {
-        function UserService(lrApollo) {
-            this.lrApollo = lrApollo;
-        }
-        UserService.prototype.requestUserDelete = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                var res;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.lrApollo.mutate({
-                                mutation: RequestUserDeleteMutation,
-                                variables: {
-                                    input: {},
-                                },
-                            })];
-                        case 1:
-                            res = _a.sent();
-                            return [2 /*return*/, res.requestUserDelete.userDelete];
-                    }
-                });
-            });
-        };
-        UserService.prototype.cancelUserDelete = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                var res;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.lrApollo.mutate({
-                                mutation: CancelUserDeleteMutation,
-                                variables: {
-                                    input: {},
-                                },
-                            })];
-                        case 1:
-                            res = _a.sent();
-                            return [2 /*return*/, res.cancelUserDelete.id];
-                    }
-                });
-            });
-        };
-        UserService.prototype.loginHistory = function (first, after) {
-            if (first === void 0) { first = null; }
-            if (after === void 0) { after = null; }
-            return __awaiter(this, void 0, void 0, function () {
-                var res;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.lrApollo.query({
-                                query: LoginHistoryQuery,
-                                variables: {
-                                    first: first,
-                                    after: after,
-                                },
-                            })];
+            return __awaiter(this, void 0, void 0, function () {
+                var fileKey, input;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0: return [4 /*yield*/, this.getFileKey(options.fileId, options.fileKeyId)];
                         case 1:
-                            res = _a.sent();
-                            return [2 /*return*/, res.loginHistory];
+                            fileKey = _d.sent();
+                            return [4 /*yield*/, this.prepareChangeItemParents(options, fileKey.jwk)];
+                        case 2:
+                            input = _d.sent();
+                            return [2 /*return*/, Object.assign(Object.assign({}, input), { fileId: options.fileId })];
                     }
                 });
             });
         };
-        return UserService;
-    }());
-    UserService.ɵprov = i0.ɵɵdefineInjectable({ factory: function UserService_Factory() { return new UserService(i0.ɵɵinject(LrApolloService)); }, token: UserService, providedIn: "root" });
-    UserService.decorators = [
+        Item2Service.prototype.onLogout = function () {
+            // Clear all cached data.
+            this.tempDirectory = null;
+        };
+        return Item2Service;
+    }(LrService));
+    exports.Item2Service.TEMP_DIRECTORY_PLAIN_META = { kcType: 'temp' };
+    exports.Item2Service.TEMP_DIRECTORY_PLAIN_META_FILTER = JSON.stringify({
+        filter: [
+            {
+                contains: Item2Service_1.TEMP_DIRECTORY_PLAIN_META,
+            },
+        ],
+    });
+    exports.Item2Service.ɵprov = i0.ɵɵdefineInjectable({ factory: function Item2Service_Factory() { return new exports.Item2Service(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(FileUploadService), i0.ɵɵinject(KeyService), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(exports.LockService), i0.ɵɵinject(exports.Auth2Service)); }, token: exports.Item2Service, providedIn: "root" });
+    exports.Item2Service.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
-    UserService.ctorParameters = function () { return [
-        { type: LrApolloService }
+    exports.Item2Service.ctorParameters = function () { return [
+        { type: i0.NgZone },
+        { type: i0.Injector },
+        { type: FileUploadService },
+        { type: KeyService },
+        { type: KeyFactoryService },
+        { type: KeyGraphService },
+        { type: exports.LockService },
+        { type: exports.Auth2Service }
     ]; };
+    exports.Item2Service = Item2Service_1 = __decorate([
+        RunOutsideAngular({
+            ngZoneName: 'ngZone',
+        })
+    ], exports.Item2Service);
+
+    var KeyExchangeFields = "\n  id\n  token\n  state\n  mode\n  isInitiator\n  initiator {\n    id\n    username\n  }\n  responder {\n    id\n    username\n  }\n  created\n  modified\n  tokenExpiryTime\n  isExpired\n  initiatorRootKeyCipher\n  initiatorActionRequired\n  responderActionRequired\n  responderEmailAddress\n  otk {\n    state\n    otKeyParams\n    otKeyCipher\n    sharedKey {\n      id\n    }\n    mkSharedKey {\n      id\n    }\n    initiatorSigPxk {\n      id\n    }\n    responderSigPxk {\n      id\n    }\n    initiatorOneTimePbkCipher\n    responderPbkCipher\n}";
+    var UserSharedKeyFields = "\n  userSigPrk {\n    id\n  }\n  otherSigPbk {\n    id\n  }\n  sharedKey {\n    id\n  }\n  mkSharedKey {\n    id\n  }\n  mkPxk {\n    id\n    pbk\n  }\n  mkReshareRequestCipher\n  mkReshareResponseCipher\n  mkReshareRequestSent\n  mkReshareResponseSent\n";
+    var CurrentUserSharedKeyQuery = gql__default['default'](templateObject_1$j || (templateObject_1$j = __makeTemplateObject(["\nquery CurrentUserSharedKeyQuery(\n  $username: String\n  $userId: LrRelayIdInput\n  $cachedKeyIds: [LrRelayIdInput!]\n) {\n  currentUserSharedKey(\n    username: $username\n    userId: $userId\n  ) {\n    userSharedKey {\n      ", "\n    }\n  }\n  keyGraph(cachedKeyIds: $cachedKeyIds) {\n    ...KeyGraphFragment\n  }\n}\n", ""], ["\nquery CurrentUserSharedKeyQuery(\n  $username: String\n  $userId: LrRelayIdInput\n  $cachedKeyIds: [LrRelayIdInput!]\n) {\n  currentUserSharedKey(\n    username: $username\n    userId: $userId\n  ) {\n    userSharedKey {\n      ", "\n    }\n  }\n  keyGraph(cachedKeyIds: $cachedKeyIds) {\n    ...KeyGraphFragment\n  }\n}\n", ""])), UserSharedKeyFields, KeyGraphFragment);
+    var KeyExchangesQuery = gql__default['default'](templateObject_2$g || (templateObject_2$g = __makeTemplateObject(["\nquery KeyExchangeQuery(\n$orderBy: String\n$isExpired: Boolean\n$initiatorActionRequired: Boolean\n$responderActionRequired: Boolean\n$initiator: ID\n$responder: ID\n$state: String\n) {\nkeyExchanges(\n  orderBy: $orderBy\n  isExpired: $isExpired\n  initiatorActionRequired: $initiatorActionRequired\n  responderActionRequired: $responderActionRequired\n  initiator: $initiator\n  responder: $responder\n  state: $state\n) {\n  edges {\n    node {\n      ", "\n    }\n  }\n}\nkeyGraph {\n  ...KeyGraphFragment\n}\n}\n", "\n"], ["\nquery KeyExchangeQuery(\n$orderBy: String\n$isExpired: Boolean\n$initiatorActionRequired: Boolean\n$responderActionRequired: Boolean\n$initiator: ID\n$responder: ID\n$state: String\n) {\nkeyExchanges(\n  orderBy: $orderBy\n  isExpired: $isExpired\n  initiatorActionRequired: $initiatorActionRequired\n  responderActionRequired: $responderActionRequired\n  initiator: $initiator\n  responder: $responder\n  state: $state\n) {\n  edges {\n    node {\n      ", "\n    }\n  }\n}\nkeyGraph {\n  ...KeyGraphFragment\n}\n}\n", "\n"])), KeyExchangeFields, KeyGraphFragment);
+    var KeyExchangeQuery = gql__default['default'](templateObject_3$d || (templateObject_3$d = __makeTemplateObject(["\nquery KeyExchangeQuery(\n  $id: LrRelayIdInput!\n) {\n  keyExchange(\n    id: $id\n  ) {\n    ", "\n  }\n  keyGraph {\n    ...KeyGraphFragment\n  }\n}\n", "\n"], ["\nquery KeyExchangeQuery(\n  $id: LrRelayIdInput!\n) {\n  keyExchange(\n    id: $id\n  ) {\n    ", "\n  }\n  keyGraph {\n    ...KeyGraphFragment\n  }\n}\n", "\n"])), KeyExchangeFields, KeyGraphFragment);
+    // Key graph is only available for authenticated users. This query
+    // is for unauthenticated users.
+    var KeyExchangeTokenQuery = gql__default['default'](templateObject_4$9 || (templateObject_4$9 = __makeTemplateObject(["\nquery KeyExchangeQuery(\n  $id: LrRelayIdInput!\n  $token: String\n) {\n  keyExchange(\n    id: $id\n    token: $token\n  ) {\n    ", "\n  }\n}"], ["\nquery KeyExchangeQuery(\n  $id: LrRelayIdInput!\n  $token: String\n) {\n  keyExchange(\n    id: $id\n    token: $token\n  ) {\n    ", "\n  }\n}"])), KeyExchangeFields);
+    var InitiateOtkMutation = gql__default['default'](templateObject_5$8 || (templateObject_5$8 = __makeTemplateObject(["\nmutation InitiateKeyExchangeOtk(\n$input: InitiateKeyExchangeOtkInput!\n) {\ninitiateKeyExchangeOtk(input: $input) {\n  keyExchange {\n    ", "\n  }\n}\n", "\n}"], ["\nmutation InitiateKeyExchangeOtk(\n$input: InitiateKeyExchangeOtkInput!\n) {\ninitiateKeyExchangeOtk(input: $input) {\n  keyExchange {\n    ", "\n  }\n}\n", "\n}"])), KeyExchangeFields, FetchKeyGraphField);
+    var RespondOtkMutation = gql__default['default'](templateObject_6$7 || (templateObject_6$7 = __makeTemplateObject(["\nmutation RespondKeyExchangeOtk(\n  $input: RespondKeyExchangeOtkInput!\n) {\n  respondKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n    }\n  }\n}"], ["\nmutation RespondKeyExchangeOtk(\n  $input: RespondKeyExchangeOtkInput!\n) {\n  respondKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n    }\n  }\n}"])), KeyExchangeFields, UserSharedKeyFields);
+    var CompleteOtkMutation = gql__default['default'](templateObject_7$6 || (templateObject_7$6 = __makeTemplateObject(["\nmutation CompleteKeyExchangeOtk(\n  $input: CompleteKeyExchangeOtkInput!\n) {\n  completeKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n    }\n  }\n}"], ["\nmutation CompleteKeyExchangeOtk(\n  $input: CompleteKeyExchangeOtkInput!\n) {\n  completeKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n    }\n  }\n}"])), KeyExchangeFields, UserSharedKeyFields);
+    var templateObject_1$j, templateObject_2$g, templateObject_3$d, templateObject_4$9, templateObject_5$8, templateObject_6$7, templateObject_7$6;
 
     (function (OtkState) {
         OtkState["OTK_INITIATED"] = "OTK_INITIATED";
@@ -9044,13 +9830,12 @@
     })(exports.OtkState || (exports.OtkState = {}));
 
     var KeyExchangeService = /** @class */ (function () {
-        function KeyExchangeService(keyFactory, keyService, lrApollo, encryptionService, authService, userService) {
+        function KeyExchangeService(keyFactory, keyService, lrApollo, encryptionService, auth2Service) {
             this.keyFactory = keyFactory;
             this.keyService = keyService;
             this.lrApollo = lrApollo;
             this.encryptionService = encryptionService;
-            this.authService = authService;
-            this.userService = userService;
+            this.auth2Service = auth2Service;
             this.CLIENT_NONCE_LENGTH = 32;
         }
         KeyExchangeService.prototype.getKeyExchangeList = function (input) {
@@ -9128,28 +9913,26 @@
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
-                            if (!keyExchange.isInitiator) return [3 /*break*/, 8];
-                            return [4 /*yield*/, this.keyService.getCurrentRootKey()];
-                        case 1:
-                            rootKey = _d.sent();
+                            if (!keyExchange.isInitiator) return [3 /*break*/, 7];
+                            rootKey = this.keyService.currentRootKey;
                             return [4 /*yield*/, this.encryptionService.decrypt(rootKey.jwk, keyExchange.initiatorRootKeyCipher)];
-                        case 2:
+                        case 1:
                             plainInitiatorRootKeyCipher = (_d.sent());
                             if (!keyExchange.otk
-                                .initiatorOneTimePbkCipher) return [3 /*break*/, 6];
+                                .initiatorOneTimePbkCipher) return [3 /*break*/, 5];
                             _b = this.decryptResponseCipher;
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorRootKeyCipher.otKey)];
-                        case 3:
+                        case 2:
                             _c = [_d.sent()];
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorRootKeyCipher.oneTimePrk)];
-                        case 4: return [4 /*yield*/, _b.apply(this, _c.concat([_d.sent(), keyExchange.otk.initiatorOneTimePbkCipher]))];
-                        case 5:
+                        case 3: return [4 /*yield*/, _b.apply(this, _c.concat([_d.sent(), keyExchange.otk.initiatorOneTimePbkCipher]))];
+                        case 4:
                             _a = _d.sent();
-                            return [3 /*break*/, 7];
-                        case 6:
+                            return [3 /*break*/, 6];
+                        case 5:
                             _a = null;
-                            _d.label = 7;
-                        case 7:
+                            _d.label = 6;
+                        case 6:
                             plainInitiatorOneTimePbkCipher = _a;
                             responder = plainInitiatorOneTimePbkCipher &&
                                 plainInitiatorOneTimePbkCipher.responder;
@@ -9159,8 +9942,8 @@
                                         : null, myContactCard: initiator && initiator.contactCard
                                         ? initiator.contactCard.plainSharedCipherDataJson
                                         : null, myMessage: initiator && initiator.message })];
-                        case 8: return [4 /*yield*/, this.decryptOtk(keyExchange, otKeyK)];
-                        case 9:
+                        case 7: return [4 /*yield*/, this.decryptOtk(keyExchange, otKeyK)];
+                        case 8:
                             decryptedOtk = _d.sent();
                             initiator = decryptedOtk && decryptedOtk.plainOtKeyCipher.initiator;
                             return [2 /*return*/, Object.assign(Object.assign({}, keyExchange), { decryptedOtk: decryptedOtk, message: initiator && initiator.message, contactCard: initiator &&
@@ -9206,19 +9989,17 @@
                         case 2:
                             if (!(keyExchange.otk.state === exports.OtkState.OTK_INITIATED &&
                                 !keyExchange.isInitiator &&
-                                keyExchange.otk.responderPbkCipher)) return [3 /*break*/, 6];
-                            return [4 /*yield*/, this.keyService.getCurrentPxk()];
-                        case 3:
-                            prk = _a.sent();
+                                keyExchange.otk.responderPbkCipher)) return [3 /*break*/, 5];
+                            prk = this.keyService.currentPxk;
                             return [4 /*yield*/, this.encryptionService.decrypt(prk.jwk, JSON.parse(keyExchange.otk.responderPbkCipher), {
                                     serializations: [JoseSerialization.COMPACT],
                                 })];
-                        case 4:
+                        case 3:
                             decryptedCipher = _a.sent();
-                            if (!decryptedCipher.otKey) return [3 /*break*/, 6];
+                            if (!decryptedCipher.otKey) return [3 /*break*/, 5];
                             return [4 /*yield*/, KeyFactoryService.asKey(decryptedCipher.otKey)];
-                        case 5: return [2 /*return*/, _a.sent()];
-                        case 6: return [2 /*return*/, null];
+                        case 4: return [2 /*return*/, _a.sent()];
+                        case 5: return [2 /*return*/, null];
                     }
                 });
             });
@@ -9233,26 +10014,22 @@
                         case 1:
                             otKey = _c.sent();
                             nonce = this.keyFactory.randomString(this.CLIENT_NONCE_LENGTH);
-                            return [4 /*yield*/, this.authService.getUser()];
+                            return [4 /*yield*/, this.auth2Service.getUser()];
                         case 2:
                             user = _c.sent();
                             return [4 /*yield*/, this.keyFactory.createPkcKey()];
                         case 3:
                             initiatorOneTimePrk = _c.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentPxk()];
-                        case 4:
-                            initiatorPrk = _c.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 5:
-                            initiatorSigPrk = _c.sent();
+                            initiatorPrk = this.keyService.currentPxk;
+                            initiatorSigPrk = this.keyService.currentSigPxk;
                             initiatorPlainDataSig = null;
-                            if (!(contactCard && contactCard.ownerPlainData)) return [3 /*break*/, 7];
+                            if (!(contactCard && contactCard.ownerPlainData)) return [3 /*break*/, 5];
                             _b = (_a = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(initiatorSigPrk.jwk, contactCard.ownerPlainData)];
-                        case 6:
+                        case 4:
                             initiatorPlainDataSig = _b.apply(_a, [_c.sent()]);
-                            _c.label = 7;
-                        case 7:
+                            _c.label = 5;
+                        case 5:
                             initiator = {
                                 message: message,
                                 contactCard: contactCard
@@ -9268,7 +10045,7 @@
                                     } }),
                             };
                             return [4 /*yield*/, this.encryptionService.encrypt(otKey, plainOtKeyCipher)];
-                        case 8:
+                        case 6:
                             otKeyCipher = _c.sent();
                             plainInitiatorRootKeyCipher = {
                                 nonce: nonce,
@@ -9284,11 +10061,9 @@
                                 initiatorContactCard: contactCard,
                                 initiator: initiator,
                             };
-                            return [4 /*yield*/, this.keyService.getCurrentRootKey()];
-                        case 9:
-                            rootKey = _c.sent();
+                            rootKey = this.keyService.currentRootKey;
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, plainInitiatorRootKeyCipher)];
-                        case 10:
+                        case 7:
                             initiatorRootKeyCipher = _c.sent();
                             otKeyK = otKey.toJSON(true).k;
                             return [4 /*yield*/, this.lrApollo.mutate({
@@ -9314,7 +10089,7 @@
                                         },
                                     },
                                 })];
-                        case 11:
+                        case 8:
                             initiateKeyExchangeOtk = (_c.sent()).initiateKeyExchangeOtk;
                             return [2 /*return*/, { keyExchange: initiateKeyExchangeOtk.keyExchange, otKeyK: otKeyK }];
                     }
@@ -9324,51 +10099,42 @@
         KeyExchangeService.prototype.respondOtk = function (_a) {
             var id = _a.id, token = _a.token, decryptedOtk = _a.decryptedOtk, message = _a.message, initiatorContactCard = _a.initiatorContactCard, sentContactCard = _a.responderContactCard;
             return __awaiter(this, void 0, void 0, function () {
-                var user, rootKey, masterKeyId, masterKey, sharedKey, mkSharedKey, rkWrappedSharedKey, mkWrappedMkSharedKey, initiatorOneTimePbk, initiatorPbk, initiatorSigPbk, responderPrk, responderSigPrk, signedInitiatorPbk, signedInitiatorSigPbk, plainInitiatorOneTimePbkCipher, receivedCardInput, plainSharedCipherDataJson, receiverKey, ccSharedKey, sigPxk, _a, _b, _c, _d, _e, _f, _g, _h, sharedCipherData, _j, _k, _l, sentCardInput, ownerKey, ccSharedKey, sigPxk, _m, _o, _p, _q, _r, _s, _t, _u, sharedCipherData, _v, _w, _x, _y, _z, _0, initiatorOneTimePbkCipher, respondKeyExchangeOtk;
+                var user, rootKey, masterKey, sharedKey, mkSharedKey, rkWrappedSharedKey, mkWrappedMkSharedKey, initiatorOneTimePbk, initiatorPbk, initiatorSigPbk, responderPrk, responderSigPrk, signedInitiatorPbk, signedInitiatorSigPbk, plainInitiatorOneTimePbkCipher, receivedCardInput, plainSharedCipherDataJson, receiverKey, ccSharedKey, sigPxk, _a, _b, _c, _d, _e, _f, _g, _h, sharedCipherData, _j, _k, _l, sentCardInput, ownerKey, ccSharedKey, sigPxk, _m, _o, _p, _q, _r, _s, _t, _u, sharedCipherData, _v, _w, _x, _y, _z, _0, initiatorOneTimePbkCipher, respondKeyExchangeOtk;
                 return __generator(this, function (_1) {
                     switch (_1.label) {
-                        case 0: return [4 /*yield*/, this.authService.getUser()];
+                        case 0: return [4 /*yield*/, this.auth2Service.getUser()];
                         case 1:
                             user = _1.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentRootKey()];
-                        case 2:
-                            rootKey = _1.sent();
-                            masterKeyId = this.keyService.getCurrentMasterKey().id;
-                            return [4 /*yield*/, this.keyService.getCurrentMasterKey()];
-                        case 3:
-                            masterKey = _1.sent();
+                            rootKey = this.keyService.currentRootKey;
+                            masterKey = this.keyService.currentMasterKey;
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 4:
+                        case 2:
                             sharedKey = _1.sent();
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 5:
+                        case 3:
                             mkSharedKey = _1.sent();
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, sharedKey.toJSON(true))];
-                        case 6:
+                        case 4:
                             rkWrappedSharedKey = _1.sent();
                             return [4 /*yield*/, this.encryptionService.encrypt(masterKey.jwk, mkSharedKey.toJSON(true))];
-                        case 7:
+                        case 5:
                             mkWrappedMkSharedKey = _1.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(decryptedOtk.plainOtKeyCipher.initiator.oneTimePbk)];
-                        case 8:
+                        case 6:
                             initiatorOneTimePbk = _1.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(decryptedOtk.plainOtKeyCipher.initiator.pbk)];
-                        case 9:
+                        case 7:
                             initiatorPbk = _1.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(decryptedOtk.plainOtKeyCipher.initiator.sigPbk)];
-                        case 10:
+                        case 8:
                             initiatorSigPbk = _1.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentPxk()];
-                        case 11:
-                            responderPrk = _1.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 12:
-                            responderSigPrk = _1.sent();
+                            responderPrk = this.keyService.currentPxk;
+                            responderSigPrk = this.keyService.currentSigPxk;
                             return [4 /*yield*/, this.encryptionService.sign(responderSigPrk.jwk, initiatorPbk.toJSON())];
-                        case 13:
+                        case 9:
                             signedInitiatorPbk = _1.sent();
                             return [4 /*yield*/, this.encryptionService.sign(responderSigPrk.jwk, initiatorSigPbk.toJSON())];
-                        case 14:
+                        case 10:
                             signedInitiatorSigPbk = _1.sent();
                             plainInitiatorOneTimePbkCipher = {
                                 nonce: decryptedOtk.plainOtKeyCipher.nonce,
@@ -9383,109 +10149,105 @@
                                     message: message,
                                 },
                             };
-                            if (!decryptedOtk.plainOtKeyCipher.initiator.contactCard) return [3 /*break*/, 25];
+                            if (!decryptedOtk.plainOtKeyCipher.initiator.contactCard) return [3 /*break*/, 20];
                             plainSharedCipherDataJson = decryptedOtk.plainOtKeyCipher.initiator.contactCard
                                 .plainSharedCipherDataJson;
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 15:
+                        case 11:
                             receiverKey = _1.sent();
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 16:
+                        case 12:
                             ccSharedKey = _1.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 17:
-                            sigPxk = _1.sent();
+                            sigPxk = this.keyService.currentSigPxk;
                             _a = {};
                             _c = (_b = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, receiverKey.toJSON(true))];
-                        case 18:
+                        case 13:
                             _a.receiverWrappedKey = _c.apply(_b, [_1.sent()]),
                                 _a.receiverWrappingKeyId = rootKey.id;
-                            if (!initiatorContactCard) return [3 /*break*/, 20];
+                            if (!initiatorContactCard) return [3 /*break*/, 15];
                             _f = (_e = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(receiverKey, initiatorContactCard.plainReceiverCipherDataJson)];
-                        case 19:
+                        case 14:
                             _d = _f.apply(_e, [_1.sent()]);
-                            return [3 /*break*/, 21];
-                        case 20:
+                            return [3 /*break*/, 16];
+                        case 15:
                             _d = '';
-                            _1.label = 21;
-                        case 21:
+                            _1.label = 16;
+                        case 16:
                             _a.receiverCipherData = _d;
                             _h = (_g = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(sharedKey, ccSharedKey.toJSON(true))];
-                        case 22:
+                        case 17:
                             receivedCardInput = (_a.sharedWrappedKey = _h.apply(_g, [_1.sent()]),
                                 _a);
                             return [4 /*yield*/, this.encryptionService.encrypt(ccSharedKey, plainSharedCipherDataJson)];
-                        case 23:
+                        case 18:
                             sharedCipherData = _1.sent();
                             _j = receivedCardInput;
                             _l = (_k = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, sharedCipherData)];
-                        case 24:
+                        case 19:
                             _j.sharedCipherDataSig = _l.apply(_k, [_1.sent()]);
                             receivedCardInput.sigPxkId = sigPxk.id;
                             plainInitiatorOneTimePbkCipher.responder.contactCard = Object.assign(Object.assign({}, plainInitiatorOneTimePbkCipher.responder.contactCard), { sharedCipherKey: ccSharedKey.toJSON(true) });
-                            _1.label = 25;
-                        case 25:
-                            if (!sentContactCard) return [3 /*break*/, 38];
+                            _1.label = 20;
+                        case 20:
+                            if (!sentContactCard) return [3 /*break*/, 32];
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 26:
+                        case 21:
                             ownerKey = _1.sent();
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 27:
+                        case 22:
                             ccSharedKey = _1.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 28:
-                            sigPxk = _1.sent();
+                            sigPxk = this.keyService.currentSigPxk;
                             _m = {};
                             _p = (_o = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, ownerKey.toJSON(true))];
-                        case 29:
+                        case 23:
                             _m.ownerWrappedKey = _p.apply(_o, [_1.sent()]),
                                 _m.ownerWrappingKeyId = rootKey.id;
-                            if (!sentContactCard.plainOwnerCipherDataJson) return [3 /*break*/, 31];
+                            if (!sentContactCard.plainOwnerCipherDataJson) return [3 /*break*/, 25];
                             _s = (_r = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(ownerKey, sentContactCard.plainOwnerCipherDataJson)];
-                        case 30:
+                        case 24:
                             _q = _s.apply(_r, [_1.sent()]);
-                            return [3 /*break*/, 32];
-                        case 31:
+                            return [3 /*break*/, 26];
+                        case 25:
                             _q = '';
-                            _1.label = 32;
-                        case 32:
+                            _1.label = 26;
+                        case 26:
                             _m.ownerCipherData = _q;
                             _u = (_t = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(sharedKey, ccSharedKey.toJSON(true))];
-                        case 33:
+                        case 27:
                             sentCardInput = (_m.sharedWrappedKey = _u.apply(_t, [_1.sent()]),
                                 _m);
                             return [4 /*yield*/, this.encryptionService.encrypt(ccSharedKey, sentContactCard.plainSharedCipherDataJson)];
-                        case 34:
+                        case 28:
                             sharedCipherData = _1.sent();
                             _v = sentCardInput;
                             _x = (_w = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, sharedCipherData)];
-                        case 35:
+                        case 29:
                             _v.sharedCipherDataSig = _x.apply(_w, [_1.sent()]);
                             sentCardInput.sigPxkId = sigPxk.id;
-                            if (!sentContactCard.ownerPlainData) return [3 /*break*/, 37];
+                            if (!sentContactCard.ownerPlainData) return [3 /*break*/, 31];
                             _y = sentCardInput;
                             _0 = (_z = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(responderSigPrk.jwk, sentContactCard.ownerPlainData)];
-                        case 36:
+                        case 30:
                             _y.ownerPlainDataSig = _0.apply(_z, [_1.sent()]);
-                            _1.label = 37;
-                        case 37:
+                            _1.label = 31;
+                        case 31:
                             // Contact card info readable by the initiator
                             plainInitiatorOneTimePbkCipher.responder.contactCard = Object.assign(Object.assign({}, plainInitiatorOneTimePbkCipher.responder.contactCard), { plainSharedCipherDataJson: sentContactCard.plainSharedCipherDataJson });
-                            _1.label = 38;
-                        case 38: return [4 /*yield*/, this.encryptionService.encrypt(initiatorOneTimePbk, plainInitiatorOneTimePbkCipher)];
-                        case 39:
+                            _1.label = 32;
+                        case 32: return [4 /*yield*/, this.encryptionService.encrypt(initiatorOneTimePbk, plainInitiatorOneTimePbkCipher)];
+                        case 33:
                             initiatorOneTimePbkCipher = _1.sent();
                             return [4 /*yield*/, this.encryptionService.encrypt(decryptedOtk.otKey, initiatorOneTimePbkCipher)];
-                        case 40:
+                        case 34:
                             // Encrypt with the otk again to keep use of asymmetric keys to a minimum.
                             initiatorOneTimePbkCipher = _1.sent();
                             return [4 /*yield*/, this.lrApollo.mutate({
@@ -9495,7 +10257,7 @@
                                             keyExchangeId: id,
                                             keyExchangeToken: token,
                                             rootKeyId: rootKey.id,
-                                            masterKeyId: masterKeyId,
+                                            masterKeyId: masterKey.id,
                                             // These will be stored on the server
                                             responderPxkId: responderPrk.id,
                                             responderSigPxkId: responderSigPrk.id,
@@ -9513,7 +10275,7 @@
                                         },
                                     },
                                 })];
-                        case 41:
+                        case 35:
                             respondKeyExchangeOtk = (_1.sent()).respondKeyExchangeOtk;
                             return [2 /*return*/, {
                                     keyExchange: respondKeyExchangeOtk.keyExchange,
@@ -9529,93 +10291,88 @@
                 var rootKey, masterKey, plainInitiatorRootKeyCipher, plainInitiatorOneTimePbkCipher, _a, _b, initiatorSigPrk, responderSigPbk, responderPbk, signedResponderPbk, signedResponderSigPbk, sharedKey, rkWrappedSharedKey, mkSharedKey, mkWrappedMkSharedKey, responderContactCardCipherInput, receiverKey, _c, _d, _e, _f, _g, initiatorContactCardCipherInput, initiatorContactCardSharedCipherInput, initiatorContactCard, ownerKey, sharedCipherKey, ownerWrappedKey, _h, _j, ownerCipherData, _k, _l, _m, sharedCipherData, _o, _p, _q, res;
                 return __generator(this, function (_r) {
                     switch (_r.label) {
-                        case 0: return [4 /*yield*/, this.keyService.getCurrentRootKey()];
-                        case 1:
-                            rootKey = _r.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentMasterKey()];
-                        case 2:
-                            masterKey = _r.sent();
+                        case 0:
+                            rootKey = this.keyService.currentRootKey;
+                            masterKey = this.keyService.currentMasterKey;
                             return [4 /*yield*/, this.encryptionService.decrypt(rootKey.jwk, initiatorRootKeyCipher)];
-                        case 3:
+                        case 1:
                             plainInitiatorRootKeyCipher = (_r.sent());
                             _a = this.decryptResponseCipher;
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorRootKeyCipher.otKey)];
-                        case 4:
+                        case 2:
                             _b = [_r.sent()];
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorRootKeyCipher.oneTimePrk)];
-                        case 5: return [4 /*yield*/, _a.apply(this, _b.concat([_r.sent(), initiatorOneTimePbkCipher]))];
-                        case 6:
+                        case 3: return [4 /*yield*/, _a.apply(this, _b.concat([_r.sent(), initiatorOneTimePbkCipher]))];
+                        case 4:
                             plainInitiatorOneTimePbkCipher = _r.sent();
                             // Check the nonce match to ensure the responder was the one holding the OTK
                             if (plainInitiatorRootKeyCipher.nonce !== plainInitiatorOneTimePbkCipher.nonce) {
                                 throw new KcCodeMismatchException('The nonce returned by responder does not match with the one created by the initiator.');
                             }
-                            return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 7:
-                            initiatorSigPrk = _r.sent();
+                            initiatorSigPrk = this.keyService.currentSigPxk;
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorOneTimePbkCipher.responder.sigPbk)];
-                        case 8:
+                        case 5:
                             responderSigPbk = _r.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorOneTimePbkCipher.responder.pbk)];
-                        case 9:
+                        case 6:
                             responderPbk = _r.sent();
                             return [4 /*yield*/, this.encryptionService.sign(initiatorSigPrk.jwk, responderPbk.toJSON())];
-                        case 10:
+                        case 7:
                             signedResponderPbk = _r.sent();
                             return [4 /*yield*/, this.encryptionService.sign(initiatorSigPrk.jwk, responderSigPbk.toJSON())];
-                        case 11:
+                        case 8:
                             signedResponderSigPbk = _r.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorOneTimePbkCipher.sharedKey)];
-                        case 12:
+                        case 9:
                             sharedKey = _r.sent();
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, sharedKey.toJSON(true))];
-                        case 13:
+                        case 10:
                             rkWrappedSharedKey = _r.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorOneTimePbkCipher.mkSharedKey)];
-                        case 14:
+                        case 11:
                             mkSharedKey = _r.sent();
                             return [4 /*yield*/, this.encryptionService.encrypt(masterKey.jwk, mkSharedKey.toJSON(true))];
-                        case 15:
+                        case 12:
                             mkWrappedMkSharedKey = _r.sent();
-                            if (!responderContactCard) return [3 /*break*/, 19];
+                            if (!responderContactCard) return [3 /*break*/, 16];
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 16:
+                        case 13:
                             receiverKey = _r.sent();
                             _c = {};
                             _e = (_d = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, receiverKey.toJSON(true))];
-                        case 17:
+                        case 14:
                             _c.receiverWrappedKey = _e.apply(_d, [_r.sent()]),
                                 _c.receiverWrappingKeyId = rootKey.id;
                             _g = (_f = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(receiverKey, responderContactCard)];
-                        case 18:
+                        case 15:
                             responderContactCardCipherInput = (_c.receiverCipherData = _g.apply(_f, [_r.sent()]),
                                 _c);
-                            _r.label = 19;
-                        case 19:
-                            if (!plainInitiatorRootKeyCipher.initiatorContactCard) return [3 /*break*/, 28];
+                            _r.label = 16;
+                        case 16:
+                            if (!plainInitiatorRootKeyCipher.initiatorContactCard) return [3 /*break*/, 25];
                             initiatorContactCard = plainInitiatorRootKeyCipher.initiatorContactCard;
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 20:
+                        case 17:
                             ownerKey = _r.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorOneTimePbkCipher.responder.contactCard.sharedCipherKey)];
-                        case 21:
+                        case 18:
                             sharedCipherKey = _r.sent();
                             _j = (_h = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, ownerKey.toJSON(true))];
-                        case 22:
+                        case 19:
                             ownerWrappedKey = _j.apply(_h, [_r.sent()]);
-                            if (!initiatorContactCard.plainOwnerCipherDataJson) return [3 /*break*/, 24];
+                            if (!initiatorContactCard.plainOwnerCipherDataJson) return [3 /*break*/, 21];
                             _m = (_l = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(ownerKey, initiatorContactCard.plainOwnerCipherDataJson)];
-                        case 23:
+                        case 20:
                             _k = _m.apply(_l, [_r.sent()]);
-                            return [3 /*break*/, 25];
-                        case 24:
+                            return [3 /*break*/, 22];
+                        case 21:
                             _k = '';
-                            _r.label = 25;
-                        case 25:
+                            _r.label = 22;
+                        case 22:
                             ownerCipherData = _k;
                             initiatorContactCardCipherInput = {
                                 ownerWrappedKey: ownerWrappedKey,
@@ -9626,16 +10383,16 @@
                                 sigPxkId: initiatorSigPrk.id,
                             };
                             return [4 /*yield*/, this.encryptionService.encrypt(sharedCipherKey, initiatorContactCard.plainSharedCipherDataJson)];
-                        case 26:
+                        case 23:
                             sharedCipherData = _r.sent();
                             _o = initiatorContactCardSharedCipherInput;
                             _q = (_p = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(initiatorSigPrk.jwk, sharedCipherData)];
-                        case 27:
+                        case 24:
                             _o.sharedCipherDataSig =
                                 _q.apply(_p, [_r.sent()]);
-                            _r.label = 28;
-                        case 28: return [4 /*yield*/, this.lrApollo.mutate({
+                            _r.label = 25;
+                        case 25: return [4 /*yield*/, this.lrApollo.mutate({
                                 mutation: CompleteOtkMutation,
                                 variables: {
                                     input: {
@@ -9653,7 +10410,7 @@
                                     },
                                 },
                             })];
-                        case 29:
+                        case 26:
                             res = _r.sent();
                             return [2 /*return*/, res.completeKeyExchangeOtk];
                     }
@@ -9681,7 +10438,7 @@
         };
         return KeyExchangeService;
     }());
-    KeyExchangeService.ɵprov = i0.ɵɵdefineInjectable({ factory: function KeyExchangeService_Factory() { return new KeyExchangeService(i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(KeyService), i0.ɵɵinject(LrApolloService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(LifeReadyAuthService), i0.ɵɵinject(UserService)); }, token: KeyExchangeService, providedIn: "root" });
+    KeyExchangeService.ɵprov = i0.ɵɵdefineInjectable({ factory: function KeyExchangeService_Factory() { return new KeyExchangeService(i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(KeyService), i0.ɵɵinject(LrApolloService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(exports.Auth2Service)); }, token: KeyExchangeService, providedIn: "root" });
     KeyExchangeService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -9692,13 +10449,12 @@
         { type: KeyService },
         { type: LrApolloService },
         { type: EncryptionService },
-        { type: LifeReadyAuthService },
-        { type: UserService }
+        { type: exports.Auth2Service }
     ]; };
 
     var KeyExchangeFragment = gqlTyped(templateObject_1$k || (templateObject_1$k = __makeTemplateObject(["\nfragment KeyExchangeFragment on KeyExchangeNode {\n  id\n  token\n  state\n  mode\n  isInitiator\n  initiator {\n    id\n    username\n    config\n  }\n  responder {\n    id\n    username\n  }\n  created\n  modified\n  tokenExpiryTime\n  isExpired\n  initiatorRootKeyCipher\n  initiatorActionRequired\n  responderActionRequired\n  responderEmailAddress\n  otk {\n    state\n    otKeyParams\n    otKeyCipher\n    sharedKey {\n      id\n    }\n    mkSharedKey {\n      id\n    }\n    initiatorSigPxk {\n      id\n    }\n    responderSigPxk {\n      id\n    }\n    initiatorOneTimePbkCipher\n    responderPbkCipher\n  }\n}\n"], ["\nfragment KeyExchangeFragment on KeyExchangeNode {\n  id\n  token\n  state\n  mode\n  isInitiator\n  initiator {\n    id\n    username\n    config\n  }\n  responder {\n    id\n    username\n  }\n  created\n  modified\n  tokenExpiryTime\n  isExpired\n  initiatorRootKeyCipher\n  initiatorActionRequired\n  responderActionRequired\n  responderEmailAddress\n  otk {\n    state\n    otKeyParams\n    otKeyCipher\n    sharedKey {\n      id\n    }\n    mkSharedKey {\n      id\n    }\n    initiatorSigPxk {\n      id\n    }\n    responderSigPxk {\n      id\n    }\n    initiatorOneTimePbkCipher\n    responderPbkCipher\n  }\n}\n"])));
     var UserSharedKeyFragment = gqlTyped(templateObject_2$h || (templateObject_2$h = __makeTemplateObject(["\nfragment UserSharedKeyFragment on UserSharedKeyNode {\n  userSigPrk {\n    id\n  }\n  otherSigPbk {\n    id\n  }\n  sharedKey {\n    id\n  }\n  mkSharedKey {\n    id\n  }\n}"], ["\nfragment UserSharedKeyFragment on UserSharedKeyNode {\n  userSigPrk {\n    id\n  }\n  otherSigPbk {\n    id\n  }\n  sharedKey {\n    id\n  }\n  mkSharedKey {\n    id\n  }\n}"])));
-    var KeyExchangesQuery2 = gqlTyped(templateObject_3$f || (templateObject_3$f = __makeTemplateObject(["\nquery KeyExchangesQuery2($state: String) {\n  keyExchanges(state: $state) {\n    edges {\n      node {\n        ...KeyExchangeFragment\n      }\n    }\n  }\n}\n", "\n"], ["\nquery KeyExchangesQuery2($state: String) {\n  keyExchanges(state: $state) {\n    edges {\n      node {\n        ...KeyExchangeFragment\n      }\n    }\n  }\n}\n", "\n"])), KeyExchangeFragment);
+    var KeyExchangesQuery2 = gqlTyped(templateObject_3$e || (templateObject_3$e = __makeTemplateObject(["\nquery KeyExchangesQuery2($state: String) {\n  keyExchanges(state: $state) {\n    edges {\n      node {\n        ...KeyExchangeFragment\n      }\n    }\n  }\n}\n", "\n"], ["\nquery KeyExchangesQuery2($state: String) {\n  keyExchanges(state: $state) {\n    edges {\n      node {\n        ...KeyExchangeFragment\n      }\n    }\n  }\n}\n", "\n"])), KeyExchangeFragment);
     var KeyExchangeQuery2 = gqlTyped(templateObject_4$a || (templateObject_4$a = __makeTemplateObject(["\nquery KeyExchangeQuery2($id: LrRelayIdInput!) {\n  keyExchange(id: $id) {\n    ...KeyExchangeFragment\n  }\n}\n", "\n"], ["\nquery KeyExchangeQuery2($id: LrRelayIdInput!) {\n  keyExchange(id: $id) {\n    ...KeyExchangeFragment\n  }\n}\n", "\n"])), KeyExchangeFragment);
     var KeyExchangeTokenQuery2 = gqlTyped(templateObject_5$9 || (templateObject_5$9 = __makeTemplateObject(["\nquery KeyExchangeTokenQuery2($id: LrRelayIdInput!, $token: String) {\n  keyExchange(id: $id, token: $token) {\n    ...KeyExchangeFragment\n  }\n}\n", "\n"], ["\nquery KeyExchangeTokenQuery2($id: LrRelayIdInput!, $token: String) {\n  keyExchange(id: $id, token: $token) {\n    ...KeyExchangeFragment\n  }\n}\n", "\n"])), KeyExchangeFragment);
     var CancelKeyExchangeMutation = gqlTyped(templateObject_6$8 || (templateObject_6$8 = __makeTemplateObject(["\nmutation CancelKeyExchangeMutation($input: CancelKeyExchangeInput!) {\n  cancelKeyExchange(input: $input) {\n    keyExchange {\n      id\n    }\n  }\n}\n"], ["\nmutation CancelKeyExchangeMutation($input: CancelKeyExchangeInput!) {\n  cancelKeyExchange(input: $input) {\n    keyExchange {\n      id\n    }\n  }\n}\n"])));
@@ -9707,7 +10463,7 @@
     var RespondKeyExchangeOtkMutation = gqlTyped(templateObject_9$4 || (templateObject_9$4 = __makeTemplateObject(["\nmutation RespondKeyExchangeOtkMutation($input: RespondKeyExchangeOtkInput!) {\n  respondKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ...KeyExchangeFragment\n    }\n    userSharedKey {\n      ...UserSharedKeyFragment\n    }\n    tp {\n      id\n    }\n  }\n}\n", "\n", "\n"], ["\nmutation RespondKeyExchangeOtkMutation($input: RespondKeyExchangeOtkInput!) {\n  respondKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ...KeyExchangeFragment\n    }\n    userSharedKey {\n      ...UserSharedKeyFragment\n    }\n    tp {\n      id\n    }\n  }\n}\n", "\n", "\n"])), KeyExchangeFragment, UserSharedKeyFragment);
     var CompleteKeyExchangeOtkMutation = gqlTyped(templateObject_10$3 || (templateObject_10$3 = __makeTemplateObject(["\nmutation CompleteKeyExchangeOtkMutation(\n  $input: CompleteKeyExchangeOtkInput!\n) {\n  completeKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ...KeyExchangeFragment\n    }\n    userSharedKey {\n      ...UserSharedKeyFragment\n    }\n    tp {\n      id\n    }\n  }\n}\n", "\n", "\n"], ["\nmutation CompleteKeyExchangeOtkMutation(\n  $input: CompleteKeyExchangeOtkInput!\n) {\n  completeKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ...KeyExchangeFragment\n    }\n    userSharedKey {\n      ...UserSharedKeyFragment\n    }\n    tp {\n      id\n    }\n  }\n}\n", "\n", "\n"])), KeyExchangeFragment, UserSharedKeyFragment);
     var CurrentUserSharedKeyQuery2 = gqlTyped(templateObject_11$2 || (templateObject_11$2 = __makeTemplateObject(["\nquery CurrentUserSharedKeyQuery2(\n  $username: String\n  $userId: LrRelayIdInput\n) {\n  currentUserSharedKey(\n    username: $username\n    userId: $userId\n  ) {\n    userSharedKey {\n      ...UserSharedKeyFragment\n    }\n  }\n}\n", "\n"], ["\nquery CurrentUserSharedKeyQuery2(\n  $username: String\n  $userId: LrRelayIdInput\n) {\n  currentUserSharedKey(\n    username: $username\n    userId: $userId\n  ) {\n    userSharedKey {\n      ...UserSharedKeyFragment\n    }\n  }\n}\n", "\n"])), UserSharedKeyFragment);
-    var templateObject_1$k, templateObject_2$h, templateObject_3$f, templateObject_4$a, templateObject_5$9, templateObject_6$8, templateObject_7$7, templateObject_8$6, templateObject_9$4, templateObject_10$3, templateObject_11$2;
+    var templateObject_1$k, templateObject_2$h, templateObject_3$e, templateObject_4$a, templateObject_5$9, templateObject_6$8, templateObject_7$7, templateObject_8$6, templateObject_9$4, templateObject_10$3, templateObject_11$2;
 
     exports.KeyExchange2Service = /** @class */ (function (_super) {
         __extends(KeyExchange2Service, _super);
@@ -9734,19 +10490,17 @@
                         case 2:
                             if (!(keyExchange.otk.state === 'OTK_INITIATED' &&
                                 !keyExchange.isInitiator &&
-                                keyExchange.otk.responderPbkCipher)) return [3 /*break*/, 6];
-                            return [4 /*yield*/, this.keyService.getCurrentPxk()];
-                        case 3:
-                            prk = _a.sent();
+                                keyExchange.otk.responderPbkCipher)) return [3 /*break*/, 5];
+                            prk = this.keyService.currentPxk;
                             return [4 /*yield*/, this.encryptionService.decrypt(prk.jwk, JSON.parse(keyExchange.otk.responderPbkCipher), {
                                     serializations: [JoseSerialization.COMPACT],
                                 })];
-                        case 4:
+                        case 3:
                             decryptedCipher = _a.sent();
-                            if (!decryptedCipher.otKey) return [3 /*break*/, 6];
+                            if (!decryptedCipher.otKey) return [3 /*break*/, 5];
                             return [4 /*yield*/, KeyFactoryService.asKey(decryptedCipher.otKey)];
-                        case 5: return [2 /*return*/, _a.sent()];
-                        case 6: return [2 /*return*/, null];
+                        case 4: return [2 /*return*/, _a.sent()];
+                        case 5: return [2 /*return*/, null];
                     }
                 });
             });
@@ -9803,36 +10557,35 @@
                 var rootKey, initiatorRootKeyCipherClearJson, otKey, otk, _a, _b, _c, _d, _e, _f, _g;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
-                        case 0: return [4 /*yield*/, this.keyService.getCurrentRootKey()];
-                        case 1:
-                            rootKey = _h.sent();
+                        case 0:
+                            rootKey = this.keyService.currentRootKey;
                             return [4 /*yield*/, this.encryptionService.decrypt(rootKey.jwk, keyExchange.initiatorRootKeyCipher)];
-                        case 2:
+                        case 1:
                             initiatorRootKeyCipherClearJson = (_h.sent());
                             return [4 /*yield*/, KeyFactoryService.asKey(initiatorRootKeyCipherClearJson.otKey)];
-                        case 3:
+                        case 2:
                             otKey = _h.sent();
                             keyExchange = Object.assign(Object.assign({}, keyExchange), { initiatorRootKeyCipherClearJson: initiatorRootKeyCipherClearJson });
                             otk = keyExchange.otk;
-                            if (!otk.initiatorOneTimePbkCipher) return [3 /*break*/, 6];
+                            if (!otk.initiatorOneTimePbkCipher) return [3 /*break*/, 5];
                             _b = (_a = Object).assign;
                             _c = [Object.assign({}, otk)];
                             _d = {};
                             _e = this.decryptResponseCipher;
                             _f = [otKey];
                             return [4 /*yield*/, KeyFactoryService.asKey(initiatorRootKeyCipherClearJson.oneTimePrk)];
-                        case 4: return [4 /*yield*/, _e.apply(this, _f.concat([_h.sent(), otk.initiatorOneTimePbkCipher]))];
-                        case 5:
+                        case 3: return [4 /*yield*/, _e.apply(this, _f.concat([_h.sent(), otk.initiatorOneTimePbkCipher]))];
+                        case 4:
                             otk = _b.apply(_a, _c.concat([(_d.initiatorOneTimePbkCipherClearJson = _h.sent(), _d)]));
-                            _h.label = 6;
-                        case 6:
-                            if (!otk.otKeyCipher) return [3 /*break*/, 8];
+                            _h.label = 5;
+                        case 5:
+                            if (!otk.otKeyCipher) return [3 /*break*/, 7];
                             _g = otk;
                             return [4 /*yield*/, this.encryptionService.decrypt(otKey, otk.otKeyCipher)];
-                        case 7:
+                        case 6:
                             _g.otKeyCipherClearJson = _h.sent();
-                            _h.label = 8;
-                        case 8: return [2 /*return*/, Object.assign(Object.assign({}, keyExchange), { otk: otk })];
+                            _h.label = 7;
+                        case 7: return [2 /*return*/, Object.assign(Object.assign({}, keyExchange), { otk: otk })];
                     }
                 });
             });
@@ -9985,19 +10738,15 @@
                             return [4 /*yield*/, this.keyFactory.createPkcKey()];
                         case 2:
                             initiatorOneTimePrk = _a.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentPxk()];
-                        case 3:
-                            initiatorPrk = _a.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 4:
-                            initiatorSigPrk = _a.sent();
+                            initiatorPrk = this.keyService.currentPxk;
+                            initiatorSigPrk = this.keyService.currentSigPxk;
                             initiatorPlainDataSig = null;
-                            if (!(contactCard && contactCard.ownerPlainDataJson)) return [3 /*break*/, 6];
+                            if (!(contactCard && contactCard.ownerPlainDataJson)) return [3 /*break*/, 4];
                             return [4 /*yield*/, this.encryptionService.signToString(initiatorSigPrk.jwk, contactCard.ownerPlainDataJson)];
-                        case 5:
+                        case 3:
                             initiatorPlainDataSig = _a.sent();
-                            _a.label = 6;
-                        case 6:
+                            _a.label = 4;
+                        case 4:
                             initiator = {
                                 message: message,
                                 contactCard: contactCard && {
@@ -10014,7 +10763,7 @@
                                 initiator: Object.assign(Object.assign({}, initiator), { oneTimePbk: initiatorOneTimePrk.toJSON(), pbk: initiatorPrk.jwk.toJSON(), sigPbk: initiatorSigPrk.jwk.toJSON() }),
                             };
                             return [4 /*yield*/, this.keyGraph.encryptToString(otKey, plainOtKeyCipher)];
-                        case 7:
+                        case 5:
                             otKeyCipher = _a.sent();
                             initiatorRootKeyCipherClearJson = {
                                 nonce: nonce,
@@ -10030,11 +10779,9 @@
                                 initiatorContactCard: contactCard,
                                 initiator: initiator,
                             };
-                            return [4 /*yield*/, this.keyService.getCurrentRootKey()];
-                        case 8:
-                            rootKey = _a.sent();
+                            rootKey = this.keyService.currentRootKey;
                             return [4 /*yield*/, this.keyGraph.encryptToString(rootKey.jwk, initiatorRootKeyCipherClearJson)];
-                        case 9:
+                        case 6:
                             initiatorRootKeyCipher = _a.sent();
                             otKeyK = otKey.toJSON(true).k;
                             lrMutation = new LrMutation({
@@ -10073,48 +10820,40 @@
         KeyExchange2Service.prototype.respondOtkMutation = function (_a) {
             var keyExchangeId = _a.keyExchangeId, token = _a.token, decryptedOtk = _a.decryptedOtk, message = _a.message, initiatorContactCard = _a.initiatorContactCard, responderContactCard = _a.responderContactCard;
             return __awaiter(this, void 0, void 0, function () {
-                var rootKey, masterKeyId, masterKey, sharedKey, mkSharedKey, rkWrappedSharedKey, mkWrappedMkSharedKey, initiatorOneTimePbk, initiatorPbk, initiatorSigPbk, responderPrk, responderSigPrk, signedInitiatorPbk, signedInitiatorSigPbk, initiatorOneTimePbkCipherClearJson, receivedCardInput, sharedCipherDataClearJson, receiverKey, ccSharedKey, sigPxk, _a, _b, _c, _d, _e, _f, _g, _h, sharedCipherData, _j, _k, _l, responderCardInput, ownerKey, ccSharedKey, sigPxk, _m, _o, _p, _q, _r, _s, _t, _u, sharedCipherData, _v, _w, _x, _y, _z, _0, initiatorOneTimePbkCipher;
+                var rootKey, masterKey, sharedKey, mkSharedKey, rkWrappedSharedKey, mkWrappedMkSharedKey, initiatorOneTimePbk, initiatorPbk, initiatorSigPbk, responderPrk, responderSigPrk, signedInitiatorPbk, signedInitiatorSigPbk, initiatorOneTimePbkCipherClearJson, receivedCardInput, sharedCipherDataClearJson, receiverKey, ccSharedKey, sigPxk, _a, _b, _c, _d, _e, _f, _g, _h, sharedCipherData, _j, _k, _l, responderCardInput, ownerKey, ccSharedKey, sigPxk, _m, _o, _p, _q, _r, _s, _t, _u, sharedCipherData, _v, _w, _x, _y, _z, _0, initiatorOneTimePbkCipher;
                 return __generator(this, function (_1) {
                     switch (_1.label) {
-                        case 0: return [4 /*yield*/, this.keyService.getCurrentRootKey()];
-                        case 1:
-                            rootKey = _1.sent();
-                            masterKeyId = this.keyService.getCurrentMasterKey().id;
-                            return [4 /*yield*/, this.keyService.getCurrentMasterKey()];
-                        case 2:
-                            masterKey = _1.sent();
+                        case 0:
+                            rootKey = this.keyService.currentRootKey;
+                            masterKey = this.keyService.currentMasterKey;
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 3:
+                        case 1:
                             sharedKey = _1.sent();
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 4:
+                        case 2:
                             mkSharedKey = _1.sent();
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, sharedKey.toJSON(true))];
-                        case 5:
+                        case 3:
                             rkWrappedSharedKey = _1.sent();
                             return [4 /*yield*/, this.encryptionService.encrypt(masterKey.jwk, mkSharedKey.toJSON(true))];
-                        case 6:
+                        case 4:
                             mkWrappedMkSharedKey = _1.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(decryptedOtk.otKeyCipherClearJson.initiator.oneTimePbk)];
-                        case 7:
+                        case 5:
                             initiatorOneTimePbk = _1.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(decryptedOtk.otKeyCipherClearJson.initiator.pbk)];
-                        case 8:
+                        case 6:
                             initiatorPbk = _1.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(decryptedOtk.otKeyCipherClearJson.initiator.sigPbk)];
-                        case 9:
+                        case 7:
                             initiatorSigPbk = _1.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentPxk()];
-                        case 10:
-                            responderPrk = _1.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 11:
-                            responderSigPrk = _1.sent();
+                            responderPrk = this.keyService.currentPxk;
+                            responderSigPrk = this.keyService.currentSigPxk;
                             return [4 /*yield*/, this.encryptionService.sign(responderSigPrk.jwk, initiatorPbk.toJSON())];
-                        case 12:
+                        case 8:
                             signedInitiatorPbk = _1.sent();
                             return [4 /*yield*/, this.encryptionService.sign(responderSigPrk.jwk, initiatorSigPbk.toJSON())];
-                        case 13:
+                        case 9:
                             signedInitiatorSigPbk = _1.sent();
                             initiatorOneTimePbkCipherClearJson = {
                                 nonce: decryptedOtk.otKeyCipherClearJson.nonce,
@@ -10126,109 +10865,105 @@
                                     message: message,
                                 },
                             };
-                            if (!decryptedOtk.otKeyCipherClearJson.initiator.contactCard) return [3 /*break*/, 24];
+                            if (!decryptedOtk.otKeyCipherClearJson.initiator.contactCard) return [3 /*break*/, 19];
                             sharedCipherDataClearJson = decryptedOtk.otKeyCipherClearJson.initiator.contactCard
                                 .sharedCipherDataClearJson;
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 14:
+                        case 10:
                             receiverKey = _1.sent();
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 15:
+                        case 11:
                             ccSharedKey = _1.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 16:
-                            sigPxk = _1.sent();
+                            sigPxk = this.keyService.currentSigPxk;
                             _a = {};
                             _c = (_b = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, receiverKey.toJSON(true))];
-                        case 17:
+                        case 12:
                             _a.receiverWrappedKey = _c.apply(_b, [_1.sent()]),
                                 _a.receiverWrappingKeyId = rootKey.id;
-                            if (!initiatorContactCard) return [3 /*break*/, 19];
+                            if (!initiatorContactCard) return [3 /*break*/, 14];
                             _f = (_e = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(receiverKey, initiatorContactCard.receiverCipherDataClearJson)];
-                        case 18:
+                        case 13:
                             _d = _f.apply(_e, [_1.sent()]);
-                            return [3 /*break*/, 20];
-                        case 19:
+                            return [3 /*break*/, 15];
+                        case 14:
                             _d = '';
-                            _1.label = 20;
-                        case 20:
+                            _1.label = 15;
+                        case 15:
                             _a.receiverCipherData = _d;
                             _h = (_g = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(sharedKey, ccSharedKey.toJSON(true))];
-                        case 21:
+                        case 16:
                             receivedCardInput = (_a.sharedWrappedKey = _h.apply(_g, [_1.sent()]),
                                 _a);
                             return [4 /*yield*/, this.encryptionService.encrypt(ccSharedKey, sharedCipherDataClearJson)];
-                        case 22:
+                        case 17:
                             sharedCipherData = _1.sent();
                             _j = receivedCardInput;
                             _l = (_k = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, sharedCipherData)];
-                        case 23:
+                        case 18:
                             _j.sharedCipherDataSig = _l.apply(_k, [_1.sent()]);
                             receivedCardInput.sigPxkId = sigPxk.id;
                             initiatorOneTimePbkCipherClearJson.responder.contactCard = Object.assign(Object.assign({}, initiatorOneTimePbkCipherClearJson.responder.contactCard), { sharedCipherKey: ccSharedKey.toJSON(true) });
-                            _1.label = 24;
-                        case 24:
-                            if (!responderContactCard) return [3 /*break*/, 37];
+                            _1.label = 19;
+                        case 19:
+                            if (!responderContactCard) return [3 /*break*/, 31];
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 25:
+                        case 20:
                             ownerKey = _1.sent();
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 26:
+                        case 21:
                             ccSharedKey = _1.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 27:
-                            sigPxk = _1.sent();
+                            sigPxk = this.keyService.currentSigPxk;
                             _m = {};
                             _p = (_o = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, ownerKey.toJSON(true))];
-                        case 28:
+                        case 22:
                             _m.ownerWrappedKey = _p.apply(_o, [_1.sent()]),
                                 _m.ownerWrappingKeyId = rootKey.id;
-                            if (!responderContactCard.ownerCipherDataClearJson) return [3 /*break*/, 30];
+                            if (!responderContactCard.ownerCipherDataClearJson) return [3 /*break*/, 24];
                             _s = (_r = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(ownerKey, responderContactCard.ownerCipherDataClearJson)];
-                        case 29:
+                        case 23:
                             _q = _s.apply(_r, [_1.sent()]);
-                            return [3 /*break*/, 31];
-                        case 30:
+                            return [3 /*break*/, 25];
+                        case 24:
                             _q = '';
-                            _1.label = 31;
-                        case 31:
+                            _1.label = 25;
+                        case 25:
                             _m.ownerCipherData = _q;
                             _u = (_t = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(sharedKey, ccSharedKey.toJSON(true))];
-                        case 32:
+                        case 26:
                             responderCardInput = (_m.sharedWrappedKey = _u.apply(_t, [_1.sent()]),
                                 _m);
                             return [4 /*yield*/, this.encryptionService.encrypt(ccSharedKey, responderContactCard.sharedCipherDataClearJson)];
-                        case 33:
+                        case 27:
                             sharedCipherData = _1.sent();
                             _v = responderCardInput;
                             _x = (_w = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, sharedCipherData)];
-                        case 34:
+                        case 28:
                             _v.sharedCipherDataSig = _x.apply(_w, [_1.sent()]);
                             responderCardInput.sigPxkId = sigPxk.id;
-                            if (!responderContactCard.ownerPlainDataJson) return [3 /*break*/, 36];
+                            if (!responderContactCard.ownerPlainDataJson) return [3 /*break*/, 30];
                             _y = responderCardInput;
                             _0 = (_z = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(responderSigPrk.jwk, responderContactCard.ownerPlainDataJson)];
-                        case 35:
+                        case 29:
                             _y.ownerPlainDataSig = _0.apply(_z, [_1.sent()]);
-                            _1.label = 36;
-                        case 36:
+                            _1.label = 30;
+                        case 30:
                             // Contact card info readable by the initiator
                             initiatorOneTimePbkCipherClearJson.responder.contactCard = Object.assign(Object.assign({}, initiatorOneTimePbkCipherClearJson.responder.contactCard), { sharedCipherDataClearJson: responderContactCard.sharedCipherDataClearJson });
-                            _1.label = 37;
-                        case 37: return [4 /*yield*/, this.encryptionService.encrypt(initiatorOneTimePbk, initiatorOneTimePbkCipherClearJson)];
-                        case 38:
+                            _1.label = 31;
+                        case 31: return [4 /*yield*/, this.encryptionService.encrypt(initiatorOneTimePbk, initiatorOneTimePbkCipherClearJson)];
+                        case 32:
                             initiatorOneTimePbkCipher = _1.sent();
                             return [4 /*yield*/, this.encryptionService.encrypt(decryptedOtk.otKey, initiatorOneTimePbkCipher)];
-                        case 39:
+                        case 33:
                             // Encrypt with the otk again to keep use of asymmetric keys to a minimum.
                             initiatorOneTimePbkCipher = _1.sent();
                             return [2 /*return*/, new LrMutation({
@@ -10238,7 +10973,7 @@
                                             keyExchangeId: keyExchangeId,
                                             keyExchangeToken: token,
                                             rootKeyId: rootKey.id,
-                                            masterKeyId: masterKeyId,
+                                            masterKeyId: masterKey.id,
                                             // These will be stored on the server
                                             responderPxkId: responderPrk.id,
                                             responderSigPxkId: responderSigPrk.id,
@@ -10273,95 +11008,90 @@
                 var rootKey, masterKey, initiatorRootKeyCipherClearJson, plainInitiatorOneTimePbkCipher, _a, _b, initiatorSigPrk, responderSigPbk, responderPbk, signedResponderPbk, signedResponderSigPbk, sharedKey, rkWrappedSharedKey, mkSharedKey, mkWrappedMkSharedKey, responderContactCardCipherInput, receiverKey, _c, _d, _e, _f, _g, initiatorContactCardCipherInput, initiatorContactCardSharedCipherInput, initiatorContactCardFromInit, ownerKey, sharedCipherKey, ownerWrappedKey, _h, _j, ownerCipherDataClearJson, ownerCipherData, _k, sharedCipherData, _l, _m, _o;
                 return __generator(this, function (_p) {
                     switch (_p.label) {
-                        case 0: return [4 /*yield*/, this.keyService.getCurrentRootKey()];
-                        case 1:
-                            rootKey = _p.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentMasterKey()];
-                        case 2:
-                            masterKey = _p.sent();
+                        case 0:
+                            rootKey = this.keyService.currentRootKey;
+                            masterKey = this.keyService.currentMasterKey;
                             return [4 /*yield*/, this.encryptionService.decrypt(rootKey.jwk, initiatorRootKeyCipher)];
-                        case 3:
+                        case 1:
                             initiatorRootKeyCipherClearJson = (_p.sent());
                             _a = this.decryptResponseCipher;
                             return [4 /*yield*/, KeyFactoryService.asKey(initiatorRootKeyCipherClearJson.otKey)];
-                        case 4:
+                        case 2:
                             _b = [_p.sent()];
                             return [4 /*yield*/, KeyFactoryService.asKey(initiatorRootKeyCipherClearJson.oneTimePrk)];
-                        case 5: return [4 /*yield*/, _a.apply(this, _b.concat([_p.sent(), initiatorOneTimePbkCipher]))];
-                        case 6:
+                        case 3: return [4 /*yield*/, _a.apply(this, _b.concat([_p.sent(), initiatorOneTimePbkCipher]))];
+                        case 4:
                             plainInitiatorOneTimePbkCipher = _p.sent();
                             // Check the nonce match to ensure the responder was the one holding the OTK
                             if (initiatorRootKeyCipherClearJson.nonce !==
                                 plainInitiatorOneTimePbkCipher.nonce) {
                                 throw new KcCodeMismatchException('The nonce returned by responder does not match with the one created by the initiator.');
                             }
-                            return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 7:
-                            initiatorSigPrk = _p.sent();
+                            initiatorSigPrk = this.keyService.currentSigPxk;
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorOneTimePbkCipher.responder.sigPbk)];
-                        case 8:
+                        case 5:
                             responderSigPbk = _p.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorOneTimePbkCipher.responder.pbk)];
-                        case 9:
+                        case 6:
                             responderPbk = _p.sent();
                             return [4 /*yield*/, this.encryptionService.sign(initiatorSigPrk.jwk, responderPbk.toJSON())];
-                        case 10:
+                        case 7:
                             signedResponderPbk = _p.sent();
                             return [4 /*yield*/, this.encryptionService.sign(initiatorSigPrk.jwk, responderSigPbk.toJSON())];
-                        case 11:
+                        case 8:
                             signedResponderSigPbk = _p.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorOneTimePbkCipher.sharedKey)];
-                        case 12:
+                        case 9:
                             sharedKey = _p.sent();
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, sharedKey.toJSON(true))];
-                        case 13:
+                        case 10:
                             rkWrappedSharedKey = _p.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorOneTimePbkCipher.mkSharedKey)];
-                        case 14:
+                        case 11:
                             mkSharedKey = _p.sent();
                             return [4 /*yield*/, this.encryptionService.encrypt(masterKey.jwk, mkSharedKey.toJSON(true))];
-                        case 15:
+                        case 12:
                             mkWrappedMkSharedKey = _p.sent();
-                            if (!responderContactCard) return [3 /*break*/, 19];
+                            if (!responderContactCard) return [3 /*break*/, 16];
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 16:
+                        case 13:
                             receiverKey = _p.sent();
                             _c = {};
                             _e = (_d = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, receiverKey.toJSON(true))];
-                        case 17:
+                        case 14:
                             _c.receiverWrappedKey = _e.apply(_d, [_p.sent()]),
                                 _c.receiverWrappingKeyId = rootKey.id;
                             _g = (_f = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(receiverKey, responderContactCard.receiverCipherDataClearJson)];
-                        case 18:
+                        case 15:
                             responderContactCardCipherInput = (_c.receiverCipherData = _g.apply(_f, [_p.sent()]),
                                 _c);
-                            _p.label = 19;
-                        case 19:
-                            if (!initiatorRootKeyCipherClearJson.initiatorContactCard) return [3 /*break*/, 28];
+                            _p.label = 16;
+                        case 16:
+                            if (!initiatorRootKeyCipherClearJson.initiatorContactCard) return [3 /*break*/, 25];
                             initiatorContactCardFromInit = initiatorRootKeyCipherClearJson.initiatorContactCard;
                             return [4 /*yield*/, this.keyFactory.createKey()];
-                        case 20:
+                        case 17:
                             ownerKey = _p.sent();
                             return [4 /*yield*/, KeyFactoryService.asKey(plainInitiatorOneTimePbkCipher.responder.contactCard.sharedCipherKey)];
-                        case 21:
+                        case 18:
                             sharedCipherKey = _p.sent();
                             _j = (_h = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.encrypt(rootKey.jwk, ownerKey.toJSON(true))];
-                        case 22:
+                        case 19:
                             ownerWrappedKey = _j.apply(_h, [_p.sent()]);
                             ownerCipherDataClearJson = (initiatorContactCard === null || initiatorContactCard === void 0 ? void 0 : initiatorContactCard.ownerCipherDataClearJson) ||
                                 initiatorContactCardFromInit.ownerCipherDataClearJson;
-                            if (!ownerCipherDataClearJson) return [3 /*break*/, 24];
+                            if (!ownerCipherDataClearJson) return [3 /*break*/, 21];
                             return [4 /*yield*/, this.keyGraph.encryptToString(ownerKey, ownerCipherDataClearJson)];
-                        case 23:
+                        case 20:
                             _k = _p.sent();
-                            return [3 /*break*/, 25];
-                        case 24:
+                            return [3 /*break*/, 22];
+                        case 21:
                             _k = '';
-                            _p.label = 25;
-                        case 25:
+                            _p.label = 22;
+                        case 22:
                             ownerCipherData = _k;
                             initiatorContactCardCipherInput = {
                                 ownerWrappedKey: ownerWrappedKey,
@@ -10372,16 +11102,16 @@
                                 sigPxkId: initiatorSigPrk.id,
                             };
                             return [4 /*yield*/, this.encryptionService.encrypt(sharedCipherKey, initiatorContactCardFromInit.sharedCipherDataClearJson)];
-                        case 26:
+                        case 23:
                             sharedCipherData = _p.sent();
                             _l = initiatorContactCardSharedCipherInput;
                             _o = (_m = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(initiatorSigPrk.jwk, sharedCipherData)];
-                        case 27:
+                        case 24:
                             _l.sharedCipherDataSig =
                                 _o.apply(_m, [_p.sent()]);
-                            _p.label = 28;
-                        case 28: 
+                            _p.label = 25;
+                        case 25: 
                         // TODO ideally we update the shared data in the contact card sent to the responder as well since that
                         // CC was created by the responder.
                         return [2 /*return*/, new LrMutation({
@@ -10434,16 +11164,16 @@
     })(exports.KcLbopErrorCode || (exports.KcLbopErrorCode = {}));
     var CreateLbopQuery = gql__default['default'](templateObject_1$l || (templateObject_1$l = __makeTemplateObject(["\n  mutation CreateLbop($input: CreateLbopInput!) {\n    createLbop(input: $input) {\n      lbop {\n        id\n      }\n    }\n  }\n"], ["\n  mutation CreateLbop($input: CreateLbopInput!) {\n    createLbop(input: $input) {\n      lbop {\n        id\n      }\n    }\n  }\n"])));
     var DeleteLbopQuery = gql__default['default'](templateObject_2$i || (templateObject_2$i = __makeTemplateObject(["\n  mutation DeleteLbop($input: DeleteLbopInput!) {\n    deleteLbop(input: $input) {\n      id\n    }\n  }\n"], ["\n  mutation DeleteLbop($input: DeleteLbopInput!) {\n    deleteLbop(input: $input) {\n      id\n    }\n  }\n"])));
-    var UpdateLbopQuery = gql__default['default'](templateObject_3$g || (templateObject_3$g = __makeTemplateObject(["\n  mutation UpdateLbop($input: UpdateLbopInput!) {\n    updateLbop(input: $input) {\n      lbop {\n        id\n      }\n    }\n  }\n"], ["\n  mutation UpdateLbop($input: UpdateLbopInput!) {\n    updateLbop(input: $input) {\n      lbop {\n        id\n      }\n    }\n  }\n"])));
+    var UpdateLbopQuery = gql__default['default'](templateObject_3$f || (templateObject_3$f = __makeTemplateObject(["\n  mutation UpdateLbop($input: UpdateLbopInput!) {\n    updateLbop(input: $input) {\n      lbop {\n        id\n      }\n    }\n  }\n"], ["\n  mutation UpdateLbop($input: UpdateLbopInput!) {\n    updateLbop(input: $input) {\n      lbop {\n        id\n      }\n    }\n  }\n"])));
     var LbopQuery = gql__default['default'](templateObject_4$b || (templateObject_4$b = __makeTemplateObject(["\n  query Lbop($id: LrRelayIdInput!) {\n    lbop(id: $id) {\n      id\n      cipherMeta\n    }\n  }\n"], ["\n  query Lbop($id: LrRelayIdInput!) {\n    lbop(id: $id) {\n      id\n      cipherMeta\n    }\n  }\n"])));
     var LbopsQuery = gql__default['default'](templateObject_5$a || (templateObject_5$a = __makeTemplateObject(["\n  query Lbops {\n    lbops {\n      edges {\n        node {\n          id\n          cipherMeta\n        }\n      }\n    }\n  }\n"], ["\n  query Lbops {\n    lbops {\n      edges {\n        node {\n          id\n          cipherMeta\n        }\n      }\n    }\n  }\n"])));
     var LbopService = /** @class */ (function () {
-        function LbopService(config, http, lrApollo, auth, authService, keyFactory, keyService, encryptionService, keyGraph, passwordService) {
+        function LbopService(config, http, lrApollo, auth, auth2Service, keyFactory, keyService, encryptionService, keyGraph, passwordService) {
             this.config = config;
             this.http = http;
             this.lrApollo = lrApollo;
             this.auth = auth;
-            this.authService = authService;
+            this.auth2Service = auth2Service;
             this.keyFactory = keyFactory;
             this.keyService = keyService;
             this.encryptionService = encryptionService;
@@ -10486,11 +11216,9 @@
                         case 1:
                             lbop = _a.sent();
                             lbop.name = name;
-                            return [4 /*yield*/, this.keyService.getCurrentMasterKey()];
-                        case 2:
-                            masterKey = _a.sent();
+                            masterKey = this.keyService.currentMasterKey;
                             return [4 /*yield*/, this.encryptionService.encrypt(masterKey.jwk, lbop)];
-                        case 3:
+                        case 2:
                             cipherMeta = _a.sent();
                             return [4 /*yield*/, this.lrApollo.mutate({
                                     mutation: UpdateLbopQuery,
@@ -10501,7 +11229,7 @@
                                         },
                                     },
                                 })];
-                        case 4:
+                        case 3:
                             res = _a.sent();
                             return [2 /*return*/, res.updateLbop];
                     }
@@ -10521,11 +11249,9 @@
                             })];
                         case 1:
                             res = _a.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentMasterKey()];
-                        case 2:
-                            masterKey = _a.sent();
+                            masterKey = this.keyService.currentMasterKey;
                             return [4 /*yield*/, this.encryptionService.decrypt(masterKey.jwk, JSON.parse(res.lbop.cipherMeta))];
-                        case 3:
+                        case 2:
                             plainCipherMeta = _a.sent();
                             return [2 /*return*/, Object.assign({ id: res.id }, plainCipherMeta)];
                     }
@@ -10543,7 +11269,7 @@
                             })];
                         case 1:
                             res = _a.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentMasterKey()];
+                            return [4 /*yield*/, this.keyService.currentMasterKey];
                         case 2:
                             masterKey = _a.sent();
                             return [2 /*return*/, Promise.all(res.lbops.edges.map(function (edge) { return __awaiter(_this, void 0, void 0, function () {
@@ -10564,7 +11290,7 @@
         LbopService.prototype.create = function (_a) {
             var name = _a.name;
             return __awaiter(this, void 0, void 0, function () {
-                var lbops, lbopString, _loop_1, this_1, state_1, lbopKeyParams, lbopKey, _a, _b, _c, _d, _e, lbopKeyVerifier, wrappedLbopKeyVerifier, currentUser, masterKey, wrappedMasterKey, meta, cipherMeta, res;
+                var lbops, lbopString, _loop_1, this_1, state_1, lbopKeyParams, lbopKey, _a, _b, _c, _d, _e, lbopKeyVerifier, wrappedLbopKeyVerifier, masterKey, wrappedMasterKey, meta, cipherMeta, res;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -10606,18 +11332,13 @@
                             return [4 /*yield*/, this.encryptionService.encrypt(lbopKey, lbopKeyVerifier.toJSON(true))];
                         case 6:
                             wrappedLbopKeyVerifier = _f.sent();
-                            return [4 /*yield*/, this.authService.getUser()];
-                        case 7:
-                            currentUser = _f.sent();
-                            return [4 /*yield*/, this.keyGraph.getKey(currentUser.currentUserKey.masterKey.id)];
-                        case 8:
-                            masterKey = _f.sent();
+                            masterKey = this.keyService.currentMasterKey;
                             return [4 /*yield*/, this.encryptionService.encrypt(lbopKey, masterKey.jwk.toJSON(true))];
-                        case 9:
+                        case 7:
                             wrappedMasterKey = _f.sent();
                             meta = Object.assign(Object.assign({}, (name && { name: name })), { partial: this.getPartial(lbopString) });
                             return [4 /*yield*/, this.encryptionService.encrypt(masterKey.jwk, meta)];
-                        case 10:
+                        case 8:
                             cipherMeta = _f.sent();
                             return [4 /*yield*/, this.lrApollo.mutate({
                                     mutation: CreateLbopQuery,
@@ -10627,12 +11348,12 @@
                                             lbopKeyParams: JSON.stringify(lbopKeyParams),
                                             lbopKeyVerifier: JSON.stringify(lbopKeyVerifier.toJSON(true)),
                                             wrappedLbopKeyVerifier: JSON.stringify(wrappedLbopKeyVerifier),
-                                            masterKeyId: currentUser.currentUserKey.masterKey.id,
+                                            masterKeyId: masterKey.id,
                                             wrappedMasterKey: JSON.stringify(wrappedMasterKey),
                                         },
                                     },
                                 })];
-                        case 11:
+                        case 9:
                             res = _f.sent();
                             return [2 /*return*/, Object.assign(Object.assign({}, res.createLbop.lbop), { lbopString: lbopString })];
                     }
@@ -10848,7 +11569,7 @@
         };
         return LbopService;
     }());
-    LbopService.ɵprov = i0.ɵɵdefineInjectable({ factory: function LbopService_Factory() { return new LbopService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2$1.HttpClient), i0.ɵɵinject(LrApolloService), i0.ɵɵinject(i4.AuthClass), i0.ɵɵinject(LifeReadyAuthService), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(KeyService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(PasswordService)); }, token: LbopService, providedIn: "root" });
+    LbopService.ɵprov = i0.ɵɵdefineInjectable({ factory: function LbopService_Factory() { return new LbopService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2$2.HttpClient), i0.ɵɵinject(LrApolloService), i0.ɵɵinject(i2.AuthClass), i0.ɵɵinject(exports.Auth2Service), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(KeyService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(PasswordService)); }, token: LbopService, providedIn: "root" });
     LbopService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -10856,17 +11577,17 @@
     ];
     LbopService.ctorParameters = function () { return [
         { type: undefined, decorators: [{ type: i0.Inject, args: [KC_CONFIG,] }] },
-        { type: i2$1.HttpClient },
+        { type: i2$2.HttpClient },
         { type: LrApolloService },
-        { type: i4.AuthClass },
-        { type: LifeReadyAuthService },
+        { type: i2.AuthClass },
+        { type: exports.Auth2Service },
         { type: KeyFactoryService },
         { type: KeyService },
         { type: EncryptionService },
         { type: KeyGraphService },
         { type: PasswordService }
     ]; };
-    var templateObject_1$l, templateObject_2$i, templateObject_3$g, templateObject_4$b, templateObject_5$a;
+    var templateObject_1$l, templateObject_2$i, templateObject_3$f, templateObject_4$b, templateObject_5$a;
 
     var LifeReadyModule = /** @class */ (function () {
         function LifeReadyModule() {
@@ -10880,13 +11601,13 @@
                         useValue: config,
                     },
                     {
-                        provide: i4.AuthClass,
+                        provide: i2.AuthClass,
                         useValue: Auth__default['default'],
                     },
                     {
                         provide: i0.APP_INITIALIZER,
                         useFactory: configureAmplifyAuth,
-                        deps: [KC_CONFIG, i4.AuthClass],
+                        deps: [KC_CONFIG, i2.AuthClass],
                         multi: true,
                     },
                     {
@@ -10898,7 +11619,7 @@
                     {
                         provide: i1.APOLLO_OPTIONS,
                         useFactory: configureApollo,
-                        deps: [KC_CONFIG, i4.AuthClass],
+                        deps: [KC_CONFIG, i2.AuthClass],
                     },
                 ],
             };
@@ -10907,7 +11628,7 @@
     }());
     LifeReadyModule.decorators = [
         { type: i0.NgModule, args: [{
-                    imports: [i2$1.HttpClientModule, i4$1.NgIdleKeepaliveModule.forRoot()],
+                    imports: [i2$2.HttpClientModule, i4.NgIdleKeepaliveModule.forRoot()],
                 },] }
     ];
 
@@ -11067,10 +11788,10 @@
 
     var UpdateNotificationMutation = gqlTyped(templateObject_1$n || (templateObject_1$n = __makeTemplateObject(["\nmutation UpdateNotificationMutation($input: UpdateNotificationInput!) {\n  updateNotification(input: $input) {\n    notification {\n      id\n    }\n  }\n}\n"], ["\nmutation UpdateNotificationMutation($input: UpdateNotificationInput!) {\n  updateNotification(input: $input) {\n    notification {\n      id\n    }\n  }\n}\n"])));
     var UpdateAllNotificationsReadStateMutation = gqlTyped(templateObject_2$k || (templateObject_2$k = __makeTemplateObject(["\nmutation UpdateAllNotificationsReadStateMutation($input: UpdateAllNotificationsReadStateInput!) {\n  updateAllNotificationsReadState(input: $input) {\n    count\n  }\n}\n"], ["\nmutation UpdateAllNotificationsReadStateMutation($input: UpdateAllNotificationsReadStateInput!) {\n  updateAllNotificationsReadState(input: $input) {\n    count\n  }\n}\n"])));
-    var DebugCreateNotificationMutation = gqlTyped(templateObject_3$h || (templateObject_3$h = __makeTemplateObject(["\nmutation DebugCreateNotificationMutation($input: DebugCreateNotificationInput!) {\n  debugCreateNotification(input: $input) {\n    notification {\n      id\n    }\n  }\n}\n"], ["\nmutation DebugCreateNotificationMutation($input: DebugCreateNotificationInput!) {\n  debugCreateNotification(input: $input) {\n    notification {\n      id\n    }\n  }\n}\n"])));
+    var DebugCreateNotificationMutation = gqlTyped(templateObject_3$g || (templateObject_3$g = __makeTemplateObject(["\nmutation DebugCreateNotificationMutation($input: DebugCreateNotificationInput!) {\n  debugCreateNotification(input: $input) {\n    notification {\n      id\n    }\n  }\n}\n"], ["\nmutation DebugCreateNotificationMutation($input: DebugCreateNotificationInput!) {\n  debugCreateNotification(input: $input) {\n    notification {\n      id\n    }\n  }\n}\n"])));
     var DebugDeleteAllNotificationsMutation = gqlTyped(templateObject_4$c || (templateObject_4$c = __makeTemplateObject(["\nmutation DebugDeleteAllNotificationsMutation($input: DebugDeleteAllNotificationsInput!) {\n  debugDeleteAllNotifications(input: $input) {\n    count\n  }\n}\n"], ["\nmutation DebugDeleteAllNotificationsMutation($input: DebugDeleteAllNotificationsInput!) {\n  debugDeleteAllNotifications(input: $input) {\n    count\n  }\n}\n"])));
     var UpdateNotificationFeatureStateMutation = gqlTyped(templateObject_5$b || (templateObject_5$b = __makeTemplateObject(["\nmutation UpdateNotificationFeatureStateMutation($input: UpdateNotificationFeatureStateInput!) {\n  updateNotificationFeatureState(input: $input) {\n    featureState {\n      notificationsLastViewed\n\t\t}\n  }\n}\n"], ["\nmutation UpdateNotificationFeatureStateMutation($input: UpdateNotificationFeatureStateInput!) {\n  updateNotificationFeatureState(input: $input) {\n    featureState {\n      notificationsLastViewed\n\t\t}\n  }\n}\n"])));
-    var templateObject_1$n, templateObject_2$k, templateObject_3$h, templateObject_4$c, templateObject_5$b;
+    var templateObject_1$n, templateObject_2$k, templateObject_3$g, templateObject_4$c, templateObject_5$b;
 
     exports.NotificationService = /** @class */ (function (_super) {
         __extends(NotificationService, _super);
@@ -11234,14 +11955,14 @@
 
     var InitiateStripePaymentMethodCaptureMutation = gqlTyped(templateObject_1$o || (templateObject_1$o = __makeTemplateObject(["\nmutation InitiateStripePaymentMethodCaptureMutation {\n  initiateStripePaymentMethodCapture(input: {}) {\n    paymentCapture {\n      stripeIntentId\n      stripeClientSecret\n    }\n  }\n}\n"], ["\nmutation InitiateStripePaymentMethodCaptureMutation {\n  initiateStripePaymentMethodCapture(input: {}) {\n    paymentCapture {\n      stripeIntentId\n      stripeClientSecret\n    }\n  }\n}\n"])));
     var CompleteStripePaymentMethodCaptureMutation = gqlTyped(templateObject_2$l || (templateObject_2$l = __makeTemplateObject(["\nmutation CompleteStripePaymentMethodCaptureMutation($input: CompleteStripePaymentMethodCaptureInput!) {\n  completeStripePaymentMethodCapture(input: $input) {\n    paymentMethod {\n      id\n      created\n      modified\n      card {\n        brand\n        lastFourDigits\n        expiryYear\n        expiryMonth\n      }\n      isDefault      \n    }\n  }\n}\n"], ["\nmutation CompleteStripePaymentMethodCaptureMutation($input: CompleteStripePaymentMethodCaptureInput!) {\n  completeStripePaymentMethodCapture(input: $input) {\n    paymentMethod {\n      id\n      created\n      modified\n      card {\n        brand\n        lastFourDigits\n        expiryYear\n        expiryMonth\n      }\n      isDefault      \n    }\n  }\n}\n"])));
-    var RemovePaymentMethodMutation = gqlTyped(templateObject_3$i || (templateObject_3$i = __makeTemplateObject(["\nmutation RemovePaymentMethodMutation($input: RemovePaymentMethodInput!) {\n  removePaymentMethod(input: $input) {\n    id\n  }\n}\n"], ["\nmutation RemovePaymentMethodMutation($input: RemovePaymentMethodInput!) {\n  removePaymentMethod(input: $input) {\n    id\n  }\n}\n"])));
+    var RemovePaymentMethodMutation = gqlTyped(templateObject_3$h || (templateObject_3$h = __makeTemplateObject(["\nmutation RemovePaymentMethodMutation($input: RemovePaymentMethodInput!) {\n  removePaymentMethod(input: $input) {\n    id\n  }\n}\n"], ["\nmutation RemovePaymentMethodMutation($input: RemovePaymentMethodInput!) {\n  removePaymentMethod(input: $input) {\n    id\n  }\n}\n"])));
     var SetDefaultPaymentMethodMutation = gqlTyped(templateObject_4$d || (templateObject_4$d = __makeTemplateObject(["\nmutation SetDefaultPaymentMethodMutation($input: SetDefaultPaymentMethodInput!) {\n  setDefaultPaymentMethod(input: $input) {\n    paymentMethod {\n      id\n    }  \n  }\n}\n"], ["\nmutation SetDefaultPaymentMethodMutation($input: SetDefaultPaymentMethodInput!) {\n  setDefaultPaymentMethod(input: $input) {\n    paymentMethod {\n      id\n    }  \n  }\n}\n"])));
     var RemoveDefaultPaymentMethodMutation = gqlTyped(templateObject_5$c || (templateObject_5$c = __makeTemplateObject(["\nmutation RemoveDefaultPaymentMethodMutation {\n  removeDefaultPaymentMethod(input: {}) {\n    paymentMethod {\n      id\n    }  \n  }\n}\n"], ["\nmutation RemoveDefaultPaymentMethodMutation {\n  removeDefaultPaymentMethod(input: {}) {\n    paymentMethod {\n      id\n    }  \n  }\n}\n"])));
     var IssuePlanMutation = gqlTyped(templateObject_6$9 || (templateObject_6$9 = __makeTemplateObject(["\nmutation IssuePlanMutation($input: IssuePlanInput!) {\n  issuePlan(input: $input) {\n    plan {\n      id\n    }\n  }\n}\n"], ["\nmutation IssuePlanMutation($input: IssuePlanInput!) {\n  issuePlan(input: $input) {\n    plan {\n      id\n    }\n  }\n}\n"])));
     var CancelPlanMutation = gqlTyped(templateObject_7$8 || (templateObject_7$8 = __makeTemplateObject(["\nmutation CancelPlanMutation($input: CancelPlanInput!) {\n  cancelPlan(input: $input) {\n    plan {\n      id\n    }  \n  }\n}\n"], ["\nmutation CancelPlanMutation($input: CancelPlanInput!) {\n  cancelPlan(input: $input) {\n    plan {\n      id\n    }  \n  }\n}\n"])));
     var ChangePriceOptionMutation = gqlTyped(templateObject_8$7 || (templateObject_8$7 = __makeTemplateObject(["\nmutation ChangePriceOptionMutation($input: ChangePriceOptionInput!) {\n  changePriceOption(input: $input) {\n    plan {\n      id\n    }\n  }\n}\n"], ["\nmutation ChangePriceOptionMutation($input: ChangePriceOptionInput!) {\n  changePriceOption(input: $input) {\n    plan {\n      id\n    }\n  }\n}\n"])));
     var ReactivatePlanMutation = gqlTyped(templateObject_9$5 || (templateObject_9$5 = __makeTemplateObject(["\nmutation ReactivatePlanMutation($input: ReactivatePlanInput!) {\n  reactivatePlan(input: $input) {\n    plan {\n      id\n    }\n  }\n}\n"], ["\nmutation ReactivatePlanMutation($input: ReactivatePlanInput!) {\n  reactivatePlan(input: $input) {\n    plan {\n      id\n    }\n  }\n}\n"])));
-    var templateObject_1$o, templateObject_2$l, templateObject_3$i, templateObject_4$d, templateObject_5$c, templateObject_6$9, templateObject_7$8, templateObject_8$7, templateObject_9$5;
+    var templateObject_1$o, templateObject_2$l, templateObject_3$h, templateObject_4$d, templateObject_5$c, templateObject_6$9, templateObject_7$8, templateObject_8$7, templateObject_9$5;
 
     exports.Plan2Service = /** @class */ (function (_super) {
         __extends(Plan2Service, _super);
@@ -11486,22 +12207,20 @@
                             return [4 /*yield*/, this.keyGraph.getKey(sharedKeyId)];
                         case 2:
                             sharedKey = _e.sent();
-                            return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 3:
-                            sigPxk = _e.sent();
+                            sigPxk = this.keyService.currentSigPxk;
                             return [4 /*yield*/, this.encryptionService.encrypt(sharedKey.jwk, contactCard)];
-                        case 4:
+                        case 3:
                             sharedCipherData = _e.sent();
                             _b = (_a = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, sharedCipherData)];
-                        case 5:
+                        case 4:
                             sharedCipherDataSig = _b.apply(_a, [_e.sent()]);
                             ownerPlainData = {
                                 name: new ContactCardName(contactCard.name),
                             };
                             _d = (_c = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, ownerPlainData)];
-                        case 6:
+                        case 5:
                             ownerPlainDataSig = _d.apply(_c, [_e.sent()]);
                             return [4 /*yield*/, this.lrApollo.mutate({
                                     mutation: UpdateOwnedContactCard,
@@ -11517,7 +12236,7 @@
                                         },
                                     },
                                 })];
-                        case 7:
+                        case 6:
                             _e.sent();
                             return [2 /*return*/];
                     }
@@ -11540,16 +12259,94 @@
     ]; };
     var templateObject_1$p;
 
+    var RequestUserDeleteMutation = gql__default['default'](templateObject_1$q || (templateObject_1$q = __makeTemplateObject(["\n  mutation RequestUserDelete($input: RequestUserDeleteInput!) {\n    requestUserDelete(input: $input) {\n      userDelete {\n        state\n        created\n      }\n    }\n  }\n"], ["\n  mutation RequestUserDelete($input: RequestUserDeleteInput!) {\n    requestUserDelete(input: $input) {\n      userDelete {\n        state\n        created\n      }\n    }\n  }\n"])));
+    var CancelUserDeleteMutation = gql__default['default'](templateObject_2$m || (templateObject_2$m = __makeTemplateObject(["\n  mutation CancelUserDelete($input: CancelUserDeleteInput!) {\n    cancelUserDelete(input: $input) {\n      id\n    }\n  }\n"], ["\n  mutation CancelUserDelete($input: CancelUserDeleteInput!) {\n    cancelUserDelete(input: $input) {\n      id\n    }\n  }\n"])));
+    var LoginHistoryQuery = gql__default['default'](templateObject_3$i || (templateObject_3$i = __makeTemplateObject(["\n  query LoginHistory($first: Int, $after: String) {\n    loginHistory(first: $first, after: $after) {\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      events\n    }\n  }\n"], ["\n  query LoginHistory($first: Int, $after: String) {\n    loginHistory(first: $first, after: $after) {\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      events\n    }\n  }\n"])));
+    var templateObject_1$q, templateObject_2$m, templateObject_3$i;
+
+    var UserService = /** @class */ (function () {
+        function UserService(lrApollo) {
+            this.lrApollo = lrApollo;
+        }
+        UserService.prototype.requestUserDelete = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var res;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.lrApollo.mutate({
+                                mutation: RequestUserDeleteMutation,
+                                variables: {
+                                    input: {},
+                                },
+                            })];
+                        case 1:
+                            res = _a.sent();
+                            return [2 /*return*/, res.requestUserDelete.userDelete];
+                    }
+                });
+            });
+        };
+        UserService.prototype.cancelUserDelete = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var res;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.lrApollo.mutate({
+                                mutation: CancelUserDeleteMutation,
+                                variables: {
+                                    input: {},
+                                },
+                            })];
+                        case 1:
+                            res = _a.sent();
+                            return [2 /*return*/, res.cancelUserDelete.id];
+                    }
+                });
+            });
+        };
+        UserService.prototype.loginHistory = function (first, after) {
+            if (first === void 0) { first = null; }
+            if (after === void 0) { after = null; }
+            return __awaiter(this, void 0, void 0, function () {
+                var res;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.lrApollo.query({
+                                query: LoginHistoryQuery,
+                                variables: {
+                                    first: first,
+                                    after: after,
+                                },
+                            })];
+                        case 1:
+                            res = _a.sent();
+                            return [2 /*return*/, res.loginHistory];
+                    }
+                });
+            });
+        };
+        return UserService;
+    }());
+    UserService.ɵprov = i0.ɵɵdefineInjectable({ factory: function UserService_Factory() { return new UserService(i0.ɵɵinject(LrApolloService)); }, token: UserService, providedIn: "root" });
+    UserService.decorators = [
+        { type: i0.Injectable, args: [{
+                    providedIn: 'root',
+                },] }
+    ];
+    UserService.ctorParameters = function () { return [
+        { type: LrApolloService }
+    ]; };
+
     var TrustedPartyProperties = "\n  id\n  user {\n    id\n    username\n  }\n  other{\n    id\n    username,\n    features {\n      shareVault\n    }\n  }\n  sharedContactCard {\n    " + SharedContactCardFields + "\n  }\n  myContactCard {\n    " + SharedContactCardFields + "\n  }\n  sharedScenarios {\n    edges {\n      node {\n        id\n      }\n    }\n  }\n  theirItems {\n    directories {\n      edges {\n        node {\n          id\n        }\n      }\n    }\n  }\n  currentUserSharedKey {\n    userSharedKey {\n      keyExchange {\n        " + KeyExchangeFields + "\n      }\n      " + UserSharedKeyFields + "\n    }\n  }";
-    var GetTrustedPartiesQuery = gql__default['default'](templateObject_1$q || (templateObject_1$q = __makeTemplateObject(["\nquery GetTrustedPartiesQuery {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  ", "\n}"], ["\nquery GetTrustedPartiesQuery {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  ", "\n}"])), TrustedPartyProperties, KeyGraphField);
-    var GetAllTrustedPartiesQuery = gql__default['default'](templateObject_2$m || (templateObject_2$m = __makeTemplateObject(["\nquery GetAllTrustedPartiesQuery($userId: ID, $isExpired: Boolean, $inviteState: String, $sentInviteState: String) {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  invites: keyExchanges(\n    responder: $userId\n    isExpired: $isExpired\n    state: $inviteState\n    orderBy: \"state,-created\"\n  ) {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  sentInvites: keyExchanges(\n    initiator: $userId\n    isExpired: $isExpired\n    state: $sentInviteState\n    orderBy: \"state,-created\"\n  ) {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  ", "\n}"], ["\nquery GetAllTrustedPartiesQuery($userId: ID, $isExpired: Boolean, $inviteState: String, $sentInviteState: String) {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  invites: keyExchanges(\n    responder: $userId\n    isExpired: $isExpired\n    state: $inviteState\n    orderBy: \"state,-created\"\n  ) {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  sentInvites: keyExchanges(\n    initiator: $userId\n    isExpired: $isExpired\n    state: $sentInviteState\n    orderBy: \"state,-created\"\n  ) {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  ", "\n}"])), TrustedPartyProperties, KeyExchangeFields, KeyExchangeFields, KeyGraphField);
+    var GetTrustedPartiesQuery = gql__default['default'](templateObject_1$r || (templateObject_1$r = __makeTemplateObject(["\nquery GetTrustedPartiesQuery {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  ", "\n}"], ["\nquery GetTrustedPartiesQuery {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  ", "\n}"])), TrustedPartyProperties, KeyGraphField);
+    var GetAllTrustedPartiesQuery = gql__default['default'](templateObject_2$n || (templateObject_2$n = __makeTemplateObject(["\nquery GetAllTrustedPartiesQuery($userId: ID, $isExpired: Boolean, $inviteState: String, $sentInviteState: String) {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  invites: keyExchanges(\n    responder: $userId\n    isExpired: $isExpired\n    state: $inviteState\n    orderBy: \"state,-created\"\n  ) {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  sentInvites: keyExchanges(\n    initiator: $userId\n    isExpired: $isExpired\n    state: $sentInviteState\n    orderBy: \"state,-created\"\n  ) {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  ", "\n}"], ["\nquery GetAllTrustedPartiesQuery($userId: ID, $isExpired: Boolean, $inviteState: String, $sentInviteState: String) {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  invites: keyExchanges(\n    responder: $userId\n    isExpired: $isExpired\n    state: $inviteState\n    orderBy: \"state,-created\"\n  ) {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  sentInvites: keyExchanges(\n    initiator: $userId\n    isExpired: $isExpired\n    state: $sentInviteState\n    orderBy: \"state,-created\"\n  ) {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n  ", "\n}"])), TrustedPartyProperties, KeyExchangeFields, KeyExchangeFields, KeyGraphField);
     var GetTrustedPartyQuery = gql__default['default'](templateObject_3$j || (templateObject_3$j = __makeTemplateObject(["\nquery GetTrustedPartyQuery($partyId: LrRelayIdInput!) {\n  tp(id: $partyId) {\n    ", "\n  }\n  ", "\n}"], ["\nquery GetTrustedPartyQuery($partyId: LrRelayIdInput!) {\n  tp(id: $partyId) {\n    ", "\n  }\n  ", "\n}"])), TrustedPartyProperties, KeyGraphField);
     var DeclineTrustedPartyInvitationMutation = gql__default['default'](templateObject_4$e || (templateObject_4$e = __makeTemplateObject(["\n  mutation DeclineKeyExchange($input: DeclineKeyExchangeInput!) {\n    declineKeyExchange(input: $input) {\n      keyExchange {\n        id\n      }\n    }\n  }\n"], ["\n  mutation DeclineKeyExchange($input: DeclineKeyExchangeInput!) {\n    declineKeyExchange(input: $input) {\n      keyExchange {\n        id\n      }\n    }\n  }\n"])));
     var CancelTrustedPartyInvitationMutation = gql__default['default'](templateObject_5$d || (templateObject_5$d = __makeTemplateObject(["\n  mutation CancelKeyExchange($input: CancelKeyExchangeInput!) {\n    cancelKeyExchange(input: $input) {\n      keyExchange {\n        id\n      }\n    }\n  }\n"], ["\n  mutation CancelKeyExchange($input: CancelKeyExchangeInput!) {\n    cancelKeyExchange(input: $input) {\n      keyExchange {\n        id\n      }\n    }\n  }\n"])));
     var DeleteTrustedPartyMutation = gql__default['default'](templateObject_6$a || (templateObject_6$a = __makeTemplateObject(["\n  mutation DeleteTpMutation($input: DeleteTpInput!) {\n    deleteTp(input: $input) {\n      id\n    }\n  }\n"], ["\n  mutation DeleteTpMutation($input: DeleteTpInput!) {\n    deleteTp(input: $input) {\n      id\n    }\n  }\n"])));
     var ShareCategoryMutation = gql__default['default'](templateObject_7$9 || (templateObject_7$9 = __makeTemplateObject(["\n  mutation ShareDirectory($input: ShareDirectoryInput!) {\n    shareDirectory(input: $input) {\n      tpSharedDirectory {\n        item {\n          plainMeta\n        }\n      }\n    }\n  }\n"], ["\n  mutation ShareDirectory($input: ShareDirectoryInput!) {\n    shareDirectory(input: $input) {\n      tpSharedDirectory {\n        item {\n          plainMeta\n        }\n      }\n    }\n  }\n"])));
     var UnshareCategoryMutation = gql__default['default'](templateObject_8$8 || (templateObject_8$8 = __makeTemplateObject(["\n  mutation UnshareDirectory($input: UnshareDirectoryInput!) {\n    unshareDirectory(input: $input) {\n      tpSharedDirectory {\n        item {\n          plainMeta\n        }\n      }\n    }\n  }\n"], ["\n  mutation UnshareDirectory($input: UnshareDirectoryInput!) {\n    unshareDirectory(input: $input) {\n      tpSharedDirectory {\n        item {\n          plainMeta\n        }\n      }\n    }\n  }\n"])));
-    var templateObject_1$q, templateObject_2$m, templateObject_3$j, templateObject_4$e, templateObject_5$d, templateObject_6$a, templateObject_7$9, templateObject_8$8;
+    var templateObject_1$r, templateObject_2$n, templateObject_3$j, templateObject_4$e, templateObject_5$d, templateObject_6$a, templateObject_7$9, templateObject_8$8;
 
     var TrustedPartyRole = /** @class */ (function () {
         function TrustedPartyRole() {
@@ -12041,14 +12838,14 @@
         };
         return TrustedPartyService;
     }());
-    TrustedPartyService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TrustedPartyService_Factory() { return new TrustedPartyService(i0.ɵɵinject(i2$1.HttpClient), i0.ɵɵinject(LrApolloService), i0.ɵɵinject(SharedContactCardService), i0.ɵɵinject(UserService), i0.ɵɵinject(LifeReadyAuthService), i0.ɵɵinject(KeyExchangeService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(KeyService), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(EncryptionService)); }, token: TrustedPartyService, providedIn: "root" });
+    TrustedPartyService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TrustedPartyService_Factory() { return new TrustedPartyService(i0.ɵɵinject(i2$2.HttpClient), i0.ɵɵinject(LrApolloService), i0.ɵɵinject(SharedContactCardService), i0.ɵɵinject(UserService), i0.ɵɵinject(LifeReadyAuthService), i0.ɵɵinject(KeyExchangeService), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(KeyService), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(EncryptionService)); }, token: TrustedPartyService, providedIn: "root" });
     TrustedPartyService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
     TrustedPartyService.ctorParameters = function () { return [
-        { type: i2$1.HttpClient },
+        { type: i2$2.HttpClient },
         { type: LrApolloService },
         { type: SharedContactCardService },
         { type: UserService },
@@ -12489,14 +13286,14 @@
         };
         return RecordTypeService;
     }());
-    RecordTypeService.ɵprov = i0.ɵɵdefineInjectable({ factory: function RecordTypeService_Factory() { return new RecordTypeService(i0.ɵɵinject(i2$1.HttpClient)); }, token: RecordTypeService, providedIn: "root" });
+    RecordTypeService.ɵprov = i0.ɵɵdefineInjectable({ factory: function RecordTypeService_Factory() { return new RecordTypeService(i0.ɵɵinject(i2$2.HttpClient)); }, token: RecordTypeService, providedIn: "root" });
     RecordTypeService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
     RecordTypeService.ctorParameters = function () { return [
-        { type: i2$1.HttpClient }
+        { type: i2$2.HttpClient }
     ]; };
 
     (function (RecordFieldType) {
@@ -13158,7 +13955,7 @@
         };
         return RegisterService;
     }());
-    RegisterService.ɵprov = i0.ɵɵdefineInjectable({ factory: function RegisterService_Factory() { return new RegisterService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i4.AuthClass), i0.ɵɵinject(i2$1.HttpClient), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(PasswordService)); }, token: RegisterService, providedIn: "root" });
+    RegisterService.ɵprov = i0.ɵɵdefineInjectable({ factory: function RegisterService_Factory() { return new RegisterService(i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(i2.AuthClass), i0.ɵɵinject(i2$2.HttpClient), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(PasswordService)); }, token: RegisterService, providedIn: "root" });
     RegisterService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -13166,8 +13963,8 @@
     ];
     RegisterService.ctorParameters = function () { return [
         { type: undefined, decorators: [{ type: i0.Inject, args: [KC_CONFIG,] }] },
-        { type: i4.AuthClass },
-        { type: i2$1.HttpClient },
+        { type: i2.AuthClass },
+        { type: i2$2.HttpClient },
         { type: KeyFactoryService },
         { type: EncryptionService },
         { type: PasswordService }
@@ -13205,8 +14002,8 @@
         })
     ], exports.ɵn);
 
-    var CreateScenarioMutation = gqlTyped(templateObject_1$r || (templateObject_1$r = __makeTemplateObject(["\nmutation CreateScenarioMutation($input: CreateScenarioInput!) {\n  createScenario(input: $input) {\n    scenario {\n      id\n    }\n  }\n}\n"], ["\nmutation CreateScenarioMutation($input: CreateScenarioInput!) {\n  createScenario(input: $input) {\n    scenario {\n      id\n    }\n  }\n}\n"])));
-    var UpdateScenarioMutation = gqlTyped(templateObject_2$n || (templateObject_2$n = __makeTemplateObject(["\nmutation UpdateScenarioMutation($input: UpdateScenarioInput!) {\n  updateScenario(input: $input) {\n    scenario {\n      id\n    }\n  }\n}\n"], ["\nmutation UpdateScenarioMutation($input: UpdateScenarioInput!) {\n  updateScenario(input: $input) {\n    scenario {\n      id\n    }\n  }\n}\n"])));
+    var CreateScenarioMutation = gqlTyped(templateObject_1$s || (templateObject_1$s = __makeTemplateObject(["\nmutation CreateScenarioMutation($input: CreateScenarioInput!) {\n  createScenario(input: $input) {\n    scenario {\n      id\n    }\n  }\n}\n"], ["\nmutation CreateScenarioMutation($input: CreateScenarioInput!) {\n  createScenario(input: $input) {\n    scenario {\n      id\n    }\n  }\n}\n"])));
+    var UpdateScenarioMutation = gqlTyped(templateObject_2$o || (templateObject_2$o = __makeTemplateObject(["\nmutation UpdateScenarioMutation($input: UpdateScenarioInput!) {\n  updateScenario(input: $input) {\n    scenario {\n      id\n    }\n  }\n}\n"], ["\nmutation UpdateScenarioMutation($input: UpdateScenarioInput!) {\n  updateScenario(input: $input) {\n    scenario {\n      id\n    }\n  }\n}\n"])));
     var DeleteScenarioMutation = gqlTyped(templateObject_3$k || (templateObject_3$k = __makeTemplateObject(["\nmutation DeleteScenarioMutation($input: DeleteScenarioInput!) {\n  deleteScenario(input: $input) {\n    id\n  }\n}\n"], ["\nmutation DeleteScenarioMutation($input: DeleteScenarioInput!) {\n  deleteScenario(input: $input) {\n    id\n  }\n}\n"])));
     var CreateScenarioClaimMutation = gqlTyped(templateObject_4$f || (templateObject_4$f = __makeTemplateObject(["\nmutation CreateScenarioClaimMutation($input: CreateScenarioClaimInput!) {\n  createScenarioClaim(input: $input) {\n    sharedClaim {\n      id\n    }\n  }\n}\n"], ["\nmutation CreateScenarioClaimMutation($input: CreateScenarioClaimInput!) {\n  createScenarioClaim(input: $input) {\n    sharedClaim {\n      id\n    }\n  }\n}\n"])));
     var CancelScenarioClaimMutation = gqlTyped(templateObject_5$e || (templateObject_5$e = __makeTemplateObject(["\nmutation CancelScenarioClaimMutation($input: CancelScenarioClaimInput!) {\n  cancelScenarioClaim(input: $input) {\n    sharedClaim {\n      id\n    }\n  }\n}\n"], ["\nmutation CancelScenarioClaimMutation($input: CancelScenarioClaimInput!) {\n  cancelScenarioClaim(input: $input) {\n    sharedClaim {\n      id\n    }\n  }\n}\n"])));
@@ -13215,11 +14012,11 @@
     var ReceiveScenarioClaimMutation = gqlTyped(templateObject_8$9 || (templateObject_8$9 = __makeTemplateObject(["\nmutation ReceiveScenarioClaimMutation($input: ReceiveScenarioClaimInput!) {\n  receiveScenarioClaim(input: $input) {\n    sharedClaim {\n      id\n    }\n  }\n}\n"], ["\nmutation ReceiveScenarioClaimMutation($input: ReceiveScenarioClaimInput!) {\n  receiveScenarioClaim(input: $input) {\n    sharedClaim {\n      id\n    }\n  }\n}\n"])));
     var DebugExpireScenarioClaimMutation = gqlTyped(templateObject_9$6 || (templateObject_9$6 = __makeTemplateObject(["\nmutation DebugExpireScenarioClaimMutation($input: DebugExpireScenarioClaimInput!) {\n  debugExpireScenarioClaim(input: $input) {\n    scenarioClaim {\n      id\n    }\n  }\n}\n"], ["\nmutation DebugExpireScenarioClaimMutation($input: DebugExpireScenarioClaimInput!) {\n  debugExpireScenarioClaim(input: $input) {\n    scenarioClaim {\n      id\n    }\n  }\n}\n"])));
     var DebugExpireTpPasswordResetRequestMutation = gqlTyped(templateObject_10$4 || (templateObject_10$4 = __makeTemplateObject(["\nmutation DebugExpireTpPasswordResetRequestMutation($input: DebugExpireTpPasswordResetRequestInput!) {\n  debugExpireTpPasswordResetRequest(input: $input) {\n    passwordResetRequest {\n      id\n    }\n  }\n}\n"], ["\nmutation DebugExpireTpPasswordResetRequestMutation($input: DebugExpireTpPasswordResetRequestInput!) {\n  debugExpireTpPasswordResetRequest(input: $input) {\n    passwordResetRequest {\n      id\n    }\n  }\n}\n"])));
-    var templateObject_1$r, templateObject_2$n, templateObject_3$k, templateObject_4$f, templateObject_5$e, templateObject_6$b, templateObject_7$a, templateObject_8$9, templateObject_9$6, templateObject_10$4;
+    var templateObject_1$s, templateObject_2$o, templateObject_3$k, templateObject_4$f, templateObject_5$e, templateObject_6$b, templateObject_7$a, templateObject_8$9, templateObject_9$6, templateObject_10$4;
 
-    var ScenarioQuery = gqlTyped(templateObject_1$s || (templateObject_1$s = __makeTemplateObject(["\nquery ScenarioQuery(\n  $scenarioId: LrRelayIdInput!\n) {\n  scenario(id: $scenarioId) {\n    id\n    state\n    assembly {\n      quorum\n      singleReject\n      assemblyKey {\n        id\n      }\n      subjectKey {\n        id\n      }\n      subjectCipherData\n      subAssemblies {\n        edges {\n          node {\n            id\n            subjectKey {\n              id\n            }\n            subjectCipherData\n            quorum\n            singleReject\n            approvers {\n              edges {\n                node {\n                  id\n                  tp {\n                    id\n                  }\n                  sharedKey {\n                    id\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n    claimants {\n      edges {\n        node {\n          tp {\n            id\n          }\n          sharedKey {\n            id\n          }\n        }\n      }\n    }\n    receivers {\n      edges {\n        node {\n          tp {\n            id\n          }\n          sharedKey {\n            id\n          }\n          sharedCipherData\n          receiverDirectories {\n            edges {\n              node {\n                id\n                sharedCipherData\n                sharedKey {\n                  id\n                }\n                accessRole\n                itemKey {\n                  id\n                }\n                directory {\n                  id\n                  keyId\n                }\n              }\n            }\n          }\n          receiverFiles {\n            edges {\n              node {\n                id\n                sharedCipherData\n                sharedKey {\n                  id\n                }\n                accessRole\n                itemKey {\n                  id\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}"], ["\nquery ScenarioQuery(\n  $scenarioId: LrRelayIdInput!\n) {\n  scenario(id: $scenarioId) {\n    id\n    state\n    assembly {\n      quorum\n      singleReject\n      assemblyKey {\n        id\n      }\n      subjectKey {\n        id\n      }\n      subjectCipherData\n      subAssemblies {\n        edges {\n          node {\n            id\n            subjectKey {\n              id\n            }\n            subjectCipherData\n            quorum\n            singleReject\n            approvers {\n              edges {\n                node {\n                  id\n                  tp {\n                    id\n                  }\n                  sharedKey {\n                    id\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n    claimants {\n      edges {\n        node {\n          tp {\n            id\n          }\n          sharedKey {\n            id\n          }\n        }\n      }\n    }\n    receivers {\n      edges {\n        node {\n          tp {\n            id\n          }\n          sharedKey {\n            id\n          }\n          sharedCipherData\n          receiverDirectories {\n            edges {\n              node {\n                id\n                sharedCipherData\n                sharedKey {\n                  id\n                }\n                accessRole\n                itemKey {\n                  id\n                }\n                directory {\n                  id\n                  keyId\n                }\n              }\n            }\n          }\n          receiverFiles {\n            edges {\n              node {\n                id\n                sharedCipherData\n                sharedKey {\n                  id\n                }\n                accessRole\n                itemKey {\n                  id\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}"])));
-    var SharedScenarioQuery = gqlTyped(templateObject_2$o || (templateObject_2$o = __makeTemplateObject(["\nquery SharedScenarioQuery($scenarioId: LrRelayIdInput!) {\n  sharedScenario(id: $scenarioId) {\n    id\n    state\n    tp {\n      id\n    }\n    asClaimant {\n      sharedKey {\n        id\n      }\n      sharedCipherData\n    }\n    asReceiver {\n      sharedKey {\n        id\n      }\n      sharedCipherData\n      pbk {\n        id\n      }\n      receiverDirectories {\n        edges {\n          node {\n            id\n            wrappedItemKey\n          }\n        }\n      }\n    }\n    assembly {\n      asApprovers {\n        edges {\n          node {\n            id\n            sharedKey {\n              id\n            }\n            sharedCipherData\n          }\n        }\n      }\n    }\n    sharedClaim {\n\t \t\tid\n      isClaimant\n      claim {\n        state\n        asClaimApprovers {\n          edges {\n            node {\n              id\n              state\n              sharedKey {\n                id\n              }\n              sharedCipherApprovalData\n              sharedCipherPartialAssemblyKey\n              receiverApprovals {\n                edges {\n                  node {\n                    id\n                    pxk {\n                      id\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n      asClaimReceiver {\n        received\n        approvals {\n          edges {\n            node {\n              receiverCipher\n              receiverCipherPartialAssemblyKey\n              pxk {\n                id\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n"], ["\nquery SharedScenarioQuery($scenarioId: LrRelayIdInput!) {\n  sharedScenario(id: $scenarioId) {\n    id\n    state\n    tp {\n      id\n    }\n    asClaimant {\n      sharedKey {\n        id\n      }\n      sharedCipherData\n    }\n    asReceiver {\n      sharedKey {\n        id\n      }\n      sharedCipherData\n      pbk {\n        id\n      }\n      receiverDirectories {\n        edges {\n          node {\n            id\n            wrappedItemKey\n          }\n        }\n      }\n    }\n    assembly {\n      asApprovers {\n        edges {\n          node {\n            id\n            sharedKey {\n              id\n            }\n            sharedCipherData\n          }\n        }\n      }\n    }\n    sharedClaim {\n\t \t\tid\n      isClaimant\n      claim {\n        state\n        asClaimApprovers {\n          edges {\n            node {\n              id\n              state\n              sharedKey {\n                id\n              }\n              sharedCipherApprovalData\n              sharedCipherPartialAssemblyKey\n              receiverApprovals {\n                edges {\n                  node {\n                    id\n                    pxk {\n                      id\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n      asClaimReceiver {\n        received\n        approvals {\n          edges {\n            node {\n              receiverCipher\n              receiverCipherPartialAssemblyKey\n              pxk {\n                id\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n"])));
-    var templateObject_1$s, templateObject_2$o;
+    var ScenarioQuery = gqlTyped(templateObject_1$t || (templateObject_1$t = __makeTemplateObject(["\nquery ScenarioQuery(\n  $scenarioId: LrRelayIdInput!\n) {\n  scenario(id: $scenarioId) {\n    id\n    state\n    assembly {\n      quorum\n      singleReject\n      assemblyKey {\n        id\n      }\n      subjectKey {\n        id\n      }\n      subjectCipherData\n      subAssemblies {\n        edges {\n          node {\n            id\n            subjectKey {\n              id\n            }\n            subjectCipherData\n            quorum\n            singleReject\n            approvers {\n              edges {\n                node {\n                  id\n                  tp {\n                    id\n                  }\n                  sharedKey {\n                    id\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n    claimants {\n      edges {\n        node {\n          tp {\n            id\n          }\n          sharedKey {\n            id\n          }\n        }\n      }\n    }\n    receivers {\n      edges {\n        node {\n          tp {\n            id\n          }\n          sharedKey {\n            id\n          }\n          sharedCipherData\n          receiverDirectories {\n            edges {\n              node {\n                id\n                sharedCipherData\n                sharedKey {\n                  id\n                }\n                accessRole\n                itemKey {\n                  id\n                }\n                directory {\n                  id\n                  keyId\n                }\n              }\n            }\n          }\n          receiverFiles {\n            edges {\n              node {\n                id\n                sharedCipherData\n                sharedKey {\n                  id\n                }\n                accessRole\n                itemKey {\n                  id\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}"], ["\nquery ScenarioQuery(\n  $scenarioId: LrRelayIdInput!\n) {\n  scenario(id: $scenarioId) {\n    id\n    state\n    assembly {\n      quorum\n      singleReject\n      assemblyKey {\n        id\n      }\n      subjectKey {\n        id\n      }\n      subjectCipherData\n      subAssemblies {\n        edges {\n          node {\n            id\n            subjectKey {\n              id\n            }\n            subjectCipherData\n            quorum\n            singleReject\n            approvers {\n              edges {\n                node {\n                  id\n                  tp {\n                    id\n                  }\n                  sharedKey {\n                    id\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n    claimants {\n      edges {\n        node {\n          tp {\n            id\n          }\n          sharedKey {\n            id\n          }\n        }\n      }\n    }\n    receivers {\n      edges {\n        node {\n          tp {\n            id\n          }\n          sharedKey {\n            id\n          }\n          sharedCipherData\n          receiverDirectories {\n            edges {\n              node {\n                id\n                sharedCipherData\n                sharedKey {\n                  id\n                }\n                accessRole\n                itemKey {\n                  id\n                }\n                directory {\n                  id\n                  keyId\n                }\n              }\n            }\n          }\n          receiverFiles {\n            edges {\n              node {\n                id\n                sharedCipherData\n                sharedKey {\n                  id\n                }\n                accessRole\n                itemKey {\n                  id\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}"])));
+    var SharedScenarioQuery = gqlTyped(templateObject_2$p || (templateObject_2$p = __makeTemplateObject(["\nquery SharedScenarioQuery($scenarioId: LrRelayIdInput!) {\n  sharedScenario(id: $scenarioId) {\n    id\n    state\n    tp {\n      id\n    }\n    asClaimant {\n      sharedKey {\n        id\n      }\n      sharedCipherData\n    }\n    asReceiver {\n      sharedKey {\n        id\n      }\n      sharedCipherData\n      pbk {\n        id\n      }\n      receiverDirectories {\n        edges {\n          node {\n            id\n            wrappedItemKey\n          }\n        }\n      }\n    }\n    assembly {\n      asApprovers {\n        edges {\n          node {\n            id\n            sharedKey {\n              id\n            }\n            sharedCipherData\n          }\n        }\n      }\n    }\n    sharedClaim {\n\t \t\tid\n      isClaimant\n      claim {\n        state\n        asClaimApprovers {\n          edges {\n            node {\n              id\n              state\n              sharedKey {\n                id\n              }\n              sharedCipherApprovalData\n              sharedCipherPartialAssemblyKey\n              receiverApprovals {\n                edges {\n                  node {\n                    id\n                    pxk {\n                      id\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n      asClaimReceiver {\n        received\n        approvals {\n          edges {\n            node {\n              receiverCipher\n              receiverCipherPartialAssemblyKey\n              pxk {\n                id\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n"], ["\nquery SharedScenarioQuery($scenarioId: LrRelayIdInput!) {\n  sharedScenario(id: $scenarioId) {\n    id\n    state\n    tp {\n      id\n    }\n    asClaimant {\n      sharedKey {\n        id\n      }\n      sharedCipherData\n    }\n    asReceiver {\n      sharedKey {\n        id\n      }\n      sharedCipherData\n      pbk {\n        id\n      }\n      receiverDirectories {\n        edges {\n          node {\n            id\n            wrappedItemKey\n          }\n        }\n      }\n    }\n    assembly {\n      asApprovers {\n        edges {\n          node {\n            id\n            sharedKey {\n              id\n            }\n            sharedCipherData\n          }\n        }\n      }\n    }\n    sharedClaim {\n\t \t\tid\n      isClaimant\n      claim {\n        state\n        asClaimApprovers {\n          edges {\n            node {\n              id\n              state\n              sharedKey {\n                id\n              }\n              sharedCipherApprovalData\n              sharedCipherPartialAssemblyKey\n              receiverApprovals {\n                edges {\n                  node {\n                    id\n                    pxk {\n                      id\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n      asClaimReceiver {\n        received\n        approvals {\n          edges {\n            node {\n              receiverCipher\n              receiverCipherPartialAssemblyKey\n              pxk {\n                id\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n"])));
+    var templateObject_1$t, templateObject_2$p;
 
     function throwClaimIdMismatch() {
         throw new KcBadArgumentException('claimId does not match with the current claimId of the scenario');
@@ -14065,8 +14862,8 @@
         })
     ], exports.ScenarioService);
 
-    var ServerConfigQuery = gqlTyped(templateObject_1$t || (templateObject_1$t = __makeTemplateObject(["\nquery ServerConfigQuery {\n  serverConfig {\n    relayConnectionMaxLimit\n  }\n}\n"], ["\nquery ServerConfigQuery {\n  serverConfig {\n    relayConnectionMaxLimit\n  }\n}\n"])));
-    var templateObject_1$t;
+    var ServerConfigQuery = gqlTyped(templateObject_1$u || (templateObject_1$u = __makeTemplateObject(["\nquery ServerConfigQuery {\n  serverConfig {\n    relayConnectionMaxLimit\n  }\n}\n"], ["\nquery ServerConfigQuery {\n  serverConfig {\n    relayConnectionMaxLimit\n  }\n}\n"])));
+    var templateObject_1$u;
 
     exports.ServerConfigService = /** @class */ (function (_super) {
         __extends(ServerConfigService, _super);
@@ -14114,11 +14911,11 @@
         })
     ], exports.ServerConfigService);
 
-    var UpdateOwnedContactCardMutation = gqlTyped(templateObject_1$u || (templateObject_1$u = __makeTemplateObject(["\nmutation UpdateOwnedContactCardMutation(\n  $input: UpdateOwnedContactCardInput!\n) {\n  updateOwnedContactCard(input: $input) {\n    ownedContactCard {\n      id\n    }\n  }\n}"], ["\nmutation UpdateOwnedContactCardMutation(\n  $input: UpdateOwnedContactCardInput!\n) {\n  updateOwnedContactCard(input: $input) {\n    ownedContactCard {\n      id\n    }\n  }\n}"])));
-    var UpdateReceivedContactCardMutation = gqlTyped(templateObject_2$p || (templateObject_2$p = __makeTemplateObject(["\nmutation UpdateReceivedContactCardMutation(\n  $input: UpdateReceivedContactCardInput!\n) {\n  updateReceivedContactCard(input: $input) {\n    receivedContactCard {\n      id\n    }\n  }\n}"], ["\nmutation UpdateReceivedContactCardMutation(\n  $input: UpdateReceivedContactCardInput!\n) {\n  updateReceivedContactCard(input: $input) {\n    receivedContactCard {\n      id\n    }\n  }\n}"])));
+    var UpdateOwnedContactCardMutation = gqlTyped(templateObject_1$v || (templateObject_1$v = __makeTemplateObject(["\nmutation UpdateOwnedContactCardMutation(\n  $input: UpdateOwnedContactCardInput!\n) {\n  updateOwnedContactCard(input: $input) {\n    ownedContactCard {\n      id\n    }\n  }\n}"], ["\nmutation UpdateOwnedContactCardMutation(\n  $input: UpdateOwnedContactCardInput!\n) {\n  updateOwnedContactCard(input: $input) {\n    ownedContactCard {\n      id\n    }\n  }\n}"])));
+    var UpdateReceivedContactCardMutation = gqlTyped(templateObject_2$q || (templateObject_2$q = __makeTemplateObject(["\nmutation UpdateReceivedContactCardMutation(\n  $input: UpdateReceivedContactCardInput!\n) {\n  updateReceivedContactCard(input: $input) {\n    receivedContactCard {\n      id\n    }\n  }\n}"], ["\nmutation UpdateReceivedContactCardMutation(\n  $input: UpdateReceivedContactCardInput!\n) {\n  updateReceivedContactCard(input: $input) {\n    receivedContactCard {\n      id\n    }\n  }\n}"])));
     var GetOwnedContactCardKeyIdsQuery = gqlTyped(templateObject_3$l || (templateObject_3$l = __makeTemplateObject(["\nquery GetOwnedContactCardKeyIdsQuery($id: LrRelayIdInput!) {\n  ownedContactCard(id: $id) {\n    sharedKey {\n      id\n    }\n    ownerKey {\n      id\n    }\n  }\n}"], ["\nquery GetOwnedContactCardKeyIdsQuery($id: LrRelayIdInput!) {\n  ownedContactCard(id: $id) {\n    sharedKey {\n      id\n    }\n    ownerKey {\n      id\n    }\n  }\n}"])));
     var GetReceivedContactCardKeyIdQuery = gqlTyped(templateObject_4$g || (templateObject_4$g = __makeTemplateObject(["\nquery GetReceivedContactCardKeyIdQuery($id: LrRelayIdInput!) {\n  receivedContactCard(id: $id) {\n    receiverKey {\n      id\n    }\n  }\n}"], ["\nquery GetReceivedContactCardKeyIdQuery($id: LrRelayIdInput!) {\n  receivedContactCard(id: $id) {\n    receiverKey {\n      id\n    }\n  }\n}"])));
-    var templateObject_1$u, templateObject_2$p, templateObject_3$l, templateObject_4$g;
+    var templateObject_1$v, templateObject_2$q, templateObject_3$l, templateObject_4$g;
 
     exports.SharedContactCard2Service = /** @class */ (function () {
         function SharedContactCard2Service(ngZone, keyService, keyGraph, encryptionService, lrGraphQL) {
@@ -14192,22 +14989,21 @@
                         case 6:
                             sharedKey = _e.sent();
                             return [3 /*break*/, 7];
-                        case 7: return [4 /*yield*/, this.keyService.getCurrentSigPxk()];
-                        case 8:
-                            sigPxk = _e.sent();
+                        case 7:
+                            sigPxk = this.keyService.currentSigPxk;
                             return [4 /*yield*/, this.encryptionService.encrypt(sharedKey.jwk, sharedCipherDataClearJson)];
-                        case 9:
+                        case 8:
                             sharedCipherData = _e.sent();
                             _b = (_a = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, sharedCipherData)];
-                        case 10:
+                        case 9:
                             sharedCipherDataSig = _b.apply(_a, [_e.sent()]);
                             _d = (_c = JSON).stringify;
                             return [4 /*yield*/, this.encryptionService.sign(sigPxk.jwk, ownerPlainDataJson)];
-                        case 11:
+                        case 10:
                             ownerPlainDataSig = _d.apply(_c, [_e.sent()]);
                             return [4 /*yield*/, this.encryptionService.encryptToString(ownerKey.jwk, ownerCipherDataClearJson)];
-                        case 12:
+                        case 11:
                             ownerCipherData = _e.sent();
                             return [2 /*return*/, new LrMutation({
                                     mutation: UpdateOwnedContactCardMutation,
@@ -14608,7 +15404,7 @@
         };
         return TpPasswordResetUserService;
     }(LrService));
-    exports.TpPasswordResetUserService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TpPasswordResetUserService_Factory() { return new exports.TpPasswordResetUserService(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(PasswordService), i0.ɵɵinject(i2$1.HttpClient), i0.ɵɵinject(i4.AuthClass)); }, token: exports.TpPasswordResetUserService, providedIn: "root" });
+    exports.TpPasswordResetUserService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TpPasswordResetUserService_Factory() { return new exports.TpPasswordResetUserService(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(KC_CONFIG), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(PasswordService), i0.ɵɵinject(i2$2.HttpClient), i0.ɵɵinject(i2.AuthClass)); }, token: exports.TpPasswordResetUserService, providedIn: "root" });
     exports.TpPasswordResetUserService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -14621,8 +15417,8 @@
         { type: KeyFactoryService },
         { type: EncryptionService },
         { type: PasswordService },
-        { type: i2$1.HttpClient },
-        { type: i4.AuthClass }
+        { type: i2$2.HttpClient },
+        { type: i2.AuthClass }
     ]; };
     exports.TpPasswordResetUserService = __decorate([
         RunOutsideAngular({
@@ -14748,18 +15544,18 @@
         })
     ], exports.TpPasswordResetService);
 
-    var DeleteTpMutation = gqlTyped(templateObject_1$v || (templateObject_1$v = __makeTemplateObject(["\nmutation DeleteTpMutation($input: DeleteTpInput!) {\n  deleteTp(input: $input) {\n    id\n  }\n}\n"], ["\nmutation DeleteTpMutation($input: DeleteTpInput!) {\n  deleteTp(input: $input) {\n    id\n  }\n}\n"])));
-    var ShareDirectoryMutation = gqlTyped(templateObject_2$q || (templateObject_2$q = __makeTemplateObject(["\n  mutation ShareDirectoryMutation($input: ShareDirectoryInput!) {\n    shareDirectory(input: $input) {\n      tpSharedDirectory {\n        id\n      }\n    }\n  }\n"], ["\n  mutation ShareDirectoryMutation($input: ShareDirectoryInput!) {\n    shareDirectory(input: $input) {\n      tpSharedDirectory {\n        id\n      }\n    }\n  }\n"])));
+    var DeleteTpMutation = gqlTyped(templateObject_1$w || (templateObject_1$w = __makeTemplateObject(["\nmutation DeleteTpMutation($input: DeleteTpInput!) {\n  deleteTp(input: $input) {\n    id\n  }\n}\n"], ["\nmutation DeleteTpMutation($input: DeleteTpInput!) {\n  deleteTp(input: $input) {\n    id\n  }\n}\n"])));
+    var ShareDirectoryMutation = gqlTyped(templateObject_2$r || (templateObject_2$r = __makeTemplateObject(["\n  mutation ShareDirectoryMutation($input: ShareDirectoryInput!) {\n    shareDirectory(input: $input) {\n      tpSharedDirectory {\n        id\n      }\n    }\n  }\n"], ["\n  mutation ShareDirectoryMutation($input: ShareDirectoryInput!) {\n    shareDirectory(input: $input) {\n      tpSharedDirectory {\n        id\n      }\n    }\n  }\n"])));
     var UnshareDirectoryMutation = gqlTyped(templateObject_3$m || (templateObject_3$m = __makeTemplateObject(["\n  mutation UnshareDirectoryMutation($input: UnshareDirectoryInput!) {\n    unshareDirectory(input: $input) {\n      tpSharedDirectory {\n        id\n      }\n    }\n  }\n"], ["\n  mutation UnshareDirectoryMutation($input: UnshareDirectoryInput!) {\n    unshareDirectory(input: $input) {\n      tpSharedDirectory {\n        id\n      }\n    }\n  }\n"])));
     var ShareFileMutation = gqlTyped(templateObject_4$h || (templateObject_4$h = __makeTemplateObject(["\n  mutation ShareFileMutation($input: ShareFileInput!) {\n    shareFile(input: $input) {\n      tpSharedFile {\n        id\n      }\n    }\n  }\n"], ["\n  mutation ShareFileMutation($input: ShareFileInput!) {\n    shareFile(input: $input) {\n      tpSharedFile {\n        id\n      }\n    }\n  }\n"])));
     var UnshareFileMutation = gqlTyped(templateObject_5$f || (templateObject_5$f = __makeTemplateObject(["\n  mutation UnshareFileMutation($input: UnshareFileInput!) {\n    unshareFile(input: $input) {\n      tpSharedFile {\n        id\n      }\n    }\n  }\n"], ["\n  mutation UnshareFileMutation($input: UnshareFileInput!) {\n    unshareFile(input: $input) {\n      tpSharedFile {\n        id\n      }\n    }\n  }\n"])));
     var RequestTpMkReshareMutation = gqlTyped(templateObject_6$c || (templateObject_6$c = __makeTemplateObject(["\nmutation RequestTpMkReshareMutation($input: RequestTpMkReshareInput!) {\n  requestTpMkReshare(input: $input) {\n    id\n  }\n}"], ["\nmutation RequestTpMkReshareMutation($input: RequestTpMkReshareInput!) {\n  requestTpMkReshare(input: $input) {\n    id\n  }\n}"])));
     var RespondTpMkReshareMutation = gqlTyped(templateObject_7$b || (templateObject_7$b = __makeTemplateObject(["\n  mutation RespondTpMkReshareMutation($input: RespondTpMkReshareInput!) {\n    respondTpMkReshare(input: $input) {\n      id\n    }\n  }\n"], ["\n  mutation RespondTpMkReshareMutation($input: RespondTpMkReshareInput!) {\n    respondTpMkReshare(input: $input) {\n      id\n    }\n  }\n"])));
     var CompleteTpMkReshareMutation = gqlTyped(templateObject_8$a || (templateObject_8$a = __makeTemplateObject(["\nmutation CompleteTpMkReshareMutation($input: CompleteTpMkReshareInput!) {\n  completeTpMkReshare(input: $input) {\n    id\n  }\n}"], ["\nmutation CompleteTpMkReshareMutation($input: CompleteTpMkReshareInput!) {\n  completeTpMkReshare(input: $input) {\n    id\n  }\n}"])));
-    var templateObject_1$v, templateObject_2$q, templateObject_3$m, templateObject_4$h, templateObject_5$f, templateObject_6$c, templateObject_7$b, templateObject_8$a;
+    var templateObject_1$w, templateObject_2$r, templateObject_3$m, templateObject_4$h, templateObject_5$f, templateObject_6$c, templateObject_7$b, templateObject_8$a;
 
-    var TpCurrentUserSharedKeyQuery = gqlTyped(templateObject_1$w || (templateObject_1$w = __makeTemplateObject(["\nquery TpCurrentUserSharedKeyQuery($id: LrRelayIdInput!) {\n  tp(id: $id){\n    currentUserSharedKey {\n      userSharedKey {\n        sharedKey {\n          id\n        }\n        mkSharedKey {\n          id\n        }\n        mkPxk {\n          id\n        }\n        mkReshareRequestCipher\n        mkReshareRequestSent\n        mkReshareResponseCipher\n        mkReshareResponseSent\n      }\n    }\n  }\n}\n"], ["\nquery TpCurrentUserSharedKeyQuery($id: LrRelayIdInput!) {\n  tp(id: $id){\n    currentUserSharedKey {\n      userSharedKey {\n        sharedKey {\n          id\n        }\n        mkSharedKey {\n          id\n        }\n        mkPxk {\n          id\n        }\n        mkReshareRequestCipher\n        mkReshareRequestSent\n        mkReshareResponseCipher\n        mkReshareResponseSent\n      }\n    }\n  }\n}\n"])));
-    var templateObject_1$w;
+    var TpCurrentUserSharedKeyQuery = gqlTyped(templateObject_1$x || (templateObject_1$x = __makeTemplateObject(["\nquery TpCurrentUserSharedKeyQuery($id: LrRelayIdInput!) {\n  tp(id: $id){\n    currentUserSharedKey {\n      userSharedKey {\n        sharedKey {\n          id\n        }\n        mkSharedKey {\n          id\n        }\n        mkPxk {\n          id\n        }\n        mkReshareRequestCipher\n        mkReshareRequestSent\n        mkReshareResponseCipher\n        mkReshareResponseSent\n      }\n    }\n  }\n}\n"], ["\nquery TpCurrentUserSharedKeyQuery($id: LrRelayIdInput!) {\n  tp(id: $id){\n    currentUserSharedKey {\n      userSharedKey {\n        sharedKey {\n          id\n        }\n        mkSharedKey {\n          id\n        }\n        mkPxk {\n          id\n        }\n        mkReshareRequestCipher\n        mkReshareRequestSent\n        mkReshareResponseCipher\n        mkReshareResponseSent\n      }\n    }\n  }\n}\n"])));
+    var templateObject_1$x;
 
     exports.TrustedParty2Service = /** @class */ (function (_super) {
         __extends(TrustedParty2Service, _super);
@@ -14909,22 +15705,20 @@
                             if (userSharedKey.mkSharedKey) {
                                 throw new KcBadStateException('TP already has mkSharedKey');
                             }
-                            return [4 /*yield*/, this.keyService.getCurrentMasterKey()];
-                        case 2:
-                            masterKey = _a.sent();
+                            masterKey = this.keyService.currentMasterKey;
                             return [4 /*yield*/, this.keyFactory.createPkcKey()];
-                        case 3:
+                        case 2:
                             prk = _a.sent();
                             return [4 /*yield*/, this.encryptionService.encryptToString(masterKey.jwk, prk.toJSON(true))];
-                        case 4:
+                        case 3:
                             mkWrappedMkPrk = _a.sent();
                             return [4 /*yield*/, this.keyGraph.getKey(userSharedKey.sharedKey.id)];
-                        case 5:
+                        case 4:
                             sharedKey = _a.sent();
                             return [4 /*yield*/, this.encryptionService.encryptToString(sharedKey.jwk, {
                                     pbk: prk.toJSON(),
                                 })];
-                        case 6:
+                        case 5:
                             mkReshareRequestCipher = _a.sent();
                             return [4 /*yield*/, new LrMutation({
                                     mutation: RequestTpMkReshareMutation,
@@ -14939,7 +15733,7 @@
                                         },
                                     },
                                 })];
-                        case 7: return [2 /*return*/, _a.sent()];
+                        case 6: return [2 /*return*/, _a.sent()];
                     }
                 });
             });
@@ -15020,11 +15814,9 @@
                         case 6:
                             mkSharedKey = (_d.jwk = _e.sent(),
                                 _d);
-                            return [4 /*yield*/, this.keyService.getCurrentMasterKey()];
-                        case 7:
-                            masterKey = _e.sent();
+                            masterKey = this.keyService.currentMasterKey;
                             return [4 /*yield*/, this.encryptionService.encryptToString(masterKey.jwk, mkSharedKey.jwk.toJSON(true))];
-                        case 8:
+                        case 7:
                             mkWrappedMkSharedKey = _e.sent();
                             return [2 /*return*/, new LrMutation({
                                     mutation: CompleteTpMkReshareMutation,
@@ -15204,14 +15996,14 @@
         };
         return TwoFactorService;
     }());
-    TwoFactorService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TwoFactorService_Factory() { return new TwoFactorService(i0.ɵɵinject(i4.AuthClass)); }, token: TwoFactorService, providedIn: "root" });
+    TwoFactorService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TwoFactorService_Factory() { return new TwoFactorService(i0.ɵɵinject(i2.AuthClass)); }, token: TwoFactorService, providedIn: "root" });
     TwoFactorService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
     TwoFactorService.ctorParameters = function () { return [
-        { type: i4.AuthClass }
+        { type: i2.AuthClass }
     ]; };
 
     /*
@@ -15225,6 +16017,7 @@
     exports.ApiContactCard = ApiContactCard;
     exports.ApiCurrentUser = ApiCurrentUser;
     exports.ArchiveDirectoryMutation = ArchiveDirectoryMutation;
+    exports.AuthTypes = auth2_types;
     exports.CancelUserDeleteMutation = CancelUserDeleteMutation;
     exports.Category = Category;
     exports.CategoryFields = CategoryFields;
@@ -15344,7 +16137,6 @@
     exports.RecordTypeFieldOption = RecordTypeFieldOption;
     exports.RecordTypeService = RecordTypeService;
     exports.RecordTypeSummary = RecordTypeSummary;
-    exports.RegisterResult = RegisterResult;
     exports.RegisterService = RegisterService;
     exports.RequestUserDeleteMutation = RequestUserDeleteMutation;
     exports.RespondOtkMutation = RespondOtkMutation;