@lifeready/core 6.1.2 → 6.1.4

package/bundles/lifeready-core.umd.js

@@ -4365,6 +4365,19 @@
     ]; };
     var templateObject_1$5;
 
+    var KeyExchangeFields = "\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";
+    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 KeyExchangesQuery2 = gqlTyped(templateObject_1$6 || (templateObject_1$6 = __makeTemplateObject(["\nquery KeyExchangesQuery2($state: String) {\n  keyExchanges(state: $state) {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n}\n"], ["\nquery KeyExchangesQuery2($state: String) {\n  keyExchanges(state: $state) {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n}\n"])), KeyExchangeFields);
+    var KeyExchangeQuery2 = gqlTyped(templateObject_2$3 || (templateObject_2$3 = __makeTemplateObject(["\nquery KeyExchangeQuery2($id: LrRelayIdInput!) {\n  keyExchange(id: $id) {\n    ", "\n  }\n}\n"], ["\nquery KeyExchangeQuery2($id: LrRelayIdInput!) {\n  keyExchange(id: $id) {\n    ", "\n  }\n}\n"])), KeyExchangeFields);
+    var KeyExchangeTokenQuery2 = gqlTyped(templateObject_3$2 || (templateObject_3$2 = __makeTemplateObject(["\nquery KeyExchangeTokenQuery2($id: LrRelayIdInput!, $token: String) {\n  keyExchange(id: $id, token: $token) {\n    ", "\n  }\n}\n"], ["\nquery KeyExchangeTokenQuery2($id: LrRelayIdInput!, $token: String) {\n  keyExchange(id: $id, token: $token) {\n    ", "\n  }\n}\n"])), KeyExchangeFields);
+    var CancelKeyExchangeMutation = gqlTyped(templateObject_4$2 || (templateObject_4$2 = __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"])));
+    var DeclineKeyExchangeMutation = gqlTyped(templateObject_5$2 || (templateObject_5$2 = __makeTemplateObject(["\nmutation DeclineKeyExchangeMutation($input: DeclineKeyExchangeInput!) {\n  declineKeyExchange(input: $input) {\n    keyExchange {\n      id\n    }\n  }\n}\n"], ["\nmutation DeclineKeyExchangeMutation($input: DeclineKeyExchangeInput!) {\n  declineKeyExchange(input: $input) {\n    keyExchange {\n      id\n    }\n  }\n}\n"])));
+    var InitiateKeyExchangeOtkMutation = gqlTyped(templateObject_6$2 || (templateObject_6$2 = __makeTemplateObject(["\nmutation InitiateKeyExchangeOtkMutation(\n  $input: InitiateKeyExchangeOtkInput!\n) {\n  initiateKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n  }\n}\n"], ["\nmutation InitiateKeyExchangeOtkMutation(\n  $input: InitiateKeyExchangeOtkInput!\n) {\n  initiateKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n  }\n}\n"])), KeyExchangeFields);
+    var RespondKeyExchangeOtkMutation = gqlTyped(templateObject_7$1 || (templateObject_7$1 = __makeTemplateObject(["\nmutation RespondKeyExchangeOtkMutation($input: RespondKeyExchangeOtkInput!) {\n  respondKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n      user {\n        config\n      }\n    }\n  }\n}\n"], ["\nmutation RespondKeyExchangeOtkMutation($input: RespondKeyExchangeOtkInput!) {\n  respondKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n      user {\n        config\n      }\n    }\n  }\n}\n"])), KeyExchangeFields, UserSharedKeyFields);
+    var CompleteKeyExchangeOtkMutation = gqlTyped(templateObject_8$1 || (templateObject_8$1 = __makeTemplateObject(["\nmutation CompleteKeyExchangeOtkMutation(\n  $input: CompleteKeyExchangeOtkInput!\n) {\n  completeKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n      user {\n        config\n      }\n    }\n  }\n}\n"], ["\nmutation CompleteKeyExchangeOtkMutation(\n  $input: CompleteKeyExchangeOtkInput!\n) {\n  completeKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ", "\n    }\n    userSharedKey {\n      ", "\n    }\n    tp {\n      id\n      user {\n        config\n      }\n    }\n  }\n}\n"])), KeyExchangeFields, UserSharedKeyFields);
+    var CurrentUserSharedKeyQuery2 = gqlTyped(templateObject_9 || (templateObject_9 = __makeTemplateObject(["\nquery CurrentUserSharedKeyQuery2(\n  $username: String\n  $userId: LrRelayIdInput\n) {\n  currentUserSharedKey(\n    username: $username\n    userId: $userId\n  ) {\n    userSharedKey {\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      ", "\n    }\n  }\n}\n"])), UserSharedKeyFields);
+    var templateObject_1$6, templateObject_2$3, templateObject_3$2, templateObject_4$2, templateObject_5$2, templateObject_6$2, templateObject_7$1, templateObject_8$1, templateObject_9;
+
     (function (FeatureAction) {
         // Just the one for now
         FeatureAction["ACCESS"] = "access";
@@ -4418,15 +4431,6 @@
         }
         return MainContactCardPlainFields;
     }());
-    (function (PasswordChangeStatus) {
-        PasswordChangeStatus["InProgress"] = "IN_PROGRESS";
-        PasswordChangeStatus["Recovery"] = "RECOVERY";
-    })(exports.PasswordChangeStatus || (exports.PasswordChangeStatus = {}));
-    var PassIdpApiResult = /** @class */ (function () {
-        function PassIdpApiResult() {
-        }
-        return PassIdpApiResult;
-    }());
     var TrustedPartyDetails = /** @class */ (function () {
         function TrustedPartyDetails() {
         }
@@ -4460,7 +4464,7 @@
     }());
 
     var SharedContactCardFields = "\n  id\n  owner {\n    id\n    username\n  }\n  ownerKey {\n    id\n  }\n  ownerCipherData\n  receiver {\n    id\n    username\n  }\n  receiverKey {\n    id\n  }\n  receiverCipherData\n  sharedKey {\n    id\n  }\n  sharedCipherData\n  sharedCipherDataSig\n  sharedCipherDataSigPxk {\n    id\n  }\n";
-    var UpdateOwnedContactCard = gql__default['default'](templateObject_1$6 || (templateObject_1$6 = __makeTemplateObject(["\nmutation UpdateOwnedContactCard(\n  $input: UpdateOwnedContactCardInput!\n) {\n  updateOwnedContactCard(\n    input: $input\n  ) {\n    ownedContactCard {\n      ", "\n    }\n  }\n}"], ["\nmutation UpdateOwnedContactCard(\n  $input: UpdateOwnedContactCardInput!\n) {\n  updateOwnedContactCard(\n    input: $input\n  ) {\n    ownedContactCard {\n      ", "\n    }\n  }\n}"])), SharedContactCardFields);
+    var UpdateOwnedContactCard = gql__default['default'](templateObject_1$7 || (templateObject_1$7 = __makeTemplateObject(["\nmutation UpdateOwnedContactCard(\n  $input: UpdateOwnedContactCardInput!\n) {\n  updateOwnedContactCard(\n    input: $input\n  ) {\n    ownedContactCard {\n      ", "\n    }\n  }\n}"], ["\nmutation UpdateOwnedContactCard(\n  $input: UpdateOwnedContactCardInput!\n) {\n  updateOwnedContactCard(\n    input: $input\n  ) {\n    ownedContactCard {\n      ", "\n    }\n  }\n}"])), SharedContactCardFields);
     var SharedContactCardService = /** @class */ (function () {
         function SharedContactCardService(keyService, lrApollo, keyGraph, encryptionService) {
             this.keyService = keyService;
@@ -4565,17 +4569,15 @@
         { type: KeyGraphService },
         { type: EncryptionService }
     ]; };
-    var templateObject_1$6;
+    var templateObject_1$7;
 
-    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 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 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 CurrentUserQuery = gql__default['default'](templateObject_1$7 || (templateObject_1$7 = __makeTemplateObject(["\n  query {\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      userDelete {\n        id\n        created\n        state\n      }\n      features {\n        myVault\n        tpVault\n        shareVault\n      }\n      sessionEncryptionKey\n      dateJoined\n    }\n    userPlans {\n      id\n      stripe {\n        subscriptionId\n      }\n      plan {\n        name\n        data\n        state\n      }\n      periodEnd\n    }\n    contactCards(orderBy: \"created\") {\n      edges {\n        node {\n          id\n          key {\n            id\n          }\n          cipherData\n          plainData\n        }\n      }\n    }\n    keyGraph {\n      ...KeyGraphFragment\n    }\n  }\n  ", "\n"], ["\n  query {\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      userDelete {\n        id\n        created\n        state\n      }\n      features {\n        myVault\n        tpVault\n        shareVault\n      }\n      sessionEncryptionKey\n      dateJoined\n    }\n    userPlans {\n      id\n      stripe {\n        subscriptionId\n      }\n      plan {\n        name\n        data\n        state\n      }\n      periodEnd\n    }\n    contactCards(orderBy: \"created\") {\n      edges {\n        node {\n          id\n          key {\n            id\n          }\n          cipherData\n          plainData\n        }\n      }\n    }\n    keyGraph {\n      ...KeyGraphFragment\n    }\n  }\n  ", "\n"])), KeyGraphFragment);
-    var CreateContactCardMutation$1 = gql__default['default'](templateObject_2$3 || (templateObject_2$3 = __makeTemplateObject(["\n  mutation CreateContactCardMutation($input: CreateContactCardInput!) {\n    createContactCard(input: $input) {\n      contactCard {\n        id\n        key {\n          id\n        }\n        cipherData\n      }\n    }\n  }\n"], ["\n  mutation CreateContactCardMutation($input: CreateContactCardInput!) {\n    createContactCard(input: $input) {\n      contactCard {\n        id\n        key {\n          id\n        }\n        cipherData\n      }\n    }\n  }\n"])));
-    var UpdateContactCardMutation$1 = gql__default['default'](templateObject_3$2 || (templateObject_3$2 = __makeTemplateObject(["\n  mutation UpdateContactCardMutation($input: UpdateContactCardInput!) {\n    updateContactCard(input: $input) {\n      contactCard {\n        id\n        key {\n          id\n        }\n        cipherData\n      }\n    }\n  }\n"], ["\n  mutation UpdateContactCardMutation($input: UpdateContactCardInput!) {\n    updateContactCard(input: $input) {\n      contactCard {\n        id\n        key {\n          id\n        }\n        cipherData\n      }\n    }\n  }\n"])));
-    var TrustedPartiesQuery = gqlTyped(templateObject_4$2 || (templateObject_4$2 = __makeTemplateObject(["\nquery TrustedPartiesQuery {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n}"], ["\nquery TrustedPartiesQuery {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n}"])), TrustedPartyProperties);
-    var ContactCardsQuery = gqlTyped(templateObject_5$2 || (templateObject_5$2 = __makeTemplateObject(["\nquery ContactCardsQuery {\n  contactCards(orderBy: \"created\") {\n    edges {\n      node {\n        id\n        cipherData\n        key {\n          id\n        }\n      }\n    }\n  }\n}\n"], ["\nquery ContactCardsQuery {\n  contactCards(orderBy: \"created\") {\n    edges {\n      node {\n        id\n        cipherData\n        key {\n          id\n        }\n      }\n    }\n  }\n}\n"])));
-    var templateObject_1$7, templateObject_2$3, templateObject_3$2, templateObject_4$2, templateObject_5$2;
+    var CurrentUserQuery = gql__default['default'](templateObject_1$8 || (templateObject_1$8 = __makeTemplateObject(["\n  query {\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      userDelete {\n        id\n        created\n        state\n      }\n      features {\n        myVault\n        tpVault\n        shareVault\n      }\n      sessionEncryptionKey\n      dateJoined\n    }\n    userPlans {\n      id\n      stripe {\n        subscriptionId\n      }\n      plan {\n        name\n        data\n        state\n      }\n      periodEnd\n    }\n    contactCards(orderBy: \"created\") {\n      edges {\n        node {\n          id\n          key {\n            id\n          }\n          cipherData\n          plainData\n        }\n      }\n    }\n    keyGraph {\n      ...KeyGraphFragment\n    }\n  }\n  ", "\n"], ["\n  query {\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      userDelete {\n        id\n        created\n        state\n      }\n      features {\n        myVault\n        tpVault\n        shareVault\n      }\n      sessionEncryptionKey\n      dateJoined\n    }\n    userPlans {\n      id\n      stripe {\n        subscriptionId\n      }\n      plan {\n        name\n        data\n        state\n      }\n      periodEnd\n    }\n    contactCards(orderBy: \"created\") {\n      edges {\n        node {\n          id\n          key {\n            id\n          }\n          cipherData\n          plainData\n        }\n      }\n    }\n    keyGraph {\n      ...KeyGraphFragment\n    }\n  }\n  ", "\n"])), KeyGraphFragment);
+    var CreateContactCardMutation$1 = gql__default['default'](templateObject_2$4 || (templateObject_2$4 = __makeTemplateObject(["\n  mutation CreateContactCardMutation($input: CreateContactCardInput!) {\n    createContactCard(input: $input) {\n      contactCard {\n        id\n        key {\n          id\n        }\n        cipherData\n      }\n    }\n  }\n"], ["\n  mutation CreateContactCardMutation($input: CreateContactCardInput!) {\n    createContactCard(input: $input) {\n      contactCard {\n        id\n        key {\n          id\n        }\n        cipherData\n      }\n    }\n  }\n"])));
+    var UpdateContactCardMutation$1 = gql__default['default'](templateObject_3$3 || (templateObject_3$3 = __makeTemplateObject(["\n  mutation UpdateContactCardMutation($input: UpdateContactCardInput!) {\n    updateContactCard(input: $input) {\n      contactCard {\n        id\n        key {\n          id\n        }\n        cipherData\n      }\n    }\n  }\n"], ["\n  mutation UpdateContactCardMutation($input: UpdateContactCardInput!) {\n    updateContactCard(input: $input) {\n      contactCard {\n        id\n        key {\n          id\n        }\n        cipherData\n      }\n    }\n  }\n"])));
+    var TrustedPartiesQuery = gqlTyped(templateObject_4$3 || (templateObject_4$3 = __makeTemplateObject(["\nquery TrustedPartiesQuery {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n}"], ["\nquery TrustedPartiesQuery {\n  tps {\n    edges {\n      node {\n        ", "\n      }\n    }\n  }\n}"])), TrustedPartyProperties);
+    var ContactCardsQuery = gqlTyped(templateObject_5$3 || (templateObject_5$3 = __makeTemplateObject(["\nquery ContactCardsQuery {\n  contactCards(orderBy: \"created\") {\n    edges {\n      node {\n        id\n        cipherData\n        key {\n          id\n        }\n      }\n    }\n  }\n}\n"], ["\nquery ContactCardsQuery {\n  contactCards(orderBy: \"created\") {\n    edges {\n      node {\n        id\n        cipherData\n        key {\n          id\n        }\n      }\n    }\n  }\n}\n"])));
+    var templateObject_1$8, templateObject_2$4, templateObject_3$3, templateObject_4$3, templateObject_5$3;
 
     var ProfileService = /** @class */ (function () {
         function ProfileService(config, http, lrApollo, keyService, keyMetaService, keyGraph, encryptionService) {
@@ -4587,18 +4589,6 @@
             this.keyGraph = keyGraph;
             this.encryptionService = encryptionService;
         }
-        ProfileService.prototype.getPassIdpParams = function (emailOrPhone) {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.http
-                                .get(this.config.authUrl + "users/pass-idp-params/?login_name=" + encodeURIComponent(emailOrPhone))
-                                .toPromise()];
-                        case 1: return [2 /*return*/, _a.sent()];
-                    }
-                });
-            });
-        };
         ProfileService.prototype.getCurrentUser = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var _a, currentUser, contactCards, contactCard;
@@ -4826,10 +4816,10 @@
         { type: EncryptionService }
     ]; };
 
-    var PasswordChangeRequestMutation = gql__default['default'](templateObject_1$8 || (templateObject_1$8 = __makeTemplateObject(["\n  mutation {\n    passwordChangeRequest(input: {}) {\n      challenge\n    }\n  }\n"], ["\n  mutation {\n    passwordChangeRequest(input: {}) {\n      challenge\n    }\n  }\n"])));
-    var PasswordChangeMutation = gql__default['default'](templateObject_2$4 || (templateObject_2$4 = __makeTemplateObject(["\n  mutation PasswordChange($input: PasswordChangeInput!) {\n    passwordChange(input: $input) {\n      token\n      newPassKey {\n        id\n      }\n    }\n  }\n"], ["\n  mutation PasswordChange($input: PasswordChangeInput!) {\n    passwordChange(input: $input) {\n      token\n      newPassKey {\n        id\n      }\n    }\n  }\n"])));
-    var PasswordChangeConfigQuery = gql__default['default'](templateObject_3$3 || (templateObject_3$3 = __makeTemplateObject(["\n  query PasswordChangeConfigQuery {\n    passwordChangeConfig {\n      maxAuthAgeSeconds\n      authTime\n      serverTime\n    }\n  }\n"], ["\n  query PasswordChangeConfigQuery {\n    passwordChangeConfig {\n      maxAuthAgeSeconds\n      authTime\n      serverTime\n    }\n  }\n"])));
-    var templateObject_1$8, templateObject_2$4, templateObject_3$3;
+    var PasswordChangeRequestMutation = gql__default['default'](templateObject_1$9 || (templateObject_1$9 = __makeTemplateObject(["\n  mutation {\n    passwordChangeRequest(input: {}) {\n      challenge\n    }\n  }\n"], ["\n  mutation {\n    passwordChangeRequest(input: {}) {\n      challenge\n    }\n  }\n"])));
+    var PasswordChangeMutation = gql__default['default'](templateObject_2$5 || (templateObject_2$5 = __makeTemplateObject(["\n  mutation PasswordChange($input: PasswordChangeInput!) {\n    passwordChange(input: $input) {\n      token\n      newPassKey {\n        id\n      }\n    }\n  }\n"], ["\n  mutation PasswordChange($input: PasswordChangeInput!) {\n    passwordChange(input: $input) {\n      token\n      newPassKey {\n        id\n      }\n    }\n  }\n"])));
+    var PasswordChangeConfigQuery = gql__default['default'](templateObject_3$4 || (templateObject_3$4 = __makeTemplateObject(["\n  query PasswordChangeConfigQuery {\n    passwordChangeConfig {\n      maxAuthAgeSeconds\n      authTime\n      serverTime\n    }\n  }\n"], ["\n  query PasswordChangeConfigQuery {\n    passwordChangeConfig {\n      maxAuthAgeSeconds\n      authTime\n      serverTime\n    }\n  }\n"])));
+    var templateObject_1$9, templateObject_2$5, templateObject_3$4;
 
     // Ref: https://stackoverflow.com/questions/59735280/angular-8-moment-error-cannot-call-a-namespace-moment
     var moment$1 = moment___namespace;
@@ -5455,8 +5445,8 @@
                 },] }
     ];
 
-    var TpsKeysQuery = gqlTyped(templateObject_1$9 || (templateObject_1$9 = __makeTemplateObject(["\nquery TpsKeysQuery($ids: [ID]) {\n  tps(id_In: $ids) {\n    edges {\n      node {\n        id\n        currentUserSharedKey {\n          userSharedKey {\n            sharedKey {\n              id\n            }\n            mkSharedKey {\n              id\n            }\n          }\n        }\n      }\n    }\n  }\n}"], ["\nquery TpsKeysQuery($ids: [ID]) {\n  tps(id_In: $ids) {\n    edges {\n      node {\n        id\n        currentUserSharedKey {\n          userSharedKey {\n            sharedKey {\n              id\n            }\n            mkSharedKey {\n              id\n            }\n          }\n        }\n      }\n    }\n  }\n}"])));
-    var templateObject_1$9;
+    var TpsKeysQuery = gqlTyped(templateObject_1$a || (templateObject_1$a = __makeTemplateObject(["\nquery TpsKeysQuery($ids: [ID]) {\n  tps(id_In: $ids) {\n    edges {\n      node {\n        id\n        currentUserSharedKey {\n          userSharedKey {\n            sharedKey {\n              id\n            }\n            mkSharedKey {\n              id\n            }\n          }\n        }\n      }\n    }\n  }\n}"], ["\nquery TpsKeysQuery($ids: [ID]) {\n  tps(id_In: $ids) {\n    edges {\n      node {\n        id\n        currentUserSharedKey {\n          userSharedKey {\n            sharedKey {\n              id\n            }\n            mkSharedKey {\n              id\n            }\n          }\n        }\n      }\n    }\n  }\n}"])));
+    var templateObject_1$a;
 
     var TpAssemblyController = /** @class */ (function () {
         function TpAssemblyController(injector) {
@@ -5983,16 +5973,16 @@
         })
     ], exports.ɵi);
 
-    var CancelTpPasswordResetRequestMutation = gqlTyped(templateObject_1$a || (templateObject_1$a = __makeTemplateObject(["\nmutation CancelTpPasswordResetRequestMutation {\n  cancelTpPasswordResetRequest(input: {}) {\n    id\n  }\n}"], ["\nmutation CancelTpPasswordResetRequestMutation {\n  cancelTpPasswordResetRequest(input: {}) {\n    id\n  }\n}"])));
-    var CreateTpAssemblyKeyChallengeMutation = gqlTyped(templateObject_2$5 || (templateObject_2$5 = __makeTemplateObject(["\nmutation CreateTpAssemblyKeyChallengeMutation(\n  $input: CreateTpAssemblyKeyChallengeInput!\n) {\n  createTpAssemblyKeyChallenge(input: $input) {\n    challenge\n  }\n}"], ["\nmutation CreateTpAssemblyKeyChallengeMutation(\n  $input: CreateTpAssemblyKeyChallengeInput!\n) {\n  createTpAssemblyKeyChallenge(input: $input) {\n    challenge\n  }\n}"])));
-    var PreCompleteTpPasswordResetRequestMutation = gqlTyped(templateObject_3$4 || (templateObject_3$4 = __makeTemplateObject(["\nmutation PreCompleteTpPasswordResetRequestMutation(\n  $input: PreCompleteTpPasswordResetRequestInput!\n) {\n  preCompleteTpPasswordResetRequest(input: $input) {\n    idpPassword\n  }\n}"], ["\nmutation PreCompleteTpPasswordResetRequestMutation(\n  $input: PreCompleteTpPasswordResetRequestInput!\n) {\n  preCompleteTpPasswordResetRequest(input: $input) {\n    idpPassword\n  }\n}"])));
-    var CompleteTpPasswordResetRequestMutation = gqlTyped(templateObject_4$3 || (templateObject_4$3 = __makeTemplateObject(["\nmutation CompleteTpPasswordResetRequestMutation(\n  $input: CompleteTpPasswordResetRequestInput!\n) {\n  completeTpPasswordResetRequest(input: $input) {\n    id\n  }\n}"], ["\nmutation CompleteTpPasswordResetRequestMutation(\n  $input: CompleteTpPasswordResetRequestInput!\n) {\n  completeTpPasswordResetRequest(input: $input) {\n    id\n  }\n}"])));
-    var ApproveTpPasswordResetRequestMutation = gqlTyped(templateObject_5$3 || (templateObject_5$3 = __makeTemplateObject(["\nmutation ApproveTpPasswordResetRequestMutation(\n  $input: ApproveTpPasswordResetRequestInput!\n) {\n  approveTpPasswordResetRequest(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}"], ["\nmutation ApproveTpPasswordResetRequestMutation(\n  $input: ApproveTpPasswordResetRequestInput!\n) {\n  approveTpPasswordResetRequest(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}"])));
-    var RejectTpPasswordResetRequestMutation = gqlTyped(templateObject_6$2 || (templateObject_6$2 = __makeTemplateObject(["\nmutation RejectTpPasswordResetRequestMutation(\n  $input: RejectTpPasswordResetRequestInput!\n) {\n  rejectTpPasswordResetRequest(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}"], ["\nmutation RejectTpPasswordResetRequestMutation(\n  $input: RejectTpPasswordResetRequestInput!\n) {\n  rejectTpPasswordResetRequest(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}"])));
-    var CreateTpPasswordResetMutation = gqlTyped(templateObject_7$1 || (templateObject_7$1 = __makeTemplateObject(["\nmutation CreateTpPasswordResetMutation($input: CreateTpPasswordResetInput!) {\n  createTpPasswordReset(input: $input) {\n    tpPasswordReset {\n      id\n    }\n  }\n}"], ["\nmutation CreateTpPasswordResetMutation($input: CreateTpPasswordResetInput!) {\n  createTpPasswordReset(input: $input) {\n    tpPasswordReset {\n      id\n    }\n  }\n}"])));
-    var DeleteTpPasswordResetMutation = gqlTyped(templateObject_8$1 || (templateObject_8$1 = __makeTemplateObject(["\nmutation DeleteTpPasswordResetMutation {\n  deleteTpPasswordReset(input: {}) {\n    id\n  }\n}"], ["\nmutation DeleteTpPasswordResetMutation {\n  deleteTpPasswordReset(input: {}) {\n    id\n  }\n}"])));
-    var UpdateTpPasswordResetMutation = gqlTyped(templateObject_9 || (templateObject_9 = __makeTemplateObject(["\nmutation UpdateTpPasswordResetMutation($input: UpdateTpPasswordResetInput!) {\n  updateTpPasswordReset(input: $input) {\n    tpPasswordReset {\n      id\n    }\n  }\n}"], ["\nmutation UpdateTpPasswordResetMutation($input: UpdateTpPasswordResetInput!) {\n  updateTpPasswordReset(input: $input) {\n    tpPasswordReset {\n      id\n    }\n  }\n}"])));
-    var templateObject_1$a, templateObject_2$5, templateObject_3$4, templateObject_4$3, templateObject_5$3, templateObject_6$2, templateObject_7$1, templateObject_8$1, templateObject_9;
+    var CancelTpPasswordResetRequestMutation = gqlTyped(templateObject_1$b || (templateObject_1$b = __makeTemplateObject(["\nmutation CancelTpPasswordResetRequestMutation {\n  cancelTpPasswordResetRequest(input: {}) {\n    id\n  }\n}"], ["\nmutation CancelTpPasswordResetRequestMutation {\n  cancelTpPasswordResetRequest(input: {}) {\n    id\n  }\n}"])));
+    var CreateTpAssemblyKeyChallengeMutation = gqlTyped(templateObject_2$6 || (templateObject_2$6 = __makeTemplateObject(["\nmutation CreateTpAssemblyKeyChallengeMutation(\n  $input: CreateTpAssemblyKeyChallengeInput!\n) {\n  createTpAssemblyKeyChallenge(input: $input) {\n    challenge\n  }\n}"], ["\nmutation CreateTpAssemblyKeyChallengeMutation(\n  $input: CreateTpAssemblyKeyChallengeInput!\n) {\n  createTpAssemblyKeyChallenge(input: $input) {\n    challenge\n  }\n}"])));
+    var PreCompleteTpPasswordResetRequestMutation = gqlTyped(templateObject_3$5 || (templateObject_3$5 = __makeTemplateObject(["\nmutation PreCompleteTpPasswordResetRequestMutation(\n  $input: PreCompleteTpPasswordResetRequestInput!\n) {\n  preCompleteTpPasswordResetRequest(input: $input) {\n    idpPassword\n  }\n}"], ["\nmutation PreCompleteTpPasswordResetRequestMutation(\n  $input: PreCompleteTpPasswordResetRequestInput!\n) {\n  preCompleteTpPasswordResetRequest(input: $input) {\n    idpPassword\n  }\n}"])));
+    var CompleteTpPasswordResetRequestMutation = gqlTyped(templateObject_4$4 || (templateObject_4$4 = __makeTemplateObject(["\nmutation CompleteTpPasswordResetRequestMutation(\n  $input: CompleteTpPasswordResetRequestInput!\n) {\n  completeTpPasswordResetRequest(input: $input) {\n    id\n  }\n}"], ["\nmutation CompleteTpPasswordResetRequestMutation(\n  $input: CompleteTpPasswordResetRequestInput!\n) {\n  completeTpPasswordResetRequest(input: $input) {\n    id\n  }\n}"])));
+    var ApproveTpPasswordResetRequestMutation = gqlTyped(templateObject_5$4 || (templateObject_5$4 = __makeTemplateObject(["\nmutation ApproveTpPasswordResetRequestMutation(\n  $input: ApproveTpPasswordResetRequestInput!\n) {\n  approveTpPasswordResetRequest(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}"], ["\nmutation ApproveTpPasswordResetRequestMutation(\n  $input: ApproveTpPasswordResetRequestInput!\n) {\n  approveTpPasswordResetRequest(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}"])));
+    var RejectTpPasswordResetRequestMutation = gqlTyped(templateObject_6$3 || (templateObject_6$3 = __makeTemplateObject(["\nmutation RejectTpPasswordResetRequestMutation(\n  $input: RejectTpPasswordResetRequestInput!\n) {\n  rejectTpPasswordResetRequest(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}"], ["\nmutation RejectTpPasswordResetRequestMutation(\n  $input: RejectTpPasswordResetRequestInput!\n) {\n  rejectTpPasswordResetRequest(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}"])));
+    var CreateTpPasswordResetMutation = gqlTyped(templateObject_7$2 || (templateObject_7$2 = __makeTemplateObject(["\nmutation CreateTpPasswordResetMutation($input: CreateTpPasswordResetInput!) {\n  createTpPasswordReset(input: $input) {\n    tpPasswordReset {\n      id\n    }\n  }\n}"], ["\nmutation CreateTpPasswordResetMutation($input: CreateTpPasswordResetInput!) {\n  createTpPasswordReset(input: $input) {\n    tpPasswordReset {\n      id\n    }\n  }\n}"])));
+    var DeleteTpPasswordResetMutation = gqlTyped(templateObject_8$2 || (templateObject_8$2 = __makeTemplateObject(["\nmutation DeleteTpPasswordResetMutation {\n  deleteTpPasswordReset(input: {}) {\n    id\n  }\n}"], ["\nmutation DeleteTpPasswordResetMutation {\n  deleteTpPasswordReset(input: {}) {\n    id\n  }\n}"])));
+    var UpdateTpPasswordResetMutation = gqlTyped(templateObject_9$1 || (templateObject_9$1 = __makeTemplateObject(["\nmutation UpdateTpPasswordResetMutation($input: UpdateTpPasswordResetInput!) {\n  updateTpPasswordReset(input: $input) {\n    tpPasswordReset {\n      id\n    }\n  }\n}"], ["\nmutation UpdateTpPasswordResetMutation($input: UpdateTpPasswordResetInput!) {\n  updateTpPasswordReset(input: $input) {\n    tpPasswordReset {\n      id\n    }\n  }\n}"])));
+    var templateObject_1$b, templateObject_2$6, templateObject_3$5, templateObject_4$4, templateObject_5$4, templateObject_6$3, templateObject_7$2, templateObject_8$2, templateObject_9$1;
 
     var KeyContainer = /** @class */ (function () {
         function KeyContainer(_key, timeout) {
@@ -6028,43 +6018,31 @@
         return KeyContainer;
     }());
 
-    var CurrentUserQuery$1 = gqlTyped(templateObject_1$b || (templateObject_1$b = __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$6 || (templateObject_2$6 = __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 SetSessionEncryptionKeyMutation = gqlTyped(templateObject_3$5 || (templateObject_3$5 = __makeTemplateObject(["\nmutation SetSessionEncryptionKeyMutation($input: SetSessionEncryptionKeyInput!) {\n  setSessionEncryptionKey(input: $input) {\n    sessionEncryptionKey\n  }\n}\n"], ["\nmutation SetSessionEncryptionKeyMutation($input: SetSessionEncryptionKeyInput!) {\n  setSessionEncryptionKey(input: $input) {\n    sessionEncryptionKey\n  }\n}\n"])));
-    var templateObject_1$b, templateObject_2$6, templateObject_3$5;
+    var CurrentUserQuery$1 = gqlTyped(templateObject_1$c || (templateObject_1$c = __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$7 || (templateObject_2$7 = __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 SetSessionEncryptionKeyMutation = gqlTyped(templateObject_3$6 || (templateObject_3$6 = __makeTemplateObject(["\nmutation SetSessionEncryptionKeyMutation($input: SetSessionEncryptionKeyInput!) {\n  setSessionEncryptionKey(input: $input) {\n    sessionEncryptionKey\n  }\n}\n"], ["\nmutation SetSessionEncryptionKeyMutation($input: SetSessionEncryptionKeyInput!) {\n  setSessionEncryptionKey(input: $input) {\n    sessionEncryptionKey\n  }\n}\n"])));
+    var templateObject_1$c, templateObject_2$7, templateObject_3$6;
 
-    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;
+    })(exports.RecoveryStatus || (exports.RecoveryStatus = {}));
     (function (PasswordChangeStatus) {
         PasswordChangeStatus["IN_PROGRESS"] = "IN_PROGRESS";
         PasswordChangeStatus["RECOVERY"] = "RECOVERY";
-    })(PasswordChangeStatus || (PasswordChangeStatus = {}));
-    var CognitoChallengeName;
+    })(exports.PasswordChangeStatus || (exports.PasswordChangeStatus = {}));
     (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 = {}));
+    })(exports.CognitoChallengeName || (exports.CognitoChallengeName = {}));
 
-    var auth2_types = /*#__PURE__*/Object.freeze({
-        __proto__: null,
-        get RecoveryStatus () { return RecoveryStatus; },
-        get PasswordChangeStatus () { return PasswordChangeStatus; },
-        get CognitoChallengeName () { return CognitoChallengeName; }
-    });
-
-    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 AuthService_1;
+    exports.AuthService = AuthService_1 = /** @class */ (function (_super) {
+        __extends(AuthService, _super);
+        function AuthService(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;
@@ -6092,10 +6070,10 @@
             }
             return _this;
         }
-        Auth2Service.prototype.importPassword = function (plainPassword) {
+        AuthService.prototype.importPassword = function (plainPassword) {
             return this.keyFactoryService.importPassword(plainPassword);
         };
-        Auth2Service.prototype.logout = function () {
+        AuthService.prototype.logout = function () {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
@@ -6122,13 +6100,13 @@
                 });
             });
         };
-        Auth2Service.prototype.addLogoutListener = function (callback) {
+        AuthService.prototype.addLogoutListener = function (callback) {
             this.logoutListeners.add(callback);
         };
-        Auth2Service.prototype.removeLogoutListener = function (callback) {
+        AuthService.prototype.removeLogoutListener = function (callback) {
             this.logoutListeners.delete(callback);
         };
-        Auth2Service.prototype.login = function (emailOrPhone, password, _b) {
+        AuthService.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 () {
@@ -6140,7 +6118,7 @@
                             loginResult = _b.sent();
                             // Save the password for use after meeting challenge.
                             if (loginResult.challenge) {
-                                this.password = new KeyContainer(password, Auth2Service_1.CHALLENGE_TIMEOUT);
+                                this.password = new KeyContainer(password, AuthService_1.CHALLENGE_TIMEOUT);
                                 return [2 /*return*/, loginResult];
                             }
                             if (!(tpPasswordResetAutoComplete &&
@@ -6157,7 +6135,7 @@
                 });
             });
         };
-        Auth2Service.prototype.verifyLogin = function (options) {
+        AuthService.prototype.verifyLogin = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var challenge, code, rememberMe, VALID_CHALLENGE_NAMES, cognitoUser, user;
                 return __generator(this, function (_b) {
@@ -6165,8 +6143,8 @@
                         case 0:
                             challenge = options.challenge, code = options.code, rememberMe = options.rememberMe;
                             VALID_CHALLENGE_NAMES = [
-                                CognitoChallengeName.SMS_MFA,
-                                CognitoChallengeName.SOFTWARE_TOKEN_MFA,
+                                exports.CognitoChallengeName.SMS_MFA,
+                                exports.CognitoChallengeName.SOFTWARE_TOKEN_MFA,
                             ];
                             if (!VALID_CHALLENGE_NAMES.includes(challenge.cognitoUser.challengeName)) {
                                 throw new KcBadRequestException("challengeName must be one of " + VALID_CHALLENGE_NAMES);
@@ -6198,7 +6176,7 @@
                 });
             });
         };
-        Auth2Service.prototype.getUser = function () {
+        AuthService.prototype.getUser = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var cognitoUser;
                 return __generator(this, function (_b) {
@@ -6215,7 +6193,7 @@
                 });
             });
         };
-        Auth2Service.prototype.refreshAccessToken = function () {
+        AuthService.prototype.refreshAccessToken = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var cognitoUser, refreshToken;
                 return __generator(this, function (_b) {
@@ -6244,7 +6222,7 @@
         // ----------------------------------------------------------------------------------------------------
         // Helpers
         // ----------------------------------------------------------------------------------------------------
-        Auth2Service.prototype.fetchCurrentUser = function () {
+        AuthService.prototype.fetchCurrentUser = function () {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -6259,7 +6237,7 @@
                 });
             });
         };
-        Auth2Service.prototype.fetchResetUser = function () {
+        AuthService.prototype.fetchResetUser = function () {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -6274,7 +6252,7 @@
                 });
             });
         };
-        Auth2Service.prototype.kcLogout = function () {
+        AuthService.prototype.kcLogout = function () {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -6291,7 +6269,7 @@
                 });
             });
         };
-        Auth2Service.prototype.fetchPassIdpParams = function (emailOrPhone) {
+        AuthService.prototype.fetchPassIdpParams = function (emailOrPhone) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -6303,7 +6281,7 @@
                 });
             });
         };
-        Auth2Service.prototype.loginImpl = function (emailOrPhone, password) {
+        AuthService.prototype.loginImpl = function (emailOrPhone, password) {
             return __awaiter(this, void 0, void 0, function () {
                 var loginIdpResult, user;
                 return __generator(this, function (_b) {
@@ -6316,8 +6294,8 @@
                             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,
+                                exports.CognitoChallengeName.SMS_MFA,
+                                exports.CognitoChallengeName.SOFTWARE_TOKEN_MFA,
                             ].includes(loginIdpResult.cognitoUser.challengeName)) {
                                 return [2 /*return*/, {
                                         challenge: {
@@ -6339,7 +6317,7 @@
                 });
             });
         };
-        Auth2Service.prototype.loginIdp = function (emailOrPhone, password) {
+        AuthService.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) {
@@ -6347,10 +6325,10 @@
                         case 0: return [4 /*yield*/, this.fetchPassIdpParams(emailOrPhone)];
                         case 1:
                             passIdpApiResult = _f.sent();
-                            if (passIdpApiResult.passwordChangeStatus === PasswordChangeStatus.IN_PROGRESS) {
+                            if (passIdpApiResult.passwordChangeStatus === exports.PasswordChangeStatus.IN_PROGRESS) {
                                 throw new KcConcurrentAccessException('A password change is in progress');
                             }
-                            if (!(passIdpApiResult.passwordChangeStatus === PasswordChangeStatus.RECOVERY)) return [3 /*break*/, 8];
+                            if (!(passIdpApiResult.passwordChangeStatus === exports.PasswordChangeStatus.RECOVERY)) return [3 /*break*/, 8];
                             console.log('In recovery mode.');
                             _f.label = 2;
                         case 2:
@@ -6359,7 +6337,7 @@
                             return [4 /*yield*/, this.loginIdpImpl(emailOrPhone, password, passIdpApiResult.newPassIdpParams)];
                         case 3:
                             user_1 = (_b.cognitoUser = _f.sent(),
-                                _b.recoveryStatus = RecoveryStatus.NEW_PASSWORD,
+                                _b.recoveryStatus = exports.RecoveryStatus.NEW_PASSWORD,
                                 _b);
                             // New password worked. Let's set to the current password
                             // --Potential Failure Point 1--
@@ -6379,7 +6357,7 @@
                             return [4 /*yield*/, this.loginIdpImpl(emailOrPhone, password, passIdpApiResult.currentPassIdpParams)];
                         case 6:
                             user_2 = (_c.cognitoUser = _f.sent(),
-                                _c.recoveryStatus = RecoveryStatus.OLD_PASSWORD,
+                                _c.recoveryStatus = exports.RecoveryStatus.OLD_PASSWORD,
                                 _c);
                             // Old password worked.
                             console.log('Old password works!');
@@ -6400,7 +6378,7 @@
                             return [4 /*yield*/, this.loginIdpImpl(reset.resetUsername, password, reset.passIdpParams)];
                         case 10:
                             user_3 = (_d.cognitoUser = _f.sent(),
-                                _d.recoveryStatus = RecoveryStatus.NONE,
+                                _d.recoveryStatus = exports.RecoveryStatus.NONE,
                                 _d);
                             return [2 /*return*/, user_3];
                         case 11:
@@ -6411,14 +6389,14 @@
                             return [4 /*yield*/, this.loginIdpImpl(emailOrPhone, password, passIdpApiResult.currentPassIdpParams)];
                         case 13:
                             user = (_e.cognitoUser = _f.sent(),
-                                _e.recoveryStatus = RecoveryStatus.NONE,
+                                _e.recoveryStatus = exports.RecoveryStatus.NONE,
                                 _e);
                             return [2 /*return*/, user];
                     }
                 });
             });
         };
-        Auth2Service.prototype.loginIdpImpl = function (emailOrPhone, password, passIdpParams) {
+        AuthService.prototype.loginIdpImpl = function (emailOrPhone, password, passIdpParams) {
             return __awaiter(this, void 0, void 0, function () {
                 var passIdpResult;
                 return __generator(this, function (_b) {
@@ -6432,7 +6410,7 @@
                 });
             });
         };
-        Auth2Service.prototype.handlePostAuth = function (recoveryStatus) {
+        AuthService.prototype.handlePostAuth = function (recoveryStatus) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -6447,14 +6425,14 @@
                 });
             });
         };
-        Auth2Service.prototype.handlePasswordRecovery = function (recoveryStatus) {
+        AuthService.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];
+                            if (!(recoveryStatus !== exports.RecoveryStatus.NONE)) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.passwordService.changePasswordComplete({
-                                    useNewPassword: recoveryStatus === RecoveryStatus.NEW_PASSWORD,
+                                    useNewPassword: recoveryStatus === exports.RecoveryStatus.NEW_PASSWORD,
                                 })];
                         case 1:
                             _b.sent();
@@ -6464,7 +6442,7 @@
                 });
             });
         };
-        Auth2Service.prototype.handleSessionEncryptionKey = function () {
+        AuthService.prototype.handleSessionEncryptionKey = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var msg, sessionEncryptionKey;
                 return __generator(this, function (_b) {
@@ -6502,11 +6480,11 @@
                 });
             });
         };
-        Auth2Service.prototype.getCognitoUserAttribute = function (attributeName, userAttributes) {
+        AuthService.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) {
+        AuthService.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) {
@@ -6535,7 +6513,7 @@
                 });
             });
         };
-        Auth2Service.prototype.loadUser = function (cognitoUser, password) {
+        AuthService.prototype.loadUser = function (cognitoUser, password) {
             return __awaiter(this, void 0, void 0, function () {
                 var _b, _c;
                 return __generator(this, function (_d) {
@@ -6561,7 +6539,7 @@
                 });
             });
         };
-        Auth2Service.prototype.loadRegularUser = function (cognitoUser, password) {
+        AuthService.prototype.loadRegularUser = function (cognitoUser, password) {
             return __awaiter(this, void 0, void 0, function () {
                 var currentUser, username, userAttributes;
                 return __generator(this, function (_b) {
@@ -6595,7 +6573,7 @@
                 });
             });
         };
-        Auth2Service.prototype.loadResetUser = function (cognitoUser, password) {
+        AuthService.prototype.loadResetUser = function (cognitoUser, password) {
             return __awaiter(this, void 0, void 0, function () {
                 var resetUser, userKeys, username, userAttributes;
                 return __generator(this, function (_b) {
@@ -6640,7 +6618,7 @@
                 });
             });
         };
-        Auth2Service.prototype.recoverAssemblyKey = function (resetUser) {
+        AuthService.prototype.recoverAssemblyKey = function (resetUser) {
             return __awaiter(this, void 0, void 0, function () {
                 var prk, partials;
                 var _this = this;
@@ -6659,7 +6637,7 @@
                 });
             });
         };
-        Auth2Service.prototype.completeResetRequest = function (newPassword) {
+        AuthService.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;
@@ -6775,13 +6753,13 @@
         // ------------------------------------------------------
         // Debug utilities
         // ------------------------------------------------------
-        Auth2Service.prototype.debugLogin = function (username, password) {
+        AuthService.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) {
+        AuthService.prototype.debugLoadUser = function (password) {
             return __awaiter(this, void 0, void 0, function () {
                 var currentUser, username, currentUserKey, passKey, masterKey;
                 return __generator(this, function (_b) {
@@ -6816,10 +6794,10 @@
         /**
          * Clears the caches user. So we can simulate a page refresh and test getUser().
          */
-        Auth2Service.prototype.debugClearUser = function () {
+        AuthService.prototype.debugClearUser = function () {
             this.user = null;
         };
-        Auth2Service.prototype.getCurrentUserAttributes = function () {
+        AuthService.prototype.getCurrentUserAttributes = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var cognitoUser, userAttributes;
                 return __generator(this, function (_b) {
@@ -6835,16 +6813,16 @@
                 });
             });
         };
-        return Auth2Service;
+        return AuthService;
     }(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$1.HttpClient), i0.ɵɵinject(i4.AuthClass), i0.ɵɵinject(exports.ɵg), 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 = [
+    exports.AuthService.CHALLENGE_TIMEOUT = 1000 * 60 * 5;
+    exports.AuthService.ɵprov = i0.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new exports.AuthService(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(i2$1.HttpClient), i0.ɵɵinject(i4.AuthClass), i0.ɵɵinject(exports.ɵg), 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.AuthService, providedIn: "root" });
+    exports.AuthService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
-    exports.Auth2Service.ctorParameters = function () { return [
+    exports.AuthService.ctorParameters = function () { return [
         { type: i0.NgZone },
         { type: i0.Injector },
         { type: i2$1.HttpClient },
@@ -6860,16 +6838,16 @@
         { type: exports.ɵi },
         { type: undefined, decorators: [{ type: i0.Inject, args: [KC_CONFIG,] }] }
     ]; };
-    exports.Auth2Service = Auth2Service_1 = __decorate([
+    exports.AuthService = AuthService_1 = __decorate([
         RunOutsideAngular({
             ngZoneName: 'ngZone',
         })
-    ], exports.Auth2Service);
+    ], exports.AuthService);
 
-    var CreateContactCardMutation$2 = gqlTyped(templateObject_1$c || (templateObject_1$c = __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$7 || (templateObject_2$7 = __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$6 || (templateObject_3$6 = __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$c, templateObject_2$7, templateObject_3$6;
+    var CreateContactCardMutation$2 = gqlTyped(templateObject_1$d || (templateObject_1$d = __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$8 || (templateObject_2$8 = __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$7 || (templateObject_3$7 = __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$d, templateObject_2$8, templateObject_3$7;
 
     var OwnerPlainDataJson = /** @class */ (function () {
         function OwnerPlainDataJson() {
@@ -7095,11 +7073,30 @@
         { type: i4.AuthClass }
     ]; };
 
-    var LockFragment = gqlTyped(templateObject_1$d || (templateObject_1$d = __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$8 || (templateObject_2$8 = __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$7 || (templateObject_3$7 = __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$4 || (templateObject_4$4 = __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$d, templateObject_2$8, templateObject_3$7, templateObject_4$4;
+    var CreateDirectoryMutation = gqlTyped(templateObject_1$e || (templateObject_1$e = __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$9 || (templateObject_2$9 = __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$8 || (templateObject_3$8 = __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 = gqlTyped(templateObject_4$5 || (templateObject_4$5 = __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$5 || (templateObject_5$5 = __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"])));
+    var RevertFileMutation = gqlTyped(templateObject_6$4 || (templateObject_6$4 = __makeTemplateObject(["\nmutation RevertFileMutation($input: RevertFileInput!) {\n  revertFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"], ["\nmutation RevertFileMutation($input: RevertFileInput!) {\n  revertFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"])));
+    var DeleteFileMutation = gqlTyped(templateObject_7$3 || (templateObject_7$3 = __makeTemplateObject(["\nmutation DeleteFileMutation($input: DeleteFileInput!) {\n  deleteFile(input: $input) {\n    id\n  }\n}\n"], ["\nmutation DeleteFileMutation($input: DeleteFileInput!) {\n  deleteFile(input: $input) {\n    id\n  }\n}\n"])));
+    var ArchiveDirectoryMutation = gqlTyped(templateObject_8$3 || (templateObject_8$3 = __makeTemplateObject(["\nmutation ArchiveDirectoryMutation($input: ArchiveDirectoryInput!) {\n  archiveDirectory(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"], ["\nmutation ArchiveDirectoryMutation($input: ArchiveDirectoryInput!) {\n  archiveDirectory(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"])));
+    var ArchiveFileMutation = gqlTyped(templateObject_9$2 || (templateObject_9$2 = __makeTemplateObject(["\nmutation ArchiveFileMutation($input: ArchiveFileInput!) {\n  archiveFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"], ["\nmutation ArchiveFileMutation($input: ArchiveFileInput!) {\n  archiveFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"])));
+    var UnarchiveDirectoryMutation = gqlTyped(templateObject_10 || (templateObject_10 = __makeTemplateObject(["\nmutation UnarchiveDirectoryMutation($input: UnarchiveDirectoryInput!) {\n  unarchiveDirectory(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"], ["\nmutation UnarchiveDirectoryMutation($input: UnarchiveDirectoryInput!) {\n  unarchiveDirectory(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"])));
+    var UnarchiveFileMutation = gqlTyped(templateObject_11 || (templateObject_11 = __makeTemplateObject(["\nmutation UnarchiveFileMutation($input: UnarchiveFileInput!) {\n  unarchiveFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"], ["\nmutation UnarchiveFileMutation($input: UnarchiveFileInput!) {\n  unarchiveFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"])));
+    var ChangeDirectoryParentsMutation = gqlTyped(templateObject_12 || (templateObject_12 = __makeTemplateObject(["\nmutation ChangeDirectoryParentsMutation($input: ChangeDirectoryParentsInput!) {\n  changeDirectoryParents(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"], ["\nmutation ChangeDirectoryParentsMutation($input: ChangeDirectoryParentsInput!) {\n  changeDirectoryParents(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"])));
+    var ChangeFileParentsMutation = gqlTyped(templateObject_13 || (templateObject_13 = __makeTemplateObject(["\nmutation ChangeFileParentsMutation($input: ChangeFileParentsInput!) {\n  changeFileParents(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"], ["\nmutation ChangeFileParentsMutation($input: ChangeFileParentsInput!) {\n  changeFileParents(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"])));
+    var BeginDeleteChildItemLinksWindowMutation = gqlTyped(templateObject_14 || (templateObject_14 = __makeTemplateObject(["\nmutation BeginDeleteChildItemLinksWindowMutation($input: BeginDeleteChildItemLinksWindowInput!) {\n  beginDeleteChildItemLinksWindow(input: $input) {\n    begin\n    end\n    scheduled\n    windowMs\n    directory {\n      id\n    }\n  }\n}\n"], ["\nmutation BeginDeleteChildItemLinksWindowMutation($input: BeginDeleteChildItemLinksWindowInput!) {\n  beginDeleteChildItemLinksWindow(input: $input) {\n    begin\n    end\n    scheduled\n    windowMs\n    directory {\n      id\n    }\n  }\n}\n"])));
+    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$e, templateObject_2$9, templateObject_3$8, templateObject_4$5, templateObject_5$5, templateObject_6$4, templateObject_7$3, templateObject_8$3, templateObject_9$2, templateObject_10, templateObject_11, templateObject_12, templateObject_13, templateObject_14, templateObject_15, templateObject_16, templateObject_17;
+
+    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$a || (templateObject_2$a = __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$9 || (templateObject_3$9 = __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$6 || (templateObject_4$6 = __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$a, templateObject_3$9, templateObject_4$6;
 
     exports.LockService = /** @class */ (function (_super) {
         __extends(LockService, _super);
@@ -7161,34 +7158,15 @@
         })
     ], exports.LockService);
 
-    var CreateDirectoryMutation = gqlTyped(templateObject_1$e || (templateObject_1$e = __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$9 || (templateObject_2$9 = __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$8 || (templateObject_3$8 = __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 = gqlTyped(templateObject_4$5 || (templateObject_4$5 = __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$4 || (templateObject_5$4 = __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"])));
-    var RevertFileMutation = gqlTyped(templateObject_6$3 || (templateObject_6$3 = __makeTemplateObject(["\nmutation RevertFileMutation($input: RevertFileInput!) {\n  revertFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"], ["\nmutation RevertFileMutation($input: RevertFileInput!) {\n  revertFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"])));
-    var DeleteFileMutation = gqlTyped(templateObject_7$2 || (templateObject_7$2 = __makeTemplateObject(["\nmutation DeleteFileMutation($input: DeleteFileInput!) {\n  deleteFile(input: $input) {\n    id\n  }\n}\n"], ["\nmutation DeleteFileMutation($input: DeleteFileInput!) {\n  deleteFile(input: $input) {\n    id\n  }\n}\n"])));
-    var ArchiveDirectoryMutation = gqlTyped(templateObject_8$2 || (templateObject_8$2 = __makeTemplateObject(["\nmutation ArchiveDirectoryMutation($input: ArchiveDirectoryInput!) {\n  archiveDirectory(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"], ["\nmutation ArchiveDirectoryMutation($input: ArchiveDirectoryInput!) {\n  archiveDirectory(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"])));
-    var ArchiveFileMutation = gqlTyped(templateObject_9$1 || (templateObject_9$1 = __makeTemplateObject(["\nmutation ArchiveFileMutation($input: ArchiveFileInput!) {\n  archiveFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"], ["\nmutation ArchiveFileMutation($input: ArchiveFileInput!) {\n  archiveFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"])));
-    var UnarchiveDirectoryMutation = gqlTyped(templateObject_10 || (templateObject_10 = __makeTemplateObject(["\nmutation UnarchiveDirectoryMutation($input: UnarchiveDirectoryInput!) {\n  unarchiveDirectory(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"], ["\nmutation UnarchiveDirectoryMutation($input: UnarchiveDirectoryInput!) {\n  unarchiveDirectory(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"])));
-    var UnarchiveFileMutation = gqlTyped(templateObject_11 || (templateObject_11 = __makeTemplateObject(["\nmutation UnarchiveFileMutation($input: UnarchiveFileInput!) {\n  unarchiveFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"], ["\nmutation UnarchiveFileMutation($input: UnarchiveFileInput!) {\n  unarchiveFile(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"])));
-    var ChangeDirectoryParentsMutation = gqlTyped(templateObject_12 || (templateObject_12 = __makeTemplateObject(["\nmutation ChangeDirectoryParentsMutation($input: ChangeDirectoryParentsInput!) {\n  changeDirectoryParents(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"], ["\nmutation ChangeDirectoryParentsMutation($input: ChangeDirectoryParentsInput!) {\n  changeDirectoryParents(input: $input) {\n    directory {\n      id\n    }\n  }\n}\n"])));
-    var ChangeFileParentsMutation = gqlTyped(templateObject_13 || (templateObject_13 = __makeTemplateObject(["\nmutation ChangeFileParentsMutation($input: ChangeFileParentsInput!) {\n  changeFileParents(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"], ["\nmutation ChangeFileParentsMutation($input: ChangeFileParentsInput!) {\n  changeFileParents(input: $input) {\n    file {\n      id\n    }\n  }\n}\n"])));
-    var BeginDeleteChildItemLinksWindowMutation = gqlTyped(templateObject_14 || (templateObject_14 = __makeTemplateObject(["\nmutation BeginDeleteChildItemLinksWindowMutation($input: BeginDeleteChildItemLinksWindowInput!) {\n  beginDeleteChildItemLinksWindow(input: $input) {\n    begin\n    end\n    scheduled\n    windowMs\n    directory {\n      id\n    }\n  }\n}\n"], ["\nmutation BeginDeleteChildItemLinksWindowMutation($input: BeginDeleteChildItemLinksWindowInput!) {\n  beginDeleteChildItemLinksWindow(input: $input) {\n    begin\n    end\n    scheduled\n    windowMs\n    directory {\n      id\n    }\n  }\n}\n"])));
-    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$e, templateObject_2$9, templateObject_3$8, templateObject_4$5, templateObject_5$4, templateObject_6$3, templateObject_7$2, templateObject_8$2, templateObject_9$1, templateObject_10, templateObject_11, templateObject_12, templateObject_13, templateObject_14, templateObject_15, templateObject_16, templateObject_17;
-
-    var DirectoryKeyQuery$1 = gqlTyped(templateObject_1$f || (templateObject_1$f = __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$a || (templateObject_2$a = __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$9 || (templateObject_3$9 = __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$f, templateObject_2$a, templateObject_3$9;
+    var DirectoryKeyQuery$1 = gqlTyped(templateObject_1$g || (templateObject_1$g = __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$b || (templateObject_2$b = __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$a || (templateObject_3$a = __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$g, templateObject_2$b, templateObject_3$a;
 
-    var Item2Service_1;
-    exports.Item2Service = Item2Service_1 = /** @class */ (function (_super) {
-        __extends(Item2Service, _super);
-        function Item2Service(ngZone, injector, fileUploadService, keyService, keyFactory, keyGraph, lockService, auth2Service) {
+    var ItemService_1;
+    exports.ItemService = ItemService_1 = /** @class */ (function (_super) {
+        __extends(ItemService, _super);
+        function ItemService(ngZone, injector, fileUploadService, keyService, keyFactory, keyGraph, lockService, authService) {
             var _this = _super.call(this, injector) || this;
             _this.ngZone = ngZone;
             _this.injector = injector;
@@ -7197,13 +7175,13 @@
             _this.keyFactory = keyFactory;
             _this.keyGraph = keyGraph;
             _this.lockService = lockService;
-            _this.auth2Service = auth2Service;
+            _this.authService = authService;
             // Caching the temp directory.
             _this.tempDirectory = null;
-            _this.auth2Service.addLogoutListener(function () { return _this.onLogout(); });
+            _this.authService.addLogoutListener(function () { return _this.onLogout(); });
             return _this;
         }
-        Item2Service.prototype.downloadFileContent = function (options) {
+        ItemService.prototype.downloadFileContent = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var fileContent, fileStateKey;
                 var _this = this;
@@ -7222,7 +7200,7 @@
                 });
             });
         };
-        Item2Service.prototype.getDirectoryKeyId = function (directoryId) {
+        ItemService.prototype.getDirectoryKeyId = function (directoryId) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     switch (_d.label) {
@@ -7237,7 +7215,7 @@
                 });
             });
         };
-        Item2Service.prototype.getFileKeyId = function (fileId) {
+        ItemService.prototype.getFileKeyId = function (fileId) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     switch (_d.label) {
@@ -7252,7 +7230,7 @@
                 });
             });
         };
-        Item2Service.prototype.getDirectoryKey = function (directoryId, directoryKeyId) {
+        ItemService.prototype.getDirectoryKey = function (directoryId, directoryKeyId) {
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
                 return __generator(this, function (_d) {
@@ -7260,7 +7238,7 @@
                 });
             });
         };
-        Item2Service.prototype.getFileKey = function (fileId, fileKeyId) {
+        ItemService.prototype.getFileKey = function (fileId, fileKeyId) {
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
                 return __generator(this, function (_d) {
@@ -7268,10 +7246,10 @@
                 });
             });
         };
-        Item2Service.prototype.createDirectory = function (options) {
+        ItemService.prototype.createDirectory = function (options) {
             return this.mutate(this.createDirectoryMutation(options));
         };
-        Item2Service.prototype.createDirectoryMutation = function (options) {
+        ItemService.prototype.createDirectoryMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var _d, _e, _f;
                 return __generator(this, function (_g) {
@@ -7290,10 +7268,10 @@
                 });
             });
         };
-        Item2Service.prototype.updateDirectory = function (options) {
+        ItemService.prototype.updateDirectory = function (options) {
             return this.mutate(this.updateDirectoryMutation(options));
         };
-        Item2Service.prototype.updateDirectoryMutation = function (options) {
+        ItemService.prototype.updateDirectoryMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var _d, _e, _f;
                 return __generator(this, function (_g) {
@@ -7312,10 +7290,10 @@
                 });
             });
         };
-        Item2Service.prototype.deleteDirectory = function (id) {
+        ItemService.prototype.deleteDirectory = function (id) {
             return this.mutate(this.deleteDirectoryMutation(id));
         };
-        Item2Service.prototype.deleteDirectoryMutation = function (id) {
+        ItemService.prototype.deleteDirectoryMutation = function (id) {
             return new LrMutation({
                 mutation: DeleteDirectoryMutation,
                 variables: {
@@ -7325,10 +7303,10 @@
                 },
             });
         };
-        Item2Service.prototype.createFile = function (options) {
+        ItemService.prototype.createFile = function (options) {
             return this.mutate(this.createFileMutation(options));
         };
-        Item2Service.prototype.createFileMutation = function (options) {
+        ItemService.prototype.createFileMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var _d, _e, _f;
                 return __generator(this, function (_g) {
@@ -7347,10 +7325,10 @@
                 });
             });
         };
-        Item2Service.prototype.updateFile = function (options) {
+        ItemService.prototype.updateFile = function (options) {
             return this.mutate(this.updateFileMutation(options));
         };
-        Item2Service.prototype.updateFileMutation = function (options) {
+        ItemService.prototype.updateFileMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var _d, _e, _f;
                 return __generator(this, function (_g) {
@@ -7369,10 +7347,10 @@
                 });
             });
         };
-        Item2Service.prototype.revertFile = function (options) {
+        ItemService.prototype.revertFile = function (options) {
             return this.mutate(this.revertFileMutation(options));
         };
-        Item2Service.prototype.revertFileMutation = function (options) {
+        ItemService.prototype.revertFileMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     return [2 /*return*/, new LrMutation({
@@ -7384,10 +7362,10 @@
                 });
             });
         };
-        Item2Service.prototype.deleteFile = function (id) {
+        ItemService.prototype.deleteFile = function (id) {
             return this.mutate(this.deleteFileMutation(id));
         };
-        Item2Service.prototype.deleteFileMutation = function (id) {
+        ItemService.prototype.deleteFileMutation = function (id) {
             return new LrMutation({
                 mutation: DeleteFileMutation,
                 variables: {
@@ -7397,10 +7375,10 @@
                 },
             });
         };
-        Item2Service.prototype.archiveDirectory = function (directoryId, options) {
+        ItemService.prototype.archiveDirectory = function (directoryId, options) {
             return this.mutate(this.archiveDirectoryMutation(directoryId, options));
         };
-        Item2Service.prototype.archiveDirectoryMutation = function (directoryId, options) {
+        ItemService.prototype.archiveDirectoryMutation = function (directoryId, options) {
             return new LrMutation({
                 mutation: ArchiveDirectoryMutation,
                 variables: {
@@ -7411,10 +7389,10 @@
                 },
             });
         };
-        Item2Service.prototype.archiveFile = function (fileId) {
+        ItemService.prototype.archiveFile = function (fileId) {
             return this.mutate(this.archiveFileMutation(fileId));
         };
-        Item2Service.prototype.archiveFileMutation = function (fileId) {
+        ItemService.prototype.archiveFileMutation = function (fileId) {
             return new LrMutation({
                 mutation: ArchiveFileMutation,
                 variables: {
@@ -7424,10 +7402,10 @@
                 },
             });
         };
-        Item2Service.prototype.unarchiveDirectory = function (directoryId, options) {
+        ItemService.prototype.unarchiveDirectory = function (directoryId, options) {
             return this.mutate(this.unarchiveDirectoryMutation(directoryId, options));
         };
-        Item2Service.prototype.unarchiveDirectoryMutation = function (directoryId, options) {
+        ItemService.prototype.unarchiveDirectoryMutation = function (directoryId, options) {
             return new LrMutation({
                 mutation: UnarchiveDirectoryMutation,
                 variables: {
@@ -7438,10 +7416,10 @@
                 },
             });
         };
-        Item2Service.prototype.unarchiveFile = function (fileId) {
+        ItemService.prototype.unarchiveFile = function (fileId) {
             return this.mutate(this.unarchiveFileMutation(fileId));
         };
-        Item2Service.prototype.unarchiveFileMutation = function (fileId) {
+        ItemService.prototype.unarchiveFileMutation = function (fileId) {
             return new LrMutation({
                 mutation: UnarchiveFileMutation,
                 variables: {
@@ -7451,10 +7429,10 @@
                 },
             });
         };
-        Item2Service.prototype.changeDirectoryParents = function (options) {
+        ItemService.prototype.changeDirectoryParents = function (options) {
             return this.mutate(this.changeDirectoryParentsMutation(options));
         };
-        Item2Service.prototype.changeDirectoryParentsMutation = function (options) {
+        ItemService.prototype.changeDirectoryParentsMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var _d, _e, _f;
                 return __generator(this, function (_g) {
@@ -7473,14 +7451,14 @@
                 });
             });
         };
-        Item2Service.prototype.changeFileParents = function (options) {
+        ItemService.prototype.changeFileParents = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     return [2 /*return*/, this.mutate(this.changeFileParentsMutation(options))];
                 });
             });
         };
-        Item2Service.prototype.changeFileParentsMutation = function (options) {
+        ItemService.prototype.changeFileParentsMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var _d, _e, _f;
                 return __generator(this, function (_g) {
@@ -7499,7 +7477,7 @@
                 });
             });
         };
-        Item2Service.prototype.beginDeleteChildItemLinksWindow = function (options) {
+        ItemService.prototype.beginDeleteChildItemLinksWindow = function (options) {
             return this.mutate(this.beginDeleteChildItemLinksWindowMutation(options));
         };
         /**
@@ -7512,7 +7490,7 @@
          * The server has a setting that allows for a maximum value on requestWindowMs. If the requested value
          * is larger than this maximum, the call will fail.
          */
-        Item2Service.prototype.beginDeleteChildItemLinksWindowMutation = function (options) {
+        ItemService.prototype.beginDeleteChildItemLinksWindowMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     return [2 /*return*/, new LrMutation({
@@ -7535,7 +7513,7 @@
          * @returns The ID of the temp directory
          *
          */
-        Item2Service.prototype.ensureTempDirectory = function () {
+        ItemService.prototype.ensureTempDirectory = function () {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var existing, createDirectory, updateLock, _d, createDirectoryResult, _e, id, keyId, _f, id, keyId;
@@ -7548,18 +7526,18 @@
                             return [4 /*yield*/, this.query({
                                     query: TempDirectoryQuery,
                                     variables: {
-                                        plainMeta: Item2Service_1.TEMP_DIRECTORY_PLAIN_META_FILTER,
+                                        plainMeta: ItemService_1.TEMP_DIRECTORY_PLAIN_META_FILTER,
                                     },
                                 })];
                         case 1:
                             existing = _g.sent();
                             if (existing.rootDirectories.edges.length > 1) {
-                                console.error("There is more than 1 temp directory (plainMeta filter: " + Item2Service_1.TEMP_DIRECTORY_PLAIN_META_FILTER + ")");
+                                console.error("There is more than 1 temp directory (plainMeta filter: " + ItemService_1.TEMP_DIRECTORY_PLAIN_META_FILTER + ")");
                             }
                             if (!(existing.rootDirectories.edges.length === 0)) return [3 /*break*/, 4];
                             return [4 /*yield*/, this.createDirectoryMutation({
                                     asRootDirectory: true,
-                                    plainMetaJson: Item2Service_1.TEMP_DIRECTORY_PLAIN_META,
+                                    plainMetaJson: ItemService_1.TEMP_DIRECTORY_PLAIN_META,
                                 })];
                         case 2:
                             createDirectory = _g.sent();
@@ -7590,7 +7568,7 @@
                 });
             });
         };
-        Item2Service.prototype.createDirectoryTree = function (options) {
+        ItemService.prototype.createDirectoryTree = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     return [2 /*return*/, this.mutate(this.createDirectoryTreeMutation(options))];
@@ -7602,7 +7580,7 @@
          * server, otherwise the temp directory will get cleaned up.
          *
          */
-        Item2Service.prototype.createDirectoryTreeMutation = function (options) {
+        ItemService.prototype.createDirectoryTreeMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var tempDir, directory;
                 return __generator(this, function (_d) {
@@ -7659,14 +7637,14 @@
                 });
             });
         };
-        Item2Service.prototype.setFileConfidential = function (options) {
+        ItemService.prototype.setFileConfidential = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     return [2 /*return*/, this.mutate(this.setFileConfidentialMutation(options))];
                 });
             });
         };
-        Item2Service.prototype.setFileConfidentialMutation = function (options) {
+        ItemService.prototype.setFileConfidentialMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     return [2 /*return*/, new LrMutation({
@@ -7681,14 +7659,14 @@
                 });
             });
         };
-        Item2Service.prototype.setDirectoryConfidential = function (options) {
+        ItemService.prototype.setDirectoryConfidential = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     return [2 /*return*/, this.mutate(this.setDirectoryConfidentialMutation(options))];
                 });
             });
         };
-        Item2Service.prototype.setDirectoryConfidentialMutation = function (options) {
+        ItemService.prototype.setDirectoryConfidentialMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     return [2 /*return*/, new LrMutation({
@@ -7708,7 +7686,7 @@
         // Helpers
         // ------------------------------------------------------------------------------
         // ------------------------------------------------------------------------------
-        Item2Service.prototype.prepareParentDirectory = function (options, newKey) {
+        ItemService.prototype.prepareParentDirectory = function (options, newKey) {
             return __awaiter(this, void 0, void 0, function () {
                 var wrappingKey, _d;
                 return __generator(this, function (_e) {
@@ -7728,7 +7706,7 @@
                 });
             });
         };
-        Item2Service.prototype.getFileStateKeyId = function (fileStateNodeId) {
+        ItemService.prototype.getFileStateKeyId = function (fileStateNodeId) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     switch (_d.label) {
@@ -7743,7 +7721,7 @@
                 });
             });
         };
-        Item2Service.prototype.prepareCreateFileState = function (fileKey, options) {
+        ItemService.prototype.prepareCreateFileState = function (fileKey, options) {
             return __awaiter(this, void 0, void 0, function () {
                 var fileStateKey, fileContent, _d, contentResource, cipherFileContent, _e, _f, _g, _h, _j, _k, _l;
                 return __generator(this, function (_m) {
@@ -7788,7 +7766,7 @@
                 });
             });
         };
-        Item2Service.prototype.prepareChangeItemParents = function (options, itemKey) {
+        ItemService.prototype.prepareChangeItemParents = function (options, itemKey) {
             return __awaiter(this, void 0, void 0, function () {
                 var parentsToAdd, _d;
                 var _this = this;
@@ -7813,7 +7791,7 @@
                 });
             });
         };
-        Item2Service.prototype.prepareItem = function (key, options) {
+        ItemService.prototype.prepareItem = function (key, options) {
             return __awaiter(this, void 0, void 0, function () {
                 var plainMetaJson, cipherMetaClearJson, _d, _e;
                 return __generator(this, function (_f) {
@@ -7835,7 +7813,7 @@
                 });
             });
         };
-        Item2Service.prototype.prepareCreateDirectory = function (options) {
+        ItemService.prototype.prepareCreateDirectory = function (options) {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
                 var directoryKey, parentDirectories, parentRootDirectory, rootKey, _d, itemInput;
@@ -7874,7 +7852,7 @@
                 });
             });
         };
-        Item2Service.prototype.prepareUpdateDirectory = function (options) {
+        ItemService.prototype.prepareUpdateDirectory = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var directoryKey, itemInput;
                 return __generator(this, function (_d) {
@@ -7890,7 +7868,7 @@
                 });
             });
         };
-        Item2Service.prototype.prepareCreateFile = function (options) {
+        ItemService.prototype.prepareCreateFile = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var fileKey, parentDirectories, input;
                 var _this = this;
@@ -7926,7 +7904,7 @@
                 });
             });
         };
-        Item2Service.prototype.prepareUpdateFile = function (options) {
+        ItemService.prototype.prepareUpdateFile = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var fileKey, input;
                 return __generator(this, function (_d) {
@@ -7942,7 +7920,7 @@
                 });
             });
         };
-        Item2Service.prototype.prepareChangeDirectoryParents = function (options) {
+        ItemService.prototype.prepareChangeDirectoryParents = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var directoryKey, input;
                 return __generator(this, function (_d) {
@@ -7958,7 +7936,7 @@
                 });
             });
         };
-        Item2Service.prototype.prepareChangeFileParents = function (options) {
+        ItemService.prototype.prepareChangeFileParents = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var fileKey, input;
                 return __generator(this, function (_d) {
@@ -7974,27 +7952,27 @@
                 });
             });
         };
-        Item2Service.prototype.onLogout = function () {
+        ItemService.prototype.onLogout = function () {
             // Clear all cached data.
             this.tempDirectory = null;
         };
-        return Item2Service;
+        return ItemService;
     }(LrService));
-    exports.Item2Service.TEMP_DIRECTORY_PLAIN_META = { kcType: 'temp' };
-    exports.Item2Service.TEMP_DIRECTORY_PLAIN_META_FILTER = JSON.stringify({
+    exports.ItemService.TEMP_DIRECTORY_PLAIN_META = { kcType: 'temp' };
+    exports.ItemService.TEMP_DIRECTORY_PLAIN_META_FILTER = JSON.stringify({
         filter: [
             {
-                contains: Item2Service_1.TEMP_DIRECTORY_PLAIN_META,
+                contains: ItemService_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 = [
+    exports.ItemService.ɵprov = i0.ɵɵdefineInjectable({ factory: function ItemService_Factory() { return new exports.ItemService(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.AuthService)); }, token: exports.ItemService, providedIn: "root" });
+    exports.ItemService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
-    exports.Item2Service.ctorParameters = function () { return [
+    exports.ItemService.ctorParameters = function () { return [
         { type: i0.NgZone },
         { type: i0.Injector },
         { type: FileUploadService },
@@ -8002,30 +7980,17 @@
         { type: KeyFactoryService },
         { type: KeyGraphService },
         { type: exports.LockService },
-        { type: exports.Auth2Service }
+        { type: exports.AuthService }
     ]; };
-    exports.Item2Service = Item2Service_1 = __decorate([
+    exports.ItemService = ItemService_1 = __decorate([
         RunOutsideAngular({
             ngZoneName: 'ngZone',
         })
-    ], exports.Item2Service);
-
-    var KeyExchangeFragment = gqlTyped(templateObject_1$g || (templateObject_1$g = __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$b || (templateObject_2$b = __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$a || (templateObject_3$a = __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$6 || (templateObject_4$6 = __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$5 || (templateObject_5$5 = __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$4 || (templateObject_6$4 = __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"])));
-    var DeclineKeyExchangeMutation = gqlTyped(templateObject_7$3 || (templateObject_7$3 = __makeTemplateObject(["\nmutation DeclineKeyExchangeMutation($input: DeclineKeyExchangeInput!) {\n  declineKeyExchange(input: $input) {\n    keyExchange {\n      id\n    }\n  }\n}\n"], ["\nmutation DeclineKeyExchangeMutation($input: DeclineKeyExchangeInput!) {\n  declineKeyExchange(input: $input) {\n    keyExchange {\n      id\n    }\n  }\n}\n"])));
-    var InitiateKeyExchangeOtkMutation = gqlTyped(templateObject_8$3 || (templateObject_8$3 = __makeTemplateObject(["\nmutation InitiateKeyExchangeOtkMutation(\n  $input: InitiateKeyExchangeOtkInput!\n) {\n  initiateKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ...KeyExchangeFragment\n    }\n  }\n}\n", "\n"], ["\nmutation InitiateKeyExchangeOtkMutation(\n  $input: InitiateKeyExchangeOtkInput!\n) {\n  initiateKeyExchangeOtk(input: $input) {\n    keyExchange {\n      ...KeyExchangeFragment\n    }\n  }\n}\n", "\n"])), KeyExchangeFragment);
-    var RespondKeyExchangeOtkMutation = gqlTyped(templateObject_9$2 || (templateObject_9$2 = __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$1 || (templateObject_10$1 = __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$1 || (templateObject_11$1 = __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$g, templateObject_2$b, templateObject_3$a, templateObject_4$6, templateObject_5$5, templateObject_6$4, templateObject_7$3, templateObject_8$3, templateObject_9$2, templateObject_10$1, templateObject_11$1;
+    ], exports.ItemService);
 
-    exports.KeyExchange2Service = /** @class */ (function (_super) {
-        __extends(KeyExchange2Service, _super);
-        function KeyExchange2Service(ngZone, injector, keyFactory, keyService, encryptionService, keyGraph) {
+    exports.KeyExchangeService = /** @class */ (function (_super) {
+        __extends(KeyExchangeService, _super);
+        function KeyExchangeService(ngZone, injector, keyFactory, keyService, encryptionService, keyGraph) {
             var _this = _super.call(this, injector) || this;
             _this.ngZone = ngZone;
             _this.injector = injector;
@@ -8036,7 +8001,7 @@
             _this.CLIENT_NONCE_LENGTH = 32;
             return _this;
         }
-        KeyExchange2Service.prototype.getOtKey = function (keyExchange, otKeyK) {
+        KeyExchangeService.prototype.getOtKey = function (keyExchange, otKeyK) {
             return __awaiter(this, void 0, void 0, function () {
                 var prk, decryptedCipher;
                 return __generator(this, function (_a) {
@@ -8063,7 +8028,7 @@
                 });
             });
         };
-        KeyExchange2Service.prototype.decryptOtk = function (keyExchange, otKeyK) {
+        KeyExchangeService.prototype.decryptOtk = function (keyExchange, otKeyK) {
             return __awaiter(this, void 0, void 0, function () {
                 var otKey, otk, _a, _b, _c, _d;
                 return __generator(this, function (_e) {
@@ -8085,7 +8050,7 @@
                 });
             });
         };
-        KeyExchange2Service.prototype.decryptResponseCipher = function (otKey, otPrk, content) {
+        KeyExchangeService.prototype.decryptResponseCipher = function (otKey, otPrk, content) {
             return __awaiter(this, void 0, void 0, function () {
                 var error_1;
                 return __generator(this, function (_a) {
@@ -8110,7 +8075,7 @@
                 });
             });
         };
-        KeyExchange2Service.prototype.decryptKeyExchangeAsInitiator = function (keyExchange) {
+        KeyExchangeService.prototype.decryptKeyExchangeAsInitiator = function (keyExchange) {
             return __awaiter(this, void 0, void 0, function () {
                 var rootKey, initiatorRootKeyCipherClearJson, otKey, otk, _a, _b, _c, _d, _e, _f, _g;
                 return __generator(this, function (_h) {
@@ -8148,14 +8113,14 @@
                 });
             });
         };
-        KeyExchange2Service.prototype.decryptKeyExchangeAsResponder = function (keyExchange, otKeyK) {
+        KeyExchangeService.prototype.decryptKeyExchangeAsResponder = function (keyExchange, otKeyK) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, this.decryptOtk(keyExchange, otKeyK)];
                 });
             });
         };
-        KeyExchange2Service.prototype.decryptKeyExchange = function (keyExchange, otKeyK) {
+        KeyExchangeService.prototype.decryptKeyExchange = function (keyExchange, otKeyK) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     if (keyExchange.isInitiator) {
@@ -8168,7 +8133,7 @@
                 });
             });
         };
-        KeyExchange2Service.prototype.getKeyExchanges = function (_a) {
+        KeyExchangeService.prototype.getKeyExchanges = function (_a) {
             var _b = _a === void 0 ? {} : _a, state = _b.state;
             return __awaiter(this, void 0, void 0, function () {
                 var keyExchanges;
@@ -8194,7 +8159,7 @@
          * @param otKeyK Is the raw one-time key (string). If the responder is explicitly specified at time of initiation, then
          *   it's possible to have the otKey wrapped by the public key of the responder. In which case, the otKeyK is not needed.
          */
-        KeyExchange2Service.prototype.getKeyExchange = function (id, _a) {
+        KeyExchangeService.prototype.getKeyExchange = function (id, _a) {
             var _b = _a === void 0 ? {} : _a, otKeyK = _b.otKeyK, token = _b.token;
             return __awaiter(this, void 0, void 0, function () {
                 var res;
@@ -8215,7 +8180,7 @@
                 });
             });
         };
-        KeyExchange2Service.prototype.getCurrentUserSharedKey = function (input) {
+        KeyExchangeService.prototype.getCurrentUserSharedKey = function (input) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, this.query({
@@ -8228,10 +8193,10 @@
                 });
             });
         };
-        KeyExchange2Service.prototype.cancelKeyExchange = function (id) {
+        KeyExchangeService.prototype.cancelKeyExchange = function (id) {
             return this.mutate(this.cancelKeyExchangeMutation(id));
         };
-        KeyExchange2Service.prototype.cancelKeyExchangeMutation = function (id) {
+        KeyExchangeService.prototype.cancelKeyExchangeMutation = function (id) {
             return new LrMutation({
                 mutation: CancelKeyExchangeMutation,
                 variables: {
@@ -8241,10 +8206,10 @@
                 },
             });
         };
-        KeyExchange2Service.prototype.declineKeyExchange = function (id, token) {
+        KeyExchangeService.prototype.declineKeyExchange = function (id, token) {
             return this.mutate(this.declineKeyExchangeMutation(id, token));
         };
-        KeyExchange2Service.prototype.declineKeyExchangeMutation = function (id, token) {
+        KeyExchangeService.prototype.declineKeyExchangeMutation = function (id, token) {
             return new LrMutation({
                 mutation: DeclineKeyExchangeMutation,
                 variables: {
@@ -8255,7 +8220,7 @@
                 },
             });
         };
-        KeyExchange2Service.prototype.initiateOtk = function (input) {
+        KeyExchangeService.prototype.initiateOtk = function (input) {
             if (input === void 0) { input = {}; }
             return __awaiter(this, void 0, void 0, function () {
                 var _a;
@@ -8269,7 +8234,7 @@
                 });
             });
         };
-        KeyExchange2Service.prototype.initiateOtkMutation = function (_a) {
+        KeyExchangeService.prototype.initiateOtkMutation = function (_a) {
             var _b = _a === void 0 ? {} : _a, message = _b.message, email = _b.email, contactCard = _b.contactCard, upgrade = _b.upgrade;
             return __awaiter(this, void 0, void 0, function () {
                 var otKey, nonce, initiatorOneTimePrk, initiatorPrk, initiatorSigPrk, initiatorPlainDataSig, initiator, plainOtKeyCipher, otKeyCipher, initiatorRootKeyCipherClearJson, rootKey, initiatorRootKeyCipher, otKeyK, lrMutation;
@@ -8354,10 +8319,10 @@
                 });
             });
         };
-        KeyExchange2Service.prototype.respondOtk = function (input) {
+        KeyExchangeService.prototype.respondOtk = function (input) {
             return this.mutate(this.respondOtkMutation(input));
         };
-        KeyExchange2Service.prototype.respondOtkMutation = function (_a) {
+        KeyExchangeService.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, 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;
@@ -8535,10 +8500,10 @@
                 });
             });
         };
-        KeyExchange2Service.prototype.completeOtk = function (input) {
+        KeyExchangeService.prototype.completeOtk = function (input) {
             return this.mutate(this.completeOtkMutation(input));
         };
-        KeyExchange2Service.prototype.completeOtkMutation = function (_a) {
+        KeyExchangeService.prototype.completeOtkMutation = function (_a) {
             var keyExchangeId = _a.keyExchangeId, initiatorRootKeyCipher = _a.initiatorRootKeyCipher, initiatorOneTimePbkCipher = _a.initiatorOneTimePbkCipher, responderContactCard = _a.responderContactCard, initiatorContactCard = _a.initiatorContactCard;
             return __awaiter(this, void 0, void 0, function () {
                 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;
@@ -8672,15 +8637,15 @@
                 });
             });
         };
-        return KeyExchange2Service;
+        return KeyExchangeService;
     }(LrService));
-    exports.KeyExchange2Service.ɵprov = i0.ɵɵdefineInjectable({ factory: function KeyExchange2Service_Factory() { return new exports.KeyExchange2Service(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(KeyService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(KeyGraphService)); }, token: exports.KeyExchange2Service, providedIn: "root" });
-    exports.KeyExchange2Service.decorators = [
+    exports.KeyExchangeService.ɵprov = i0.ɵɵdefineInjectable({ factory: function KeyExchangeService_Factory() { return new exports.KeyExchangeService(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(KeyService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(KeyGraphService)); }, token: exports.KeyExchangeService, providedIn: "root" });
+    exports.KeyExchangeService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
-    exports.KeyExchange2Service.ctorParameters = function () { return [
+    exports.KeyExchangeService.ctorParameters = function () { return [
         { type: i0.NgZone },
         { type: i0.Injector },
         { type: KeyFactoryService },
@@ -8688,11 +8653,11 @@
         { type: EncryptionService },
         { type: KeyGraphService }
     ]; };
-    exports.KeyExchange2Service = __decorate([
+    exports.KeyExchangeService = __decorate([
         RunOutsideAngular({
             ngZoneName: 'ngZone',
         })
-    ], exports.KeyExchange2Service);
+    ], exports.KeyExchangeService);
 
     var ERROR_SOURCE = 'LBOP';
     (function (KcLbopErrorCode) {
@@ -8704,16 +8669,14 @@
     var LbopQuery = gql__default['default'](templateObject_4$7 || (templateObject_4$7 = __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$6 || (templateObject_5$6 = __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, auth2Service, keyFactory, keyService, encryptionService, keyGraph, passwordService) {
+        function LbopService(config, http, lrApollo, auth, keyFactory, keyService, encryptionService, passwordService) {
             this.config = config;
             this.http = http;
             this.lrApollo = lrApollo;
             this.auth = auth;
-            this.auth2Service = auth2Service;
             this.keyFactory = keyFactory;
             this.keyService = keyService;
             this.encryptionService = encryptionService;
-            this.keyGraph = keyGraph;
             this.passwordService = passwordService;
             this.CLIENT_NONCE_LENGTH = 32;
             // There are 1024 words (10 bits), so 25 words should give ~256 bits of entropy.
@@ -9105,7 +9068,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(exports.Auth2Service), 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$1.HttpClient), i0.ɵɵinject(LrApolloService), i0.ɵɵinject(i4.AuthClass), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(KeyService), i0.ɵɵinject(EncryptionService), i0.ɵɵinject(PasswordService)); }, token: LbopService, providedIn: "root" });
     LbopService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -9116,11 +9079,9 @@
         { type: i2$1.HttpClient },
         { type: LrApolloService },
         { type: i4.AuthClass },
-        { type: exports.Auth2Service },
         { type: KeyFactoryService },
         { type: KeyService },
         { type: EncryptionService },
-        { type: KeyGraphService },
         { type: PasswordService }
     ]; };
     var templateObject_1$h, templateObject_2$c, templateObject_3$b, templateObject_4$7, templateObject_5$6;
@@ -9314,22 +9275,22 @@
     var ReactivatePlanMutation = gqlTyped(templateObject_9$3 || (templateObject_9$3 = __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$j, templateObject_2$e, templateObject_3$d, templateObject_4$9, templateObject_5$8, templateObject_6$5, templateObject_7$4, templateObject_8$4, templateObject_9$3;
 
-    exports.Plan2Service = /** @class */ (function (_super) {
-        __extends(Plan2Service, _super);
-        function Plan2Service(ngZone, injector) {
+    exports.PlanService = /** @class */ (function (_super) {
+        __extends(PlanService, _super);
+        function PlanService(ngZone, injector) {
             var _this = _super.call(this, injector) || this;
             _this.ngZone = ngZone;
             _this.injector = injector;
             return _this;
         }
-        Plan2Service.prototype.initiateStripePaymentMethodCapture = function () {
+        PlanService.prototype.initiateStripePaymentMethodCapture = function () {
             return this.mutate(this.initiateStripePaymentMethodCaptureMutation());
         };
         /**
          * Starts a stripe payment capture intent. On intent can only add one card.
          * @returns Promise that resolves to a mutation
          */
-        Plan2Service.prototype.initiateStripePaymentMethodCaptureMutation = function () {
+        PlanService.prototype.initiateStripePaymentMethodCaptureMutation = function () {
             return new LrMutation({
                 mutation: InitiateStripePaymentMethodCaptureMutation,
                 variables: {
@@ -9337,7 +9298,7 @@
                 },
             });
         };
-        Plan2Service.prototype.completeStripePaymentMethodCapture = function (stripeIntentId) {
+        PlanService.prototype.completeStripePaymentMethodCapture = function (stripeIntentId) {
             return this.mutate(this.completeStripePaymentMethodCaptureMutation(stripeIntentId));
         };
         /**
@@ -9348,7 +9309,7 @@
          *
          * @returns Promise that resolves to a mutation with the just created PaymentMethodNode
          */
-        Plan2Service.prototype.completeStripePaymentMethodCaptureMutation = function (stripeIntentId) {
+        PlanService.prototype.completeStripePaymentMethodCaptureMutation = function (stripeIntentId) {
             return new LrMutation({
                 mutation: CompleteStripePaymentMethodCaptureMutation,
                 variables: {
@@ -9356,7 +9317,7 @@
                 },
             });
         };
-        Plan2Service.prototype.setDefaultPaymentMethod = function (paymentMethodId) {
+        PlanService.prototype.setDefaultPaymentMethod = function (paymentMethodId) {
             return this.mutate(this.setDefaultPaymentMethodMutation(paymentMethodId));
         };
         /**
@@ -9365,7 +9326,7 @@
          * @param paymentMethodId The id from PaymentMethodNode
          * @returns Promise that resolves to a mutation
          */
-        Plan2Service.prototype.setDefaultPaymentMethodMutation = function (paymentMethodId) {
+        PlanService.prototype.setDefaultPaymentMethodMutation = function (paymentMethodId) {
             return new LrMutation({
                 mutation: SetDefaultPaymentMethodMutation,
                 variables: {
@@ -9375,7 +9336,7 @@
                 },
             });
         };
-        Plan2Service.prototype.removeDefaultPaymentMethod = function () {
+        PlanService.prototype.removeDefaultPaymentMethod = function () {
             return this.mutate(this.removeDefaultPaymentMethodMutation());
         };
         /**
@@ -9383,7 +9344,7 @@
          *
          * @returns Promise that resolves to a mutation
          */
-        Plan2Service.prototype.removeDefaultPaymentMethodMutation = function () {
+        PlanService.prototype.removeDefaultPaymentMethodMutation = function () {
             return new LrMutation({
                 mutation: RemoveDefaultPaymentMethodMutation,
                 variables: {
@@ -9391,7 +9352,7 @@
                 },
             });
         };
-        Plan2Service.prototype.issuePlan = function (options) {
+        PlanService.prototype.issuePlan = function (options) {
             return this.mutate(this.issuePlanMutation(options));
         };
         /**
@@ -9403,7 +9364,7 @@
          * @param options.promotionalCode promotion code where applicable
          * @returns Promise that resolves to a mutation
          */
-        Plan2Service.prototype.issuePlanMutation = function (options) {
+        PlanService.prototype.issuePlanMutation = function (options) {
             return new LrMutation({
                 mutation: IssuePlanMutation,
                 variables: {
@@ -9411,7 +9372,7 @@
                 },
             });
         };
-        Plan2Service.prototype.removePaymentMethod = function (paymentMethodId) {
+        PlanService.prototype.removePaymentMethod = function (paymentMethodId) {
             return this.mutate(this.removePaymentMethodMutation(paymentMethodId));
         };
         /**
@@ -9420,7 +9381,7 @@
          * @param paymentMethodId The id from PaymentMethodNode
          * @returns Promise that resolves to a mutation
          */
-        Plan2Service.prototype.removePaymentMethodMutation = function (paymentMethodId) {
+        PlanService.prototype.removePaymentMethodMutation = function (paymentMethodId) {
             return new LrMutation({
                 mutation: RemovePaymentMethodMutation,
                 variables: {
@@ -9430,7 +9391,7 @@
                 },
             });
         };
-        Plan2Service.prototype.cancelPlan = function (options) {
+        PlanService.prototype.cancelPlan = function (options) {
             return this.mutate(this.cancelPlanMutation(options));
         };
         /**
@@ -9440,7 +9401,7 @@
          * @param options.immediate If true, cancel plan effective immediately. Default false.
          * @returns Promise that resolves to a mutation
          */
-        Plan2Service.prototype.cancelPlanMutation = function (options) {
+        PlanService.prototype.cancelPlanMutation = function (options) {
             return new LrMutation({
                 mutation: CancelPlanMutation,
                 variables: {
@@ -9448,7 +9409,7 @@
                 },
             });
         };
-        Plan2Service.prototype.changePriceOption = function (options) {
+        PlanService.prototype.changePriceOption = function (options) {
             return this.mutate(this.changePriceOptionMutation(options));
         };
         /**
@@ -9458,7 +9419,7 @@
          * @param options.priceId The priceId from PriceOptionField (eg. inside AvailablePlanField)
          * @returns Promise that resolves to a mutation
          */
-        Plan2Service.prototype.changePriceOptionMutation = function (options) {
+        PlanService.prototype.changePriceOptionMutation = function (options) {
             return new LrMutation({
                 mutation: ChangePriceOptionMutation,
                 variables: {
@@ -9466,7 +9427,7 @@
                 },
             });
         };
-        Plan2Service.prototype.reactivatePlan = function (planId) {
+        PlanService.prototype.reactivatePlan = function (planId) {
             return this.mutate(this.reactivatePlanMutation(planId));
         };
         /**
@@ -9475,7 +9436,7 @@
          * @param options.planId The id from IssuedPlanNode
          * @returns Promise that resolves to a mutation
          */
-        Plan2Service.prototype.reactivatePlanMutation = function (planId) {
+        PlanService.prototype.reactivatePlanMutation = function (planId) {
             return new LrMutation({
                 mutation: ReactivatePlanMutation,
                 variables: {
@@ -9483,23 +9444,23 @@
                 },
             });
         };
-        return Plan2Service;
+        return PlanService;
     }(LrService));
-    exports.Plan2Service.ɵprov = i0.ɵɵdefineInjectable({ factory: function Plan2Service_Factory() { return new exports.Plan2Service(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR)); }, token: exports.Plan2Service, providedIn: "root" });
-    exports.Plan2Service.decorators = [
+    exports.PlanService.ɵprov = i0.ɵɵdefineInjectable({ factory: function PlanService_Factory() { return new exports.PlanService(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR)); }, token: exports.PlanService, providedIn: "root" });
+    exports.PlanService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
-    exports.Plan2Service.ctorParameters = function () { return [
+    exports.PlanService.ctorParameters = function () { return [
         { type: i0.NgZone },
         { type: i0.Injector }
     ]; };
-    exports.Plan2Service = __decorate([
+    exports.PlanService = __decorate([
         RunOutsideAngular({
             ngZoneName: 'ngZone',
         })
-    ], exports.Plan2Service);
+    ], exports.PlanService);
 
     var ContactFields;
     (function (ContactFields) {
@@ -10107,6 +10068,12 @@
         { type: PasswordService }
     ]; };
 
+    var RegisterResult = /** @class */ (function () {
+        function RegisterResult() {
+        }
+        return RegisterResult;
+    }());
+
     var CreateReminderMutation = gqlTyped(templateObject_1$k || (templateObject_1$k = __makeTemplateObject(["\nmutation CreateReminderMutation($input: CreateReminderInput!) {\n  createReminder(input: $input) {\n    reminder {\n      id\n    }\n  }\n}\n"], ["\nmutation CreateReminderMutation($input: CreateReminderInput!) {\n  createReminder(input: $input) {\n    reminder {\n      id\n    }\n  }\n}\n"])));
     var UpdateReminderMutation = gqlTyped(templateObject_2$f || (templateObject_2$f = __makeTemplateObject(["\nmutation UpdateReminderMutation($input: UpdateReminderInput!) {\n  updateReminder(input: $input) {\n    reminder {\n      id\n    }\n  }\n}\n"], ["\nmutation UpdateReminderMutation($input: UpdateReminderInput!) {\n  updateReminder(input: $input) {\n    reminder {\n      id\n    }\n  }\n}\n"])));
     var DeleteReminderMutation = gqlTyped(templateObject_3$e || (templateObject_3$e = __makeTemplateObject(["\nmutation DeleteReminderMutation($input: DeleteReminderInput!) {\n  deleteReminder(input: $input) {\n    id\n  }\n}\n"], ["\nmutation DeleteReminderMutation($input: DeleteReminderInput!) {\n  deleteReminder(input: $input) {\n    id\n  }\n}\n"])));
@@ -10199,6 +10166,18 @@
         })
     ], exports.ReminderService);
 
+    var CreateScenarioMutation = gqlTyped(templateObject_1$l || (templateObject_1$l = __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$g || (templateObject_2$g = __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$f || (templateObject_3$f = __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$a || (templateObject_4$a = __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$9 || (templateObject_5$9 = __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"])));
+    var RejectScenarioClaimMutation = gqlTyped(templateObject_6$6 || (templateObject_6$6 = __makeTemplateObject(["\nmutation RejectScenarioClaimMutation($input: RejectScenarioClaimInput!) {\n  rejectScenarioClaim(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}\n"], ["\nmutation RejectScenarioClaimMutation($input: RejectScenarioClaimInput!) {\n  rejectScenarioClaim(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}\n"])));
+    var ApproveScenarioClaimMutation = gqlTyped(templateObject_7$5 || (templateObject_7$5 = __makeTemplateObject(["\nmutation ApproveScenarioClaimMutation($input: ApproveScenarioClaimInput!) {\n  approveScenarioClaim(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}\n"], ["\nmutation ApproveScenarioClaimMutation($input: ApproveScenarioClaimInput!) {\n  approveScenarioClaim(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}\n"])));
+    var ReceiveScenarioClaimMutation = gqlTyped(templateObject_8$5 || (templateObject_8$5 = __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$4 || (templateObject_9$4 = __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$1 || (templateObject_10$1 = __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$l, templateObject_2$g, templateObject_3$f, templateObject_4$a, templateObject_5$9, templateObject_6$6, templateObject_7$5, templateObject_8$5, templateObject_9$4, templateObject_10$1;
+
     var SCENARIO_SLIP39_PASSPHRASE = 'lifeready';
 
     exports.ɵm = /** @class */ (function (_super) {
@@ -10231,18 +10210,6 @@
         })
     ], exports.ɵm);
 
-    var CreateScenarioMutation = gqlTyped(templateObject_1$l || (templateObject_1$l = __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$g || (templateObject_2$g = __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$f || (templateObject_3$f = __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$a || (templateObject_4$a = __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$9 || (templateObject_5$9 = __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"])));
-    var RejectScenarioClaimMutation = gqlTyped(templateObject_6$6 || (templateObject_6$6 = __makeTemplateObject(["\nmutation RejectScenarioClaimMutation($input: RejectScenarioClaimInput!) {\n  rejectScenarioClaim(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}\n"], ["\nmutation RejectScenarioClaimMutation($input: RejectScenarioClaimInput!) {\n  rejectScenarioClaim(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}\n"])));
-    var ApproveScenarioClaimMutation = gqlTyped(templateObject_7$5 || (templateObject_7$5 = __makeTemplateObject(["\nmutation ApproveScenarioClaimMutation($input: ApproveScenarioClaimInput!) {\n  approveScenarioClaim(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}\n"], ["\nmutation ApproveScenarioClaimMutation($input: ApproveScenarioClaimInput!) {\n  approveScenarioClaim(input: $input) {\n    claimApprover {\n      id\n    }\n  }\n}\n"])));
-    var ReceiveScenarioClaimMutation = gqlTyped(templateObject_8$5 || (templateObject_8$5 = __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$4 || (templateObject_9$4 = __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$2 || (templateObject_10$2 = __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$l, templateObject_2$g, templateObject_3$f, templateObject_4$a, templateObject_5$9, templateObject_6$6, templateObject_7$5, templateObject_8$5, templateObject_9$4, templateObject_10$2;
-
     var ScenarioQuery = gqlTyped(templateObject_1$m || (templateObject_1$m = __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$h || (templateObject_2$h = __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$m, templateObject_2$h;
@@ -10255,12 +10222,12 @@
     }
     exports.ScenarioService = /** @class */ (function (_super) {
         __extends(ScenarioService, _super);
-        function ScenarioService(ngZone, injector, keyGraph, item2Service, assemblyController, encryptionService) {
+        function ScenarioService(ngZone, injector, keyGraph, itemService, assemblyController, encryptionService) {
             var _this = _super.call(this, injector) || this;
             _this.ngZone = ngZone;
             _this.injector = injector;
             _this.keyGraph = keyGraph;
-            _this.item2Service = item2Service;
+            _this.itemService = itemService;
             _this.assemblyController = assemblyController;
             _this.encryptionService = encryptionService;
             _this.prepareAddReceiverDirectory = _this.prepareReceiverDirectory;
@@ -10720,7 +10687,7 @@
                 var directoryKey, sharedCipherData, wrappedItemKey;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.item2Service.getDirectoryKey(options.directoryId, options.directoryKeyId)];
+                        case 0: return [4 /*yield*/, this.itemService.getDirectoryKey(options.directoryId, options.directoryKeyId)];
                         case 1:
                             directoryKey = _a.sent();
                             return [4 /*yield*/, this.keyGraph.encryptToString(receiverSharedKey, options.sharedCipherDataClearJson || '')];
@@ -11071,7 +11038,7 @@
         return ScenarioService;
     }(LrService));
     exports.ScenarioService.SLIP39_PASSPHRASE = 'lifeready';
-    exports.ScenarioService.ɵprov = i0.ɵɵdefineInjectable({ factory: function ScenarioService_Factory() { return new exports.ScenarioService(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(exports.Item2Service), i0.ɵɵinject(exports.ɵm), i0.ɵɵinject(EncryptionService)); }, token: exports.ScenarioService, providedIn: "root" });
+    exports.ScenarioService.ɵprov = i0.ɵɵdefineInjectable({ factory: function ScenarioService_Factory() { return new exports.ScenarioService(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(exports.ItemService), i0.ɵɵinject(exports.ɵm), i0.ɵɵinject(EncryptionService)); }, token: exports.ScenarioService, providedIn: "root" });
     exports.ScenarioService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -11081,7 +11048,7 @@
         { type: i0.NgZone },
         { type: i0.Injector },
         { type: KeyGraphService },
-        { type: exports.Item2Service },
+        { type: exports.ItemService },
         { type: exports.ɵm },
         { type: EncryptionService }
     ]; };
@@ -11793,23 +11760,23 @@
     var TpCurrentUserSharedKeyQuery = gqlTyped(templateObject_1$r || (templateObject_1$r = __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$r;
 
-    exports.TrustedParty2Service = /** @class */ (function (_super) {
-        __extends(TrustedParty2Service, _super);
-        function TrustedParty2Service(ngZone, injector, keyGraph, item2Service, keyService, keyFactory, encryptionService) {
+    exports.TrustedPartyService = /** @class */ (function (_super) {
+        __extends(TrustedPartyService, _super);
+        function TrustedPartyService(ngZone, injector, keyGraph, itemService, keyService, keyFactory, encryptionService) {
             var _this = _super.call(this, injector) || this;
             _this.ngZone = ngZone;
             _this.injector = injector;
             _this.keyGraph = keyGraph;
-            _this.item2Service = item2Service;
+            _this.itemService = itemService;
             _this.keyService = keyService;
             _this.keyFactory = keyFactory;
             _this.encryptionService = encryptionService;
             return _this;
         }
-        TrustedParty2Service.prototype.deleteTp = function (tpId) {
+        TrustedPartyService.prototype.deleteTp = function (tpId) {
             return this.mutate(this.deleteTpMutation(tpId));
         };
-        TrustedParty2Service.prototype.deleteTpMutation = function (tpId) {
+        TrustedPartyService.prototype.deleteTpMutation = function (tpId) {
             return new LrMutation({
                 mutation: DeleteTpMutation,
                 variables: {
@@ -11819,35 +11786,35 @@
                 },
             });
         };
-        TrustedParty2Service.prototype.shareDirectory = function (options) {
+        TrustedPartyService.prototype.shareDirectory = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, this.mutate(this.shareDirectoryMutation(options))];
                 });
             });
         };
-        TrustedParty2Service.prototype.shareDirectoryMutation = function (options) {
+        TrustedPartyService.prototype.shareDirectoryMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, this.shareItemMutation(Object.assign(Object.assign({}, options), { isDirectory: true }))];
                 });
             });
         };
-        TrustedParty2Service.prototype.shareFile = function (options) {
+        TrustedPartyService.prototype.shareFile = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, this.mutate(this.shareFileMutation(options))];
                 });
             });
         };
-        TrustedParty2Service.prototype.shareFileMutation = function (options) {
+        TrustedPartyService.prototype.shareFileMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, this.shareItemMutation(Object.assign(Object.assign({}, options), { isDirectory: false }))];
                 });
             });
         };
-        TrustedParty2Service.prototype.shareItemMutation = function (_a) {
+        TrustedPartyService.prototype.shareItemMutation = function (_a) {
             var itemId = _a.itemId, itemKeyId = _a.itemKeyId, tpId = _a.tpId, tpSharedKeyId = _a.tpSharedKeyId, accessRole = _a.accessRole, isDirectory = _a.isDirectory;
             return __awaiter(this, void 0, void 0, function () {
                 var itemKey, wrappingKey, wrappedKey;
@@ -11855,8 +11822,8 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0: return [4 /*yield*/, this.keyGraph.getKey(itemKeyId, function () { return isDirectory
-                                ? _this.item2Service.getDirectoryKeyId(itemId)
-                                : _this.item2Service.getFileKeyId(itemId); })];
+                                ? _this.itemService.getDirectoryKeyId(itemId)
+                                : _this.itemService.getFileKeyId(itemId); })];
                         case 1:
                             itemKey = _a.sent();
                             return [4 /*yield*/, this.keyGraph.getKey(tpSharedKeyId, function () { return _this.getTpCurrentUserSharedKey(tpId).then(function (res) { return res.sharedKey.id; }); })];
@@ -11882,35 +11849,35 @@
                 });
             });
         };
-        TrustedParty2Service.prototype.unshareDirectory = function (options) {
+        TrustedPartyService.prototype.unshareDirectory = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, this.mutate(this.unshareDirectoryMutation(options))];
                 });
             });
         };
-        TrustedParty2Service.prototype.unshareDirectoryMutation = function (options) {
+        TrustedPartyService.prototype.unshareDirectoryMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, this.unshareItemMutation(Object.assign(Object.assign({}, options), { isDirectory: true }))];
                 });
             });
         };
-        TrustedParty2Service.prototype.unshareFile = function (options) {
+        TrustedPartyService.prototype.unshareFile = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, this.mutate(this.unshareFileMutation(options))];
                 });
             });
         };
-        TrustedParty2Service.prototype.unshareFileMutation = function (options) {
+        TrustedPartyService.prototype.unshareFileMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, this.unshareItemMutation(Object.assign(Object.assign({}, options), { isDirectory: false }))];
                 });
             });
         };
-        TrustedParty2Service.prototype.unshareItemMutation = function (_a) {
+        TrustedPartyService.prototype.unshareItemMutation = function (_a) {
             var itemId = _a.itemId, tpId = _a.tpId, isDirectory = _a.isDirectory;
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
@@ -11926,7 +11893,7 @@
                 });
             });
         };
-        TrustedParty2Service.prototype.requestMkReshareMutation = function (tpId) {
+        TrustedPartyService.prototype.requestMkReshareMutation = function (tpId) {
             return __awaiter(this, void 0, void 0, function () {
                 var userSharedKey, masterKey, prk, mkWrappedMkPrk, sharedKey, mkReshareRequestCipher;
                 return __generator(this, function (_a) {
@@ -11970,7 +11937,7 @@
                 });
             });
         };
-        TrustedParty2Service.prototype.respondMkReshare = function (tpId) {
+        TrustedPartyService.prototype.respondMkReshare = function (tpId) {
             return __awaiter(this, void 0, void 0, function () {
                 var userSharedKey, sharedKey, plainMkReshareRequestCipher, pbk, mkSharedKey, plainMkReshareResponseCipher, mkReshareResponseCipher, _a, _b, _c;
                 return __generator(this, function (_d) {
@@ -12019,7 +11986,7 @@
                 });
             });
         };
-        TrustedParty2Service.prototype.completeMkReshare = function (tpId) {
+        TrustedPartyService.prototype.completeMkReshare = function (tpId) {
             return __awaiter(this, void 0, void 0, function () {
                 var userSharedKey, sharedKey, prk, plainMkReshareResponseCipher, _a, _b, _c, mkSharedKey, _d, masterKey, mkWrappedMkSharedKey;
                 return __generator(this, function (_e) {
@@ -12070,7 +12037,7 @@
         // Helpers
         // ------------------------------------------------------------------------------------
         // ------------------------------------------------------------------------------------
-        TrustedParty2Service.prototype.getTpCurrentUserSharedKey = function (tpId) {
+        TrustedPartyService.prototype.getTpCurrentUserSharedKey = function (tpId) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -12085,28 +12052,28 @@
                 });
             });
         };
-        return TrustedParty2Service;
+        return TrustedPartyService;
     }(LrService));
-    exports.TrustedParty2Service.ɵprov = i0.ɵɵdefineInjectable({ factory: function TrustedParty2Service_Factory() { return new exports.TrustedParty2Service(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(exports.Item2Service), i0.ɵɵinject(KeyService), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(EncryptionService)); }, token: exports.TrustedParty2Service, providedIn: "root" });
-    exports.TrustedParty2Service.decorators = [
+    exports.TrustedPartyService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TrustedPartyService_Factory() { return new exports.TrustedPartyService(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(KeyGraphService), i0.ɵɵinject(exports.ItemService), i0.ɵɵinject(KeyService), i0.ɵɵinject(KeyFactoryService), i0.ɵɵinject(EncryptionService)); }, token: exports.TrustedPartyService, providedIn: "root" });
+    exports.TrustedPartyService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
-    exports.TrustedParty2Service.ctorParameters = function () { return [
+    exports.TrustedPartyService.ctorParameters = function () { return [
         { type: i0.NgZone },
         { type: i0.Injector },
         { type: KeyGraphService },
-        { type: exports.Item2Service },
+        { type: exports.ItemService },
         { type: KeyService },
         { type: KeyFactoryService },
         { type: EncryptionService }
     ]; };
-    exports.TrustedParty2Service = __decorate([
+    exports.TrustedPartyService = __decorate([
         RunOutsideAngular({
             ngZoneName: 'ngZone',
         })
-    ], exports.TrustedParty2Service);
+    ], exports.TrustedPartyService);
 
     var TwoFactorService = /** @class */ (function () {
         function TwoFactorService(auth) {
@@ -12326,25 +12293,53 @@
 
     exports.ApiContactCard = ApiContactCard;
     exports.ApiCurrentUser = ApiCurrentUser;
-    exports.AuthTypes = auth2_types;
+    exports.ApproveScenarioClaimMutation = ApproveScenarioClaimMutation;
+    exports.ApproveTpPasswordResetRequestMutation = ApproveTpPasswordResetRequestMutation;
+    exports.ArchiveDirectoryMutation = ArchiveDirectoryMutation;
+    exports.ArchiveFileMutation = ArchiveFileMutation;
+    exports.BeginDeleteChildItemLinksWindowMutation = BeginDeleteChildItemLinksWindowMutation;
+    exports.CancelKeyExchangeMutation = CancelKeyExchangeMutation;
+    exports.CancelScenarioClaimMutation = CancelScenarioClaimMutation;
+    exports.CancelTpPasswordResetRequestMutation = CancelTpPasswordResetRequestMutation;
     exports.CancelUserDeleteMutation = CancelUserDeleteMutation;
+    exports.ChangeDirectoryParentsMutation = ChangeDirectoryParentsMutation;
+    exports.ChangeFileParentsMutation = ChangeFileParentsMutation;
+    exports.CompleteKeyExchangeOtkMutation = CompleteKeyExchangeOtkMutation;
+    exports.CompleteTpPasswordResetRequestMutation = CompleteTpPasswordResetRequestMutation;
     exports.ContactCardAddress = ContactCardAddress;
     exports.ContactCardName = ContactCardName;
     exports.ContactCardsQuery = ContactCardsQuery;
     exports.CreateContactCardMutation = CreateContactCardMutation$1;
+    exports.CreateDirectoryMutation = CreateDirectoryMutation;
+    exports.CreateFileMutation = CreateFileMutation;
     exports.CreateFileQuery = CreateFileQuery;
     exports.CreateLbopQuery = CreateLbopQuery;
+    exports.CreateScenarioClaimMutation = CreateScenarioClaimMutation;
+    exports.CreateScenarioMutation = CreateScenarioMutation;
+    exports.CreateTpAssemblyKeyChallengeMutation = CreateTpAssemblyKeyChallengeMutation;
+    exports.CreateTpPasswordResetMutation = CreateTpPasswordResetMutation;
     exports.CurrentUserKey = CurrentUserKey;
     exports.CurrentUserQuery = CurrentUserQuery;
+    exports.CurrentUserSharedKeyQuery2 = CurrentUserSharedKeyQuery2;
+    exports.DebugExpireScenarioClaimMutation = DebugExpireScenarioClaimMutation;
+    exports.DebugExpireTpPasswordResetRequestMutation = DebugExpireTpPasswordResetRequestMutation;
+    exports.DeclineKeyExchangeMutation = DeclineKeyExchangeMutation;
     exports.DefaultProcessorOptions = DefaultProcessorOptions;
+    exports.DeleteDirectoryMutation = DeleteDirectoryMutation;
+    exports.DeleteFileMutation = DeleteFileMutation;
     exports.DeleteLbopQuery = DeleteLbopQuery;
+    exports.DeleteScenarioMutation = DeleteScenarioMutation;
+    exports.DeleteTpPasswordResetMutation = DeleteTpPasswordResetMutation;
     exports.DirectoryQuery = DirectoryQuery;
     exports.ERROR_SOURCE = ERROR_SOURCE;
     exports.Features = Features;
     exports.FetchKeyGraphField = FetchKeyGraphField;
     exports.FileQuery = FileQuery;
     exports.FileUploadService = FileUploadService;
+    exports.GetOwnedContactCardKeyIdsQuery = GetOwnedContactCardKeyIdsQuery;
+    exports.GetReceivedContactCardKeyIdQuery = GetReceivedContactCardKeyIdQuery;
     exports.IdleService = IdleService;
+    exports.InitiateKeyExchangeOtkMutation = InitiateKeyExchangeOtkMutation;
     exports.KC_CONFIG = KC_CONFIG;
     exports.KcAuthException = KcAuthException;
     exports.KcBadArgumentException = KcBadArgumentException;
@@ -12364,6 +12359,9 @@
     exports.KcSuspiciousOperationException = KcSuspiciousOperationException;
     exports.KcUnsupportedException = KcUnsupportedException;
     exports.KeyExchangeFields = KeyExchangeFields;
+    exports.KeyExchangeQuery2 = KeyExchangeQuery2;
+    exports.KeyExchangeTokenQuery2 = KeyExchangeTokenQuery2;
+    exports.KeyExchangesQuery2 = KeyExchangesQuery2;
     exports.KeyGraphField = KeyGraphField;
     exports.KeyGraphFragment = KeyGraphFragment;
     exports.LbopQuery = LbopQuery;
@@ -12383,28 +12381,45 @@
     exports.MoveDirectoryQuery = MoveDirectoryQuery;
     exports.MoveFileQuery = MoveFileQuery;
     exports.OwnerPlainDataJson = OwnerPlainDataJson;
-    exports.PassIdpApiResult = PassIdpApiResult;
     exports.PasswordCheck = PasswordCheck;
     exports.PasswordService = PasswordService;
     exports.PersistService = PersistService;
+    exports.PreCompleteTpPasswordResetRequestMutation = PreCompleteTpPasswordResetRequestMutation;
     exports.ProfileDetailsService = ProfileDetailsService;
     exports.ProfileService = ProfileService;
+    exports.ReceiveScenarioClaimMutation = ReceiveScenarioClaimMutation;
+    exports.RegisterResult = RegisterResult;
     exports.RegisterService = RegisterService;
+    exports.RejectScenarioClaimMutation = RejectScenarioClaimMutation;
+    exports.RejectTpPasswordResetRequestMutation = RejectTpPasswordResetRequestMutation;
     exports.RequestUserDeleteMutation = RequestUserDeleteMutation;
+    exports.RespondKeyExchangeOtkMutation = RespondKeyExchangeOtkMutation;
+    exports.RevertFileMutation = RevertFileMutation;
     exports.RevertFileQuery = RevertFileQuery;
     exports.ServerTimeQuery = ServerTimeQuery;
+    exports.SetDirectoryConfidentialMutation = SetDirectoryConfidentialMutation;
+    exports.SetFileConfidentialMutation = SetFileConfidentialMutation;
     exports.SharedTrustedPartyDetails = SharedTrustedPartyDetails;
     exports.SharedVaultFeature = SharedVaultFeature;
     exports.TPFeatures = TPFeatures;
+    exports.TempDirectoryQuery = TempDirectoryQuery;
     exports.TimeService = TimeService;
     exports.TrustedPartiesQuery = TrustedPartiesQuery;
     exports.TrustedParty = TrustedParty;
     exports.TrustedPartyDetails = TrustedPartyDetails;
     exports.TrustedPartyProperties = TrustedPartyProperties;
     exports.TwoFactorService = TwoFactorService;
+    exports.UnarchiveDirectoryMutation = UnarchiveDirectoryMutation;
+    exports.UnarchiveFileMutation = UnarchiveFileMutation;
     exports.UpdateContactCardMutation = UpdateContactCardMutation$1;
+    exports.UpdateDirectoryMutation = UpdateDirectoryMutation;
+    exports.UpdateFileMutation = UpdateFileMutation;
     exports.UpdateFileQuery = UpdateFileQuery;
     exports.UpdateLbopQuery = UpdateLbopQuery;
+    exports.UpdateOwnedContactCardMutation = UpdateOwnedContactCardMutation;
+    exports.UpdateReceivedContactCardMutation = UpdateReceivedContactCardMutation;
+    exports.UpdateScenarioMutation = UpdateScenarioMutation;
+    exports.UpdateTpPasswordResetMutation = UpdateTpPasswordResetMutation;
     exports.UserService = UserService;
     exports.UserSharedKeyFields = UserSharedKeyFields;
     exports.WebCryptoService = WebCryptoService;