@lifeready/core 8.0.16 → 9.0.2

package/bundles/lifeready-core.umd.js

@@ -665,16 +665,13 @@
             });
         });
     }
-    function assert_xor(options) {
+    function assertExactlyOne(options) {
         var keys = Object.keys(options);
-        if (keys.length != 2) {
-            throw new KcBadLogicException('You must provide exactly 2 fields in the argument.');
+        if (keys.length < 2) {
+            throw new KcBadLogicException('You must provide 2 or more fields in the argument.');
         }
-        if (options[keys[0]] != null && options[keys[1]] != null) {
-            throw new KcBadLogicException("You can not specify both " + keys[0] + " and " + keys[1]);
-        }
-        if (options[keys[0]] == null && options[keys[1]] == null) {
-            throw new KcBadLogicException("You must specify either " + keys[0] + " and " + keys[1]);
+        if (keys.filter(function (key) { return options[key] != null; }).length != 1) {
+            throw new KcBadLogicException("You must provide exactly one argument that != null.");
         }
     }
 
@@ -3831,6 +3828,20 @@
     function mapEdges(connection) {
         return connection.edges.map(function (edge) { return edge.node; });
     }
+    function toIdKeyPair(t) {
+        if (t === undefined) {
+            return undefined;
+        }
+        else if (t === null) {
+            return null;
+        }
+        else {
+            return {
+                id: t.id,
+                keyId: t.keyId,
+            };
+        }
+    }
     (function (UserDeleteState) {
         UserDeleteState["REQUESTED"] = "REQUESTED";
     })(exports.UserDeleteState || (exports.UserDeleteState = {}));
@@ -7233,8 +7244,8 @@
     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 ChangeDirectoryParentsMutation = gqlTyped(templateObject_12 || (templateObject_12 = __makeTemplateObject(["\nmutation ChangeDirectoryParentsMutation($input: ChangeDirectoryParentsInput!) {\n  changeDirectoryParents(input: $input) {\n    directory {\n      id\n      keyId\n    }\n  }\n}\n"], ["\nmutation ChangeDirectoryParentsMutation($input: ChangeDirectoryParentsInput!) {\n  changeDirectoryParents(input: $input) {\n    directory {\n      id\n      keyId\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      keyId\n    }\n  }\n}\n"], ["\nmutation ChangeFileParentsMutation($input: ChangeFileParentsInput!) {\n  changeFileParents(input: $input) {\n    file {\n      id\n      keyId\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"])));
@@ -7789,8 +7800,7 @@
                                     cipherMetaClearJson: options.cipherMetaClearJson,
                                     parentDirectories: [
                                         {
-                                            directoryId: tempDir.id,
-                                            wrappingKeyId: tempDir.keyId,
+                                            directory: tempDir,
                                         },
                                     ],
                                     plainMetaJson: options.plainMetaJson,
@@ -7851,8 +7861,7 @@
                             _d.sent();
                             return [4 /*yield*/, this.createFile(Object.assign(Object.assign({}, options), { parentDirectories: [
                                         {
-                                            directoryId: tempDir.id,
-                                            wrappingKeyId: tempDir.keyId,
+                                            directory: tempDir,
                                         },
                                     ] }))];
                         case 3:
@@ -7869,8 +7878,7 @@
                             // TODO return the server time where delete is scheduled. Expirable mutation
                             // Return the mutation that moves the directory into the dst directories
                             return [2 /*return*/, this.changeFileParentsMutation({
-                                    fileId: file.id,
-                                    fileKeyId: file.keyId,
+                                    file: file,
                                     parentsToRemove: [tempDir.id],
                                     parentsToAdd: options.parentDirectories,
                                 })];
@@ -7929,24 +7937,25 @@
         // ------------------------------------------------------------------------------
         ItemService.prototype.prepareParentDirectory = function (options, newKey) {
             return __awaiter(this, void 0, void 0, function () {
-                var directoryId, linkType, wrappingKeyId, wrappingKey, _d;
+                var _directoryId, _wrappingKeyId, linkType, directory, wrappingKey, _d;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
-                            directoryId = options.directoryId, linkType = options.linkType, wrappingKeyId = options.wrappingKeyId;
+                            _directoryId = options.directoryId, _wrappingKeyId = options.wrappingKeyId, linkType = options.linkType;
+                            directory = options.directory || {
+                                id: _directoryId,
+                                keyId: _wrappingKeyId,
+                            };
                             if (!(linkType == exports.LinkTypeField.REFERENCE)) return [3 /*break*/, 1];
-                            if (wrappingKeyId) {
-                                throw new KcBadArgumentException('Do not specify wrappingKeyId when link type is REFERENCE.');
-                            }
                             return [2 /*return*/, {
-                                    directoryId: directoryId,
+                                    directoryId: directory.id,
                                     linkType: linkType,
                                 }];
-                        case 1: return [4 /*yield*/, this.getDirectoryKey(directoryId, wrappingKeyId)];
+                        case 1: return [4 /*yield*/, this.getDirectoryKey(directory.id, directory.keyId)];
                         case 2:
                             wrappingKey = _e.sent();
                             _d = {
-                                directoryId: directoryId,
+                                directoryId: directory.id,
                                 wrappingKeyId: wrappingKey.id
                             };
                             return [4 /*yield*/, this.keyGraph.wrapKey(wrappingKey, newKey)];
@@ -8157,32 +8166,42 @@
         };
         ItemService.prototype.prepareChangeDirectoryParents = function (options) {
             return __awaiter(this, void 0, void 0, function () {
-                var directoryKey, input;
+                var directory, directoryKey, input;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
-                        case 0: return [4 /*yield*/, this.getDirectoryKey(options.directoryId, options.directoryKeyId)];
+                        case 0:
+                            directory = options.directory || {
+                                id: options.directoryId,
+                                keyId: options.directoryKeyId,
+                            };
+                            return [4 /*yield*/, this.getDirectoryKey(directory.id, directory.keyId)];
                         case 1:
                             directoryKey = _d.sent();
                             return [4 /*yield*/, this.prepareChangeItemParents(options, directoryKey.jwk)];
                         case 2:
                             input = _d.sent();
-                            return [2 /*return*/, Object.assign(Object.assign({}, input), { directoryId: options.directoryId })];
+                            return [2 /*return*/, Object.assign(Object.assign({}, input), { directoryId: directory.id })];
                     }
                 });
             });
         };
         ItemService.prototype.prepareChangeFileParents = function (options) {
             return __awaiter(this, void 0, void 0, function () {
-                var fileKey, input;
+                var file, fileKey, input;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
-                        case 0: return [4 /*yield*/, this.getFileKey(options.fileId, options.fileKeyId)];
+                        case 0:
+                            file = options.file || {
+                                id: options.fileId,
+                                keyId: options.fileKeyId,
+                            };
+                            return [4 /*yield*/, this.getFileKey(file.id, file.keyId)];
                         case 1:
                             fileKey = _d.sent();
                             return [4 /*yield*/, this.prepareChangeItemParents(options, fileKey.jwk)];
                         case 2:
                             input = _d.sent();
-                            return [2 /*return*/, Object.assign(Object.assign({}, input), { fileId: options.fileId })];
+                            return [2 /*return*/, Object.assign(Object.assign({}, input), { fileId: file.id })];
                     }
                 });
             });
@@ -10929,7 +10948,7 @@
                     switch (_a.label) {
                         case 0:
                             receiverItemOptions = options.receiverItemOptions, receiverSharedKey = options.receiverSharedKey, assemblyKey = options.assemblyKey, directory = options.directory, file = options.file;
-                            assert_xor({ directory: directory, file: file });
+                            assertExactlyOne({ directory: directory, file: file });
                             accessRole = receiverItemOptions.accessRole;
                             if (!(accessRole == exports.AccessRoleChoice.DENY)) return [3 /*break*/, 1];
                             ret = {
@@ -12221,20 +12240,24 @@
         };
         TrustedPartyService.prototype.prepareCreateItemShareMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
-                var itemId, itemKeyId, tpId, tpSharedKeyId, accessRole, isDirectory, shareType, plainMetaJson, plainMeta, itemKey, wrappingKey, wrappedItemKey;
+                var _itemId, _itemKeyId, tpId, tpSharedKeyId, accessRole, isDirectory, shareType, plainMetaJson, item, plainMeta, itemKey, wrappingKey, wrappedItemKey;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            itemId = options.itemId, itemKeyId = options.itemKeyId, tpId = options.tpId, tpSharedKeyId = options.tpSharedKeyId, accessRole = options.accessRole, isDirectory = options.isDirectory, shareType = options.shareType, plainMetaJson = options.plainMetaJson;
+                            _itemId = options.itemId, _itemKeyId = options.itemKeyId, tpId = options.tpId, tpSharedKeyId = options.tpSharedKeyId, accessRole = options.accessRole, isDirectory = options.isDirectory, shareType = options.shareType, plainMetaJson = options.plainMetaJson;
+                            item = options.item || {
+                                id: _itemId,
+                                keyId: _itemKeyId,
+                            };
                             plainMeta = plainMetaJson && JSON.stringify(plainMetaJson);
                             if (accessRole == exports.AccessRoleChoice.DENY) {
-                                if (itemKeyId || tpSharedKeyId) {
+                                if (item.keyId || tpSharedKeyId) {
                                     throw new KcBadArgumentException('If accessRole is AccessRoleChoice.DENY, must not specify any of itemId, itemKeyId, or tpSharedKeyId parameters');
                                 }
                                 return [2 /*return*/, {
                                         input: {
-                                            itemId: itemId,
+                                            itemId: item.id,
                                             tpId: tpId,
                                             accessRole: accessRole,
                                             itemKeyId: null,
@@ -12245,9 +12268,9 @@
                                         },
                                     }];
                             }
-                            return [4 /*yield*/, this.keyGraph.getKey(itemKeyId, function () { return isDirectory
-                                    ? _this.itemService.getDirectoryKeyId(itemId)
-                                    : _this.itemService.getFileKeyId(itemId); })];
+                            return [4 /*yield*/, this.keyGraph.getKey(item.keyId, function () { return isDirectory
+                                    ? _this.itemService.getDirectoryKeyId(item.id)
+                                    : _this.itemService.getFileKeyId(item.id); })];
                         case 1:
                             itemKey = _a.sent();
                             return [4 /*yield*/, this.keyGraph.getKey(tpSharedKeyId, function () { return _this.getTpCurrentUserSharedKey(tpId).then(function (res) { return res.sharedKey.id; }); })];
@@ -12258,7 +12281,7 @@
                             wrappedItemKey = _a.sent();
                             return [2 /*return*/, {
                                     input: {
-                                        itemId: itemId,
+                                        itemId: item.id,
                                         tpId: tpId,
                                         accessRole: accessRole,
                                         itemKeyId: itemKey.id,
@@ -12386,16 +12409,20 @@
         };
         TrustedPartyService.prototype.prepareUpdateItemShareMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
-                var itemShareId, accessRole, isDirectory, itemId, itemKeyId, tpId, tpSharedKeyId, plainMetaJson, plainMeta, itemShare, getItemShare, itemKey, wrappingKey, wrappedItemKey;
+                var itemShareId, accessRole, isDirectory, _itemId, _itemKeyId, tpId, tpSharedKeyId, plainMetaJson, item, plainMeta, itemShare, getItemShare, itemKey, wrappingKey, wrappedItemKey;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            itemShareId = options.itemShareId, accessRole = options.accessRole, isDirectory = options.isDirectory, itemId = options.itemId, itemKeyId = options.itemKeyId, tpId = options.tpId, tpSharedKeyId = options.tpSharedKeyId, plainMetaJson = options.plainMetaJson;
+                            itemShareId = options.itemShareId, accessRole = options.accessRole, isDirectory = options.isDirectory, _itemId = options.itemId, _itemKeyId = options.itemKeyId, tpId = options.tpId, tpSharedKeyId = options.tpSharedKeyId, plainMetaJson = options.plainMetaJson;
+                            item = options.item || {
+                                id: _itemId,
+                                keyId: _itemKeyId,
+                            };
                             plainMeta = plainMetaJson && JSON.stringify(plainMetaJson);
                             // If not updating access role or updating to DENY role, then we don't need any key material.
                             if (accessRole == null || accessRole == exports.AccessRoleChoice.DENY) {
-                                if (itemId || itemKeyId || tpId || tpSharedKeyId) {
+                                if (item.id || item.keyId || tpId || tpSharedKeyId) {
                                     throw new KcBadArgumentException('If accessRole is AccessRoleChoice.DENY, must not specify any of itemId, itemKeyId, tpId, or tpSharedKeyId parameters');
                                 }
                                 return [2 /*return*/, {
@@ -12430,12 +12457,12 @@
                                     }
                                 });
                             }); };
-                            return [4 /*yield*/, this.keyGraph.getKey(itemKeyId, function () { return __awaiter(_this, void 0, void 0, function () {
+                            return [4 /*yield*/, this.keyGraph.getKey(item.keyId, function () { return __awaiter(_this, void 0, void 0, function () {
                                     var itemId_, _a;
                                     return __generator(this, function (_b) {
                                         switch (_b.label) {
                                             case 0:
-                                                _a = itemId;
+                                                _a = item.id;
                                                 if (_a) return [3 /*break*/, 2];
                                                 return [4 /*yield*/, getItemShare()];
                                             case 1:
@@ -13162,6 +13189,7 @@
     exports.processConnection = processConnection;
     exports.throwClaimIdMismatch = throwClaimIdMismatch;
     exports.throwClaimNotApproved = throwClaimNotApproved;
+    exports.toIdKeyPair = toIdKeyPair;
     exports.ɵa = KeyGraphService;
     exports.ɵb = EncryptionService;
     exports.ɵc = KeyService;