@lifeready/core 7.2.3 → 8.0.2

package/fesm2015/lifeready-core.js

@@ -1383,6 +1383,19 @@ class KeyGraphService {
             else {
                 nextRawKey = yield this.encryptionService.decrypt(wrappingKey, wrappedKey);
             }
+            // Handle nested keys. i.e. Enc{K1}{K2}{K3}(raw key 4), where:
+            //   K1: link.wrappingKey
+            //   K2: link.nestedWrappingKey[0]
+            //   K3: link.nestedWrappingKey[1]
+            if (link.type == KeyGraphEdgeType.KeyLink) {
+                const data = link.data;
+                if (data.nestedWrappingKeyIds) {
+                    for (const nestedWrappingKeyId of data.nestedWrappingKeyIds) {
+                        const key = yield this.getKey(nestedWrappingKeyId);
+                        nextRawKey = yield this.encryptionService.decrypt(key.jwk, nextRawKey);
+                    }
+                }
+            }
             dstKey.jwk = yield KeyFactoryService.asKey(nextRawKey);
             dstKey.task = null;
         });
@@ -1586,6 +1599,7 @@ const KeyGraphFragmentBase = `
   keyLinks {
     keyId
     wrappingKeyId
+    nestedWrappingKeyIds
     wrappedKey
   }
   passKeys {
@@ -1604,51 +1618,6 @@ fragment KeyGraphFragment on KeyGraphType ${KeyGraphFragmentBase}
 `;
 const KeyGraphField = `keyGraph ${KeyGraphFragmentBase}`;
 const FetchKeyGraphField = `keyGraph: fetchKeyGraph ${KeyGraphFragmentBase}`;
-const FileQuery = gql `
-  query File($id: LrRelayIdInput!, $cachedKeyIds: [LrRelayIdInput!]) {
-    file(id: $id) {
-      id
-      keyId
-      currentVersion {
-        id
-        operation
-        state {
-          keyId
-          plainMeta
-          cipherMeta
-          contentResource
-        }
-      }
-      versions {
-        edges {
-          node {
-            id
-            state {
-              keyId
-              plainMeta
-              cipherMeta
-              contentResource
-            }
-          }
-        }
-      }
-      parentDirectoryLinks {
-        edges {
-          node {
-            parentDirectory {
-              id
-              plainMeta
-            }
-          }
-        }
-      }
-    }
-    keyGraph(cachedKeyIds: $cachedKeyIds) {
-      ...KeyGraphFragment
-    }
-  }
-  ${KeyGraphFragment}
-`;
 const DirectoryQuery = gql `
   query Directory($id: LrRelayIdInput!, $cachedKeyIds: [LrRelayIdInput!]) {
     directory(id: $id) {
@@ -1663,109 +1632,6 @@ const DirectoryQuery = gql `
   }
   ${KeyGraphFragment}
 `;
-const CreateFileQuery = gql `
-  mutation CreateFile($input: CreateFileInput!) {
-    createFile(input: $input) {
-      file {
-        id
-      }
-    }
-  }
-`;
-const UpdateFileQuery = gql `
-  mutation UpdateFile($input: UpdateFileInput!) {
-    updateFile(input: $input) {
-      file {
-        id
-        currentVersion {
-          id
-          state {
-            id
-          }
-        }
-      }
-    }
-  }
-`;
-const RevertFileQuery = gql `
-  mutation RevertFile($input: RevertFileInput!) {
-    revertFile(input: $input) {
-      file {
-        id
-        currentVersion {
-          id
-          state {
-            id
-          }
-        }
-      }
-    }
-  }
-`;
-const MoveFileQuery = gql `
-  mutation MoveFile(
-    $fileId: LrRelayIdInput!
-    $fromParentDirectoryId: LrRelayIdInput!
-    $toParentDirectoryId: LrRelayIdInput!
-    $wrappingKeyId: LrRelayIdInput!
-    $wrappedKey: String!
-  ) {
-    moveFile(
-      input: {
-        fileId: $fileId
-        fromParentDirectoryId: $fromParentDirectoryId
-        toParentDirectoryId: $toParentDirectoryId
-        wrappingKeyId: $wrappingKeyId
-        wrappedKey: $wrappedKey
-      }
-    ) {
-      file {
-        id
-        parentDirectoryLinks {
-          edges {
-            node {
-              parentDirectory {
-                plainMeta
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-`;
-const MoveDirectoryQuery = gql `
-  mutation MoveDirectory(
-    $directoryId: LrRelayIdInput!
-    $fromParentDirectoryId: LrRelayIdInput
-    $toParentDirectoryId: LrRelayIdInput!
-    $wrappedKey: String!
-    $wrappingKeyId: LrRelayIdInput!
-  ) {
-    moveDirectory(
-      input: {
-        directoryId: $directoryId
-        fromParentDirectoryId: $fromParentDirectoryId
-        toParentDirectoryId: $toParentDirectoryId
-        wrappedKey: $wrappedKey
-        wrappingKeyId: $wrappingKeyId
-      }
-    ) {
-      directory {
-        id
-        parentDirectoryLinks {
-          edges {
-            node {
-              parentDirectory {
-                plainMeta
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-`;
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /**
@@ -1936,7 +1802,7 @@ let TpPasswordResetProcessorService = class TpPasswordResetProcessorService {
         this.ngZone = ngZone;
         this.keyGraph = keyGraph;
     }
-    processTpPasswordResetUserNode(node) {
+    processTpPasswordResetUser(node) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const pxk = ((_a = node.pxk) === null || _a === void 0 ? void 0 : _a.id) && (yield this.keyGraph.getKey(node.pxk.id));
@@ -2415,7 +2281,9 @@ class LrMutation extends LrMutationBase {
         const mutationNode = getMutation(mutationDoc);
         const fragmentMap = {};
         getFragments(fragments).forEach((fragment) => {
-            fragmentMap[fragment.name.value] = fragment;
+            // Using '_' as the delimiter for the dummy suffix which only serves to make fragment names
+            // unique since apollo client demands unique fragment names.
+            fragmentMap[fragment.name.value.split('_')[0]] = fragment;
         });
         const replaceFieldSelection = (selection) => {
             const field = selection;
@@ -2428,7 +2296,7 @@ class LrMutation extends LrMutationBase {
             // a fragment using the same name as the mutation field.
             // We will also rename the fragment to the same name.
             field.selectionSet.selections = [
-                Object.assign(Object.assign({}, fragmentSpreadAstSelection), { name: name(fieldName) }),
+                Object.assign(Object.assign({}, fragmentSpreadAstSelection), { name: name(fragment.name.value) }),
             ];
         };
         mutationNode.selectionSet.selections.forEach((selection) => {
@@ -2838,16 +2706,16 @@ var PlanState;
     PlanState["ENABLED"] = "ENABLED";
     PlanState["DISABLED"] = "DISABLED";
 })(PlanState || (PlanState = {}));
-var TpShareTypeChoice;
-(function (TpShareTypeChoice) {
-    TpShareTypeChoice["TP"] = "TP";
-    TpShareTypeChoice["DETACHED"] = "DETACHED";
-})(TpShareTypeChoice || (TpShareTypeChoice = {}));
-var TpDetachedShareStateChoice;
-(function (TpDetachedShareStateChoice) {
-    TpDetachedShareStateChoice["IN_PROGRESS"] = "IN_PROGRESS";
-    TpDetachedShareStateChoice["COMPLETED"] = "COMPLETED";
-})(TpDetachedShareStateChoice || (TpDetachedShareStateChoice = {}));
+var ShareTypeChoice;
+(function (ShareTypeChoice) {
+    ShareTypeChoice["TP"] = "TP";
+    ShareTypeChoice["DETACHED"] = "DETACHED";
+})(ShareTypeChoice || (ShareTypeChoice = {}));
+var DetachedShareStateChoice;
+(function (DetachedShareStateChoice) {
+    DetachedShareStateChoice["IN_PROGRESS"] = "IN_PROGRESS";
+    DetachedShareStateChoice["COMPLETED"] = "COMPLETED";
+})(DetachedShareStateChoice || (DetachedShareStateChoice = {}));
 var AccessRoleChoice;
 (function (AccessRoleChoice) {
     AccessRoleChoice["READER"] = "READER";
@@ -2977,11 +2845,6 @@ var LinkTypeField;
     LinkTypeField["HARD"] = "HARD";
     LinkTypeField["SOFT"] = "SOFT";
 })(LinkTypeField || (LinkTypeField = {}));
-var BillingPeriodField;
-(function (BillingPeriodField) {
-    BillingPeriodField["MONTHLY"] = "MONTHLY";
-    BillingPeriodField["ANNUAL"] = "ANNUAL";
-})(BillingPeriodField || (BillingPeriodField = {}));
 var PlanStateField;
 (function (PlanStateField) {
     PlanStateField["TRIALLING"] = "TRIALLING";
@@ -5114,8 +4977,6 @@ var RecoveryStatus;
     RecoveryStatus["NEW_PASSWORD"] = "NEW_PASSWORD";
     RecoveryStatus["OLD_PASSWORD"] = "OLD_PASSWORD";
 })(RecoveryStatus || (RecoveryStatus = {}));
-// TODO restrict this type
-// export type AuthResetUser = TpPasswordResetUserNode;
 var PasswordChangeStatus;
 (function (PasswordChangeStatus) {
     PasswordChangeStatus["IN_PROGRESS"] = "IN_PROGRESS";
@@ -5480,9 +5341,10 @@ let AuthService = AuthService_1 = class AuthService extends LrService {
             });
             // Regular user populates all keys
             yield this.keyGraphService.populateKeys(currentUser.currentUserKey);
-            const { username } = currentUser;
+            const { id, username } = currentUser;
             const userAttributes = yield this.cognito.userAttributes(cognitoUser);
             return {
+                id,
                 username,
                 sub: this.getCognitoUserAttribute('sub', userAttributes),
                 loginEmail: this.getCognitoUserAttribute('email', userAttributes),
@@ -5634,7 +5496,7 @@ let AuthService = AuthService_1 = class AuthService extends LrService {
     debugLoadUser(password) {
         return __awaiter(this, void 0, void 0, function* () {
             const currentUser = yield this.fetchCurrentUser();
-            const { username, currentUserKey } = currentUser;
+            const { id, username, currentUserKey } = currentUser;
             // Debug mode can not deal with session encryption key yet.
             // NO SESSION ENCRYPTION KEY.
             const passKey = (yield this.keyFactoryService.derivePassKey(Object.assign({ password }, currentUserKey.passKey.passKeyParams))).jwk;
@@ -5642,6 +5504,7 @@ let AuthService = AuthService_1 = class AuthService extends LrService {
             yield this.idleService.persistMasterKey(masterKey);
             yield this.keyGraphService.populateKeys(currentUserKey);
             this.user = {
+                id,
                 username,
                 resetUser: null,
                 sub: 'DEBUG_MODE',
@@ -6141,18 +6004,18 @@ query FileKeyQuery($id: LrRelayIdInput!) {
   }
 }
 `;
-const DirectoryKeyFromSharedDirectoryQuery = gqlTyped `
-query DirectoryKeyFromSharedDirectoryQuery($id: LrRelayIdInput!) {
-  tpSharedDirectory(id: $id) {
+const DirectoryKeyFromDirectoryShareQuery = gqlTyped `
+query DirectoryKeyFromDirectoryShareQuery($id: LrRelayIdInput!) {
+  directoryShare(id: $id) {
     item {
       keyId
     }
   }
 }
 `;
-const FileKeyFromSharedFileQuery = gqlTyped `
-query FileKeyFromSharedFileQuery($id: LrRelayIdInput!) {
-  tpSharedFile(id: $id) {
+const FileKeyFromFileShareQuery = gqlTyped `
+query FileKeyFromFileShareQuery($id: LrRelayIdInput!) {
+  fileShare(id: $id) {
     item {
       keyId
     }
@@ -6212,24 +6075,24 @@ let ItemService = ItemService_1 = class ItemService extends LrService {
             })).file.keyId;
         });
     }
-    getDirectoryKeyIdFromSharedDirectory(sharedDirectoryId) {
+    getDirectoryKeyIdFromDirectoryShare(directoryShareId) {
         return __awaiter(this, void 0, void 0, function* () {
             return (yield this.query({
-                query: DirectoryKeyFromSharedDirectoryQuery,
+                query: DirectoryKeyFromDirectoryShareQuery,
                 variables: {
-                    id: sharedDirectoryId,
+                    id: directoryShareId,
                 },
-            })).tpSharedDirectory.item.keyId;
+            })).directoryShare.item.keyId;
         });
     }
-    getFileKeyIdFromSharedFile(sharedFileId) {
+    getFileKeyIdFromFileShare(fileShareId) {
         return __awaiter(this, void 0, void 0, function* () {
             return (yield this.query({
-                query: FileKeyFromSharedFileQuery,
+                query: FileKeyFromFileShareQuery,
                 variables: {
-                    id: sharedFileId,
+                    id: fileShareId,
                 },
-            })).tpSharedFile.item.keyId;
+            })).fileShare.item.keyId;
         });
     }
     getDirectoryKey(directoryId, directoryKeyId) {
@@ -8706,36 +8569,38 @@ query ScenarioQuery(
             id
           }
           sharedCipherData
-          receiverDirectories {
-            edges {
-              node {
-                id
-                sharedCipherData
-                sharedKey {
-                  id
-                }
-                accessRole
-                itemKey {
-                  id
-                }
-                directory {
+          receiverItems {
+            receiverDirectories {
+              edges {
+                node {
                   id
-                  keyId
+                  sharedCipherData
+                  sharedKey {
+                    id
+                  }
+                  accessRole
+                  itemKey {
+                    id
+                  }
+                  directory {
+                    id
+                    keyId
+                  }
                 }
               }
             }
-          }
-          receiverFiles {
-            edges {
-              node {
-                id
-                sharedCipherData
-                sharedKey {
-                  id
-                }
-                accessRole
-                itemKey {
+            receiverFiles {
+              edges {
+                node {
                   id
+                  sharedCipherData
+                  sharedKey {
+                    id
+                  }
+                  accessRole
+                  itemKey {
+                    id
+                  }
                 }
               }
             }
@@ -8767,11 +8632,13 @@ query SharedScenarioQuery($scenarioId: LrRelayIdInput!) {
       pbk {
         id
       }
-      receiverDirectories {
-        edges {
-          node {
-            id
-            wrappedItemKey
+      receiverItems {
+        receiverDirectories {
+          edges {
+            node {
+              id
+              wrappedItemKey
+            }
           }
         }
       }
@@ -8820,6 +8687,7 @@ query SharedScenarioQuery($scenarioId: LrRelayIdInput!) {
       }
       asClaimReceiver {
         received
+        assemblyKeyId
         approvals {
           edges {
             node {
@@ -8993,15 +8861,15 @@ let ScenarioService = class ScenarioService extends LrService {
     }
     receiveClaim(scenarioId, sharedClaimId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.mutate(this.receiveClaimMutation(scenarioId, sharedClaimId));
+            return this.mutate(this.receiveClaim2Mutation(scenarioId, sharedClaimId));
         });
     }
-    receiveClaimMutation(scenarioId, sharedClaimId) {
+    receiveClaim2Mutation(scenarioId, sharedClaimId) {
         return __awaiter(this, void 0, void 0, function* () {
             return new LrMutation({
                 mutation: ReceiveScenarioClaimMutation,
                 variables: {
-                    input: yield this.prepareClaim(scenarioId, sharedClaimId),
+                    input: yield this.prepareReceiveClaim2(scenarioId, sharedClaimId),
                 },
             });
         });
@@ -9152,8 +9020,6 @@ let ScenarioService = class ScenarioService extends LrService {
             const directoryKey = yield this.itemService.getDirectoryKey(options.directoryId, options.directoryKeyId);
             const sharedCipherData = yield this.keyGraph.encryptToString(receiverSharedKey, options.sharedCipherDataClearJson || '');
             let wrappedItemKey = yield this.keyGraph.encryptToString(receiverSharedKey, directoryKey.jwk.toJSON(true));
-            // TODO fetch assemblyKeyId. We are changing it such that there is always an assembly
-            // before receivers can be added.
             wrappedItemKey = yield this.keyGraph.encryptToString(assemblyKey, wrappedItemKey);
             return {
                 directoryId: options.directoryId,
@@ -9177,7 +9043,7 @@ let ScenarioService = class ScenarioService extends LrService {
             const deleteDirectoriesOptions = options.deleteDirectories || [];
             const updateDirectoriesOptions = options.updateDirectories || [];
             // Fill in any missing update directories
-            mapEdges(existingReceiver.receiverDirectories).forEach((existingDirectory) => {
+            mapEdges(existingReceiver.receiverItems.receiverDirectories).forEach((existingDirectory) => {
                 if (deleteDirectoriesOptions.includes(existingDirectory.directory.id)) {
                     return;
                 }
@@ -9200,7 +9066,7 @@ let ScenarioService = class ScenarioService extends LrService {
     }
     prepareExistingReceiver(existingReceiver, assemblyKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            const updateDirectories = mapEdges(existingReceiver.receiverDirectories).map((receiverDirectory) => ({
+            const updateDirectories = mapEdges(existingReceiver.receiverItems.receiverDirectories).map((receiverDirectory) => ({
                 directoryId: receiverDirectory.directory.id,
                 directoryKeyId: receiverDirectory.directory.keyId,
                 accessRole: receiverDirectory.accessRole,
@@ -9259,7 +9125,29 @@ let ScenarioService = class ScenarioService extends LrService {
             return mutationInput;
         });
     }
-    prepareClaim(scenarioId, sharedClaimId) {
+    prepareReceiveClaim2(scenarioId, sharedClaimId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Get all the shared items
+            const sharedScenario = (yield this.getSharedScenario(scenarioId, sharedClaimId)).sharedScenario;
+            if (sharedScenario.state !== ScenarioState.APPROVED) {
+                throwClaimNotApproved();
+            }
+            const approvals = mapEdges(sharedScenario.sharedClaim.asClaimReceiver.approvals);
+            const assemblyKey = yield this.recoverAssemblyKey(approvals);
+            // Wrap assembly key with shared key.
+            //???
+            // This sharedKey is created just for this scenario. It's wrapped by the tpSharedKey.
+            const sharedKey = yield this.keyGraph.getKey(sharedScenario.asReceiver.sharedKey.id);
+            const sharedKeyWrappedAssemblyKey = yield this.keyGraph.encryptToString(sharedKey, assemblyKey.toJSON(true));
+            return {
+                scenarioClaimId: sharedClaimId,
+                sharedKeyWrappedAssemblyKey,
+                sharedKeyId: sharedKey.id,
+                assemblyKeyId: sharedScenario.sharedClaim.asClaimReceiver.assemblyKeyId,
+            };
+        });
+    }
+    prepareReceiveClaim(scenarioId, sharedClaimId) {
         return __awaiter(this, void 0, void 0, function* () {
             // Get all the shared items
             const sharedScenario = (yield this.getSharedScenario(scenarioId, sharedClaimId)).sharedScenario;
@@ -9269,12 +9157,14 @@ let ScenarioService = class ScenarioService extends LrService {
             const approvals = mapEdges(sharedScenario.sharedClaim.asClaimReceiver.approvals);
             const assemblyKey = yield this.recoverAssemblyKey(approvals);
             // Decrypt all items
-            const receiverDirectories = yield Promise.all(sharedScenario.asReceiver.receiverDirectories.edges
+            const receiverDirectories = yield Promise.all(sharedScenario.asReceiver.receiverItems.receiverDirectories.edges
                 .map((edge) => edge.node)
                 .map((receiverDirectory) => __awaiter(this, void 0, void 0, function* () {
                 const wrappedItemKey = yield this.encryptionService.decrypt(assemblyKey, receiverDirectory.wrappedItemKey);
                 return {
                     receiverDirectoryId: receiverDirectory.id,
+                    // Looks like receiverDirectory.wrappedItemKey has no other content in side it except a wrapped key.
+                    // So we can turn this in to a doubly wrapped key and just release the assembly key.
                     receiverSharedKeyWrappedItemKey: wrappedItemKey,
                 };
             })));
@@ -10088,7 +9978,7 @@ mutation DeleteTpMutation($input: DeleteTpInput!) {
 const ShareDirectoryMutation = gqlTyped `
   mutation ShareDirectoryMutation($input: ShareDirectoryInput!) {
     shareDirectory(input: $input) {
-      tpSharedDirectory {
+      directoryShare {
         id
       }
     }
@@ -10097,7 +9987,7 @@ const ShareDirectoryMutation = gqlTyped `
 const UnshareDirectoryMutation = gqlTyped `
   mutation UnshareDirectoryMutation($input: UnshareDirectoryInput!) {
     unshareDirectory(input: $input) {
-      tpSharedDirectory {
+      directoryShare {
         id
       }
     }
@@ -10106,7 +9996,7 @@ const UnshareDirectoryMutation = gqlTyped `
 const ShareFileMutation = gqlTyped `
   mutation ShareFileMutation($input: ShareFileInput!) {
     shareFile(input: $input) {
-      tpSharedFile {
+      fileShare {
         id
       }
     }
@@ -10115,75 +10005,75 @@ const ShareFileMutation = gqlTyped `
 const UnshareFileMutation = gqlTyped `
   mutation UnshareFileMutation($input: UnshareFileInput!) {
     unshareFile(input: $input) {
-      tpSharedFile {
+      fileShare {
         id
       }
     }
   }
 `;
-const CreateSharedDirectoryMutation = gqlTyped `
-mutation CreateSharedDirectoryMutation($input: CreateSharedDirectoryInput!) {
-  createSharedDirectory(input: $input) {
-    tpSharedDirectory {
+const CreateDirectoryShareMutation = gqlTyped `
+mutation CreateDirectoryShareMutation($input: CreateDirectoryShareInput!) {
+  createDirectoryShare(input: $input) {
+    directoryShare {
       id
     }
   }
 }
 `;
-const CreateSharedFileMutation = gqlTyped `
-mutation CreateSharedFileMutation($input: CreateSharedFileInput!) {
-  createSharedFile(input: $input) {
-    tpSharedFile {
+const CreateFileShareMutation = gqlTyped `
+mutation CreateFileShareMutation($input: CreateFileShareInput!) {
+  createFileShare(input: $input) {
+    fileShare {
       id
     }
   }
 }
 `;
-const UpdateSharedDirectoryMutation = gqlTyped `
-mutation UpdateSharedDirectoryMutation($input: UpdateSharedDirectoryInput!) {
-  updateSharedDirectory(input: $input) {
-    tpSharedDirectory {
+const UpdateDirectoryShareMutation = gqlTyped `
+mutation UpdateDirectoryShareMutation($input: UpdateDirectoryShareInput!) {
+  updateDirectoryShare(input: $input) {
+    directoryShare {
       id
     }
   }
 }
 `;
-const UpdateSharedFileMutation = gqlTyped `
-mutation UpdateSharedFileMutation($input: UpdateSharedFileInput!) {
-  updateSharedFile(input: $input) {
-    tpSharedFile {
+const UpdateFileShareMutation = gqlTyped `
+mutation UpdateFileShareMutation($input: UpdateFileShareInput!) {
+  updateFileShare(input: $input) {
+    fileShare {
       id
     }
   }
 }
 `;
-const DeleteSharedDirectoryMutation = gqlTyped `
-mutation DeleteSharedDirectoryMutation($input: DeleteSharedDirectoryInput!) {
-  deleteSharedDirectory(input: $input) {
+const DeleteDirectoryShareMutation = gqlTyped `
+mutation DeleteDirectoryShareMutation($input: DeleteDirectoryShareInput!) {
+  deleteDirectoryShare(input: $input) {
     id
   }
 }
 `;
-const DeleteSharedFileMutation = gqlTyped `
-mutation DeleteSharedFileMutation($input: DeleteSharedFileInput!) {
-  deleteSharedFile(input: $input) {
+const DeleteFileShareMutation = gqlTyped `
+mutation DeleteFileShareMutation($input: DeleteFileShareInput!) {
+  deleteFileShare(input: $input) {
     id
   }
 }
 `;
-const CompleteDetachedSharedDirectoryMutation = gqlTyped `
-mutation CompleteDetachedSharedDirectoryMutation($input: CompleteDetachedSharedDirectoryInput!) {
-  completeDetachedSharedDirectory(input: $input) {
-    tpSharedDirectory {
+const CompleteDetachedDirectoryShareMutation = gqlTyped `
+mutation CompleteDetachedDirectoryShareMutation($input: CompleteDetachedDirectoryShareInput!) {
+  completeDetachedDirectoryShare(input: $input) {
+    directoryShare {
       id
     }
   }
 }
 `;
-const CompleteDetachedSharedFileMutation = gqlTyped `
-mutation CompleteDetachedSharedFileMutation($input: CompleteDetachedSharedFileInput!) {
-  completeDetachedSharedFile(input: $input) {
-    tpSharedFile {
+const CompleteDetachedFileShareMutation = gqlTyped `
+mutation CompleteDetachedFileShareMutation($input: CompleteDetachedFileShareInput!) {
+  completeDetachedFileShare(input: $input) {
+    fileShare {
       id
     }
   }
@@ -10336,28 +10226,28 @@ let TrustedPartyService = class TrustedPartyService extends LrService {
             });
         });
     }
-    createSharedDirectory(options) {
+    createDirectoryShare(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.mutate(this.createSharedDirectoryMutation(options));
+            return this.mutate(this.createDirectoryShareMutation(options));
         });
     }
-    createSharedDirectoryMutation(options) {
+    createDirectoryShareMutation(options) {
         return __awaiter(this, void 0, void 0, function* () {
             return new LrMutation({
-                mutation: CreateSharedDirectoryMutation,
+                mutation: CreateDirectoryShareMutation,
                 variables: yield this.prepareCreateSharedItemMutation(Object.assign(Object.assign({}, options), { isDirectory: true })),
             });
         });
     }
-    createSharedFile(options) {
+    createFileShare(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.mutate(this.createSharedFileMutation(options));
+            return this.mutate(this.createFileShareMutation(options));
         });
     }
-    createSharedFileMutation(options) {
+    createFileShareMutation(options) {
         return __awaiter(this, void 0, void 0, function* () {
             return new LrMutation({
-                mutation: CreateSharedFileMutation,
+                mutation: CreateFileShareMutation,
                 variables: yield this.prepareCreateSharedItemMutation(Object.assign(Object.assign({}, options), { isDirectory: false })),
             });
         });
@@ -10385,28 +10275,28 @@ let TrustedPartyService = class TrustedPartyService extends LrService {
             };
         });
     }
-    updateSharedDirectory(options) {
+    updateDirectoryShare(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.mutate(this.updateSharedDirectoryMutation(options));
+            return this.mutate(this.updateDirectoryShareMutation(options));
         });
     }
-    updateSharedDirectoryMutation(options) {
+    updateDirectoryShareMutation(options) {
         return __awaiter(this, void 0, void 0, function* () {
             return new LrMutation({
-                mutation: UpdateSharedDirectoryMutation,
+                mutation: UpdateDirectoryShareMutation,
                 variables: this.prepareUpdateSharedItemMutation(options),
             });
         });
     }
-    updateSharedFile(options) {
+    updateFileShare(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.mutate(this.updateSharedFileMutation(options));
+            return this.mutate(this.updateFileShareMutation(options));
         });
     }
-    updateSharedFileMutation(options) {
+    updateFileShareMutation(options) {
         return __awaiter(this, void 0, void 0, function* () {
             return new LrMutation({
-                mutation: UpdateSharedFileMutation,
+                mutation: UpdateFileShareMutation,
                 variables: this.prepareUpdateSharedItemMutation(options),
             });
         });
@@ -10420,15 +10310,15 @@ let TrustedPartyService = class TrustedPartyService extends LrService {
             },
         };
     }
-    deleteSharedDirectory(id) {
+    deleteDirectoryShare(id) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.mutate(this.deleteSharedDirectoryMutation(id));
+            return this.mutate(this.deleteDirectoryShareMutation(id));
         });
     }
-    deleteSharedDirectoryMutation(id) {
+    deleteDirectoryShareMutation(id) {
         return __awaiter(this, void 0, void 0, function* () {
             return new LrMutation({
-                mutation: DeleteSharedDirectoryMutation,
+                mutation: DeleteDirectoryShareMutation,
                 variables: {
                     input: {
                         id,
@@ -10437,28 +10327,28 @@ let TrustedPartyService = class TrustedPartyService extends LrService {
             });
         });
     }
-    completeDetachedSharedDirectory(options) {
+    completeDetachedDirectoryShare(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.mutate(this.completeDetachedSharedDirectoryMutation(options));
+            return this.mutate(this.completeDetachedDirectoryShareMutation(options));
         });
     }
-    completeDetachedSharedDirectoryMutation(options) {
+    completeDetachedDirectoryShareMutation(options) {
         return __awaiter(this, void 0, void 0, function* () {
             return new LrMutation({
-                mutation: CompleteDetachedSharedDirectoryMutation,
+                mutation: CompleteDetachedDirectoryShareMutation,
                 variables: yield this.prepareCompleteDetachedSharedItemMutation(Object.assign(Object.assign({}, options), { isDirectory: true })),
             });
         });
     }
-    completeDetachedSharedFile(options) {
+    completeDetachedFileShare(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.mutate(this.completeDetachedSharedFileMutation(options));
+            return this.mutate(this.completeDetachedFileShareMutation(options));
         });
     }
-    completeDetachedSharedFileMutation(options) {
+    completeDetachedFileShareMutation(options) {
         return __awaiter(this, void 0, void 0, function* () {
             return new LrMutation({
-                mutation: CompleteDetachedSharedFileMutation,
+                mutation: CompleteDetachedFileShareMutation,
                 variables: yield this.prepareCompleteDetachedSharedItemMutation(Object.assign(Object.assign({}, options), { isDirectory: false })),
             });
         });
@@ -10467,8 +10357,8 @@ let TrustedPartyService = class TrustedPartyService extends LrService {
         return __awaiter(this, void 0, void 0, function* () {
             const { sharedItemId, itemKeyId, isDirectory } = options;
             const itemKey = yield this.keyGraph.getKey(itemKeyId, () => isDirectory
-                ? this.itemService.getDirectoryKeyIdFromSharedDirectory(sharedItemId)
-                : this.itemService.getFileKeyIdFromSharedFile(sharedItemId));
+                ? this.itemService.getDirectoryKeyIdFromDirectoryShare(sharedItemId)
+                : this.itemService.getFileKeyIdFromFileShare(sharedItemId));
             const rootKey = this.keyService.currentRootKey;
             const wrappedKey = yield this.keyGraph.wrapKey(rootKey, itemKey.jwk);
             return {
@@ -10760,5 +10650,5 @@ UserService.ctorParameters = () => [
  * Generated bundle index. Do not edit.
  */
 
-export { AccessRoleChoice, AccessRoleChoiceOrder, AccessRoleMethodChoice, ApiContactCard, ApiCurrentUser, ApproveScenarioClaimMutation, ApproveTpPasswordResetRequestMutation, ArchiveDirectoryMutation, ArchiveFileMutation, AuthService, BeginDeleteChildItemLinksWindowMutation, BillingPeriodField, CancelKeyExchangeMutation, CancelScenarioClaimMutation, CancelTpPasswordResetRequestMutation, CancelUserDeleteMutation, ChangeDirectoryParentsMutation, ChangeFileParentsMutation, ClaimApproverState, ClaimState, CognitoChallengeName, CommonProcessorsService, CompleteKeyExchangeOtkMutation, CompleteTpPasswordResetRequestMutation, Config, ContactCard2Service, ContactCardAddress, ContactCardName, ContactCardsQuery, CreateContactCardMutation$1 as CreateContactCardMutation, CreateDirectoryMutation, CreateFileMutation, CreateFileQuery, CreateLbopQuery, CreateScenarioClaimMutation, CreateScenarioMutation, CreateTpAssemblyKeyChallengeMutation, CreateTpPasswordResetMutation, CurrentUserKey, CurrentUserQuery, CurrentUserSharedKeyQuery2, DebugExpireScenarioClaimMutation, DebugExpireTpPasswordResetRequestMutation, DeclineKeyExchangeMutation, DefaultProcessorOptions, DeleteDirectoryMutation, DeleteFileMutation, DeleteLbopQuery, DeleteScenarioMutation, DeleteTpPasswordResetMutation, DirectoryQuery, ERROR_SOURCE, FeatureAction, Features, FetchKeyGraphField, FileOperationField, FileQuery, FileUploadService, GetOwnedContactCardKeyIdsQuery, GetReceivedContactCardKeyIdQuery, IdleService, InitiateKeyExchangeOtkMutation, ItemService, KC_CONFIG, KcAuthException, KcBadArgumentException, KcBadLogicException, KcBadRequestException, KcBadSignatureException, KcBadStateException, KcBadTimeSyncException, KcCodeMismatchException, KcConcurrentAccessException, KcEncryptionException, KcError, KcErrorCode, KcException, KcInternalErrorException, KcLbopErrorCode, KcLockedException, KcNotFoundException, KcSuspiciousOperationException, KcUnsupportedException, KeyExchangeFields, KeyExchangeMode, KeyExchangeOtkState, KeyExchangeQuery2, KeyExchangeService, KeyExchangeState, KeyExchangeTokenQuery2, KeyExchangesQuery2, KeyGraphField, KeyGraphFragment, LbopQuery, LbopService, LbopsQuery, LifeReadyModule, LinkTypeField, LockService, LockState, LoginHistoryQuery, LrApolloService, LrGraphQLService, LrMergedMutation, LrMutation, LrMutationBase, LrService, MainContactCardFields, MainContactCardPlainFields, MainContactCardProperty, MoveDirectoryQuery, MoveFileQuery, NotificationService, OwnerPlainDataJson, PasswordChangeStatus, PasswordCheck, PasswordService, PermissionChoice, PersistService, PlanService, PlanState, PlanStateField, PreCompleteTpPasswordResetRequestMutation, ProfileDetailsService, ProfileService, QueryProcessorService, ReceiveScenarioClaimMutation, RecoveryStatus, RegisterResult, RegisterService, RejectScenarioClaimMutation, RejectTpPasswordResetRequestMutation, ReminderService, RequestUserDeleteMutation, RespondKeyExchangeOtkMutation, RevertFileMutation, RevertFileQuery, ScenarioLastClaimState, ScenarioService, ScenarioState, ServerConfigService, ServerTimeQuery, SetDirectoryConfidentialMutation, SetFileConfidentialMutation, SharedContactCard2Service, SharedTrustedPartyDetails, SharedVaultFeature, TPFeatures, TempDirectoryQuery, TimeService, TpAssemblyState, TpClaimApproverState, TpClaimState, TpDetachedShareStateChoice, TpPasswordResetRequestService, TpPasswordResetService, TpPasswordResetUserService, TpShareTypeChoice, TrustedPartiesQuery, TrustedParty, TrustedPartyDetails, TrustedPartyProperties, TrustedPartyService, TrustedPartyType, TwoFactorService, UnarchiveDirectoryMutation, UnarchiveFileMutation, UpdateContactCardMutation$1 as UpdateContactCardMutation, UpdateDirectoryMutation, UpdateFileMutation, UpdateFileQuery, UpdateLbopQuery, UpdateOwnedContactCardMutation, UpdateReceivedContactCardMutation, UpdateScenarioMutation, UpdateTpPasswordResetMutation, UserDeleteState, UserService, UserSharedKeyFields, WebCryptoService, awsFetch, configureAmplifyAuth, configureApollo, fragmentSpreadAstSelection, gqlTyped, handleApolloError, handleCognitoCallback, httpOptions, mapEdges, processConnection, throwClaimIdMismatch, throwClaimNotApproved, KeyGraphService as ɵa, EncryptionService as ɵb, KeyService as ɵc, KeyFactoryService as ɵd, LrService as ɵe, RunOutsideAngular as ɵf, LrGraphQLService as ɵg, KeyMetaService as ɵh, TpPasswordResetAssemblyController as ɵi, TpAssemblyController as ɵj, SharedContactCardFields as ɵk, SharedContactCardService as ɵl, ScenarioAssemblyController as ɵm, TpPasswordResetPrivateService as ɵn };
+export { AccessRoleChoice, AccessRoleChoiceOrder, AccessRoleMethodChoice, ApiContactCard, ApiCurrentUser, ApproveScenarioClaimMutation, ApproveTpPasswordResetRequestMutation, ArchiveDirectoryMutation, ArchiveFileMutation, AuthService, BeginDeleteChildItemLinksWindowMutation, CancelKeyExchangeMutation, CancelScenarioClaimMutation, CancelTpPasswordResetRequestMutation, CancelUserDeleteMutation, ChangeDirectoryParentsMutation, ChangeFileParentsMutation, ClaimApproverState, ClaimState, CognitoChallengeName, CommonProcessorsService, CompleteKeyExchangeOtkMutation, CompleteTpPasswordResetRequestMutation, Config, ContactCard2Service, ContactCardAddress, ContactCardName, ContactCardsQuery, CreateContactCardMutation$1 as CreateContactCardMutation, CreateDirectoryMutation, CreateFileMutation, CreateLbopQuery, CreateScenarioClaimMutation, CreateScenarioMutation, CreateTpAssemblyKeyChallengeMutation, CreateTpPasswordResetMutation, CurrentUserKey, CurrentUserQuery, CurrentUserSharedKeyQuery2, DebugExpireScenarioClaimMutation, DebugExpireTpPasswordResetRequestMutation, DeclineKeyExchangeMutation, DefaultProcessorOptions, DeleteDirectoryMutation, DeleteFileMutation, DeleteLbopQuery, DeleteScenarioMutation, DeleteTpPasswordResetMutation, DetachedShareStateChoice, DirectoryQuery, ERROR_SOURCE, FeatureAction, Features, FetchKeyGraphField, FileOperationField, FileUploadService, GetOwnedContactCardKeyIdsQuery, GetReceivedContactCardKeyIdQuery, IdleService, InitiateKeyExchangeOtkMutation, ItemService, KC_CONFIG, KcAuthException, KcBadArgumentException, KcBadLogicException, KcBadRequestException, KcBadSignatureException, KcBadStateException, KcBadTimeSyncException, KcCodeMismatchException, KcConcurrentAccessException, KcEncryptionException, KcError, KcErrorCode, KcException, KcInternalErrorException, KcLbopErrorCode, KcLockedException, KcNotFoundException, KcSuspiciousOperationException, KcUnsupportedException, KeyExchangeFields, KeyExchangeMode, KeyExchangeOtkState, KeyExchangeQuery2, KeyExchangeService, KeyExchangeState, KeyExchangeTokenQuery2, KeyExchangesQuery2, KeyGraphField, KeyGraphFragment, LbopQuery, LbopService, LbopsQuery, LifeReadyModule, LinkTypeField, LockService, LockState, LoginHistoryQuery, LrApolloService, LrGraphQLService, LrMergedMutation, LrMutation, LrMutationBase, LrService, MainContactCardFields, MainContactCardPlainFields, MainContactCardProperty, NotificationService, OwnerPlainDataJson, PasswordChangeStatus, PasswordCheck, PasswordService, PermissionChoice, PersistService, PlanService, PlanState, PlanStateField, PreCompleteTpPasswordResetRequestMutation, ProfileDetailsService, ProfileService, QueryProcessorService, ReceiveScenarioClaimMutation, RecoveryStatus, RegisterResult, RegisterService, RejectScenarioClaimMutation, RejectTpPasswordResetRequestMutation, ReminderService, RequestUserDeleteMutation, RespondKeyExchangeOtkMutation, RevertFileMutation, ScenarioLastClaimState, ScenarioService, ScenarioState, ServerConfigService, ServerTimeQuery, SetDirectoryConfidentialMutation, SetFileConfidentialMutation, ShareTypeChoice, SharedContactCard2Service, SharedTrustedPartyDetails, SharedVaultFeature, TPFeatures, TempDirectoryQuery, TimeService, TpAssemblyState, TpClaimApproverState, TpClaimState, TpPasswordResetRequestService, TpPasswordResetService, TpPasswordResetUserService, TrustedPartiesQuery, TrustedParty, TrustedPartyDetails, TrustedPartyProperties, TrustedPartyService, TrustedPartyType, TwoFactorService, UnarchiveDirectoryMutation, UnarchiveFileMutation, UpdateContactCardMutation$1 as UpdateContactCardMutation, UpdateDirectoryMutation, UpdateFileMutation, UpdateLbopQuery, UpdateOwnedContactCardMutation, UpdateReceivedContactCardMutation, UpdateScenarioMutation, UpdateTpPasswordResetMutation, UserDeleteState, UserService, UserSharedKeyFields, WebCryptoService, awsFetch, configureAmplifyAuth, configureApollo, fragmentSpreadAstSelection, gqlTyped, handleApolloError, handleCognitoCallback, httpOptions, mapEdges, processConnection, throwClaimIdMismatch, throwClaimNotApproved, KeyGraphService as ɵa, EncryptionService as ɵb, KeyService as ɵc, KeyFactoryService as ɵd, LrService as ɵe, RunOutsideAngular as ɵf, LrGraphQLService as ɵg, KeyMetaService as ɵh, TpPasswordResetAssemblyController as ɵi, TpAssemblyController as ɵj, SharedContactCardFields as ɵk, SharedContactCardService as ɵl, ScenarioAssemblyController as ɵm, TpPasswordResetPrivateService as ɵn };
 //# sourceMappingURL=lifeready-core.js.map