@lifeready/core 8.0.12 → 8.0.13

package/bundles/lifeready-core.umd.js

@@ -10912,6 +10912,7 @@
                             if (!(accessRole == exports.AccessRoleChoice.DENY)) return [3 /*break*/, 1];
                             ret = {
                                 accessRole: accessRole,
+                                itemKeyId: null,
                                 wrappedItemKey: null,
                                 sharedCipherData: null,
                             };
@@ -10945,6 +10946,7 @@
                             wrappedItemKey = _a.sent();
                             ret = {
                                 accessRole: accessRole,
+                                itemKeyId: itemKey.id,
                                 wrappedItemKey: wrappedItemKey,
                                 sharedCipherData: sharedCipherData,
                             };
@@ -12117,7 +12119,9 @@
     var templateObject_1$q, templateObject_2$k, templateObject_3$h, templateObject_4$d, templateObject_5$b, templateObject_6$6, templateObject_7$5, templateObject_8$5, templateObject_9$5, templateObject_10$2, templateObject_11$1, templateObject_12$1;
 
     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;
+    var DirectoryShareQuery = gqlTyped(templateObject_2$l || (templateObject_2$l = __makeTemplateObject(["\nquery DirectoryShareQuery($id: LrRelayIdInput!) {\n  directoryShare(id: $id) {\n    item {\n      id\n    }\n    tp {\n      id\n    }\n  }\n}\n"], ["\nquery DirectoryShareQuery($id: LrRelayIdInput!) {\n  directoryShare(id: $id) {\n    item {\n      id\n    }\n    tp {\n      id\n    }\n  }\n}\n"])));
+    var FileShareQuery = gqlTyped(templateObject_3$i || (templateObject_3$i = __makeTemplateObject(["\nquery FileShareItemIdQuery($id: LrRelayIdInput!) {\n  fileShare(id: $id) {\n    item {\n      id\n    }\n    tp {\n      id\n    }\n  }\n}\n"], ["\nquery FileShareItemIdQuery($id: LrRelayIdInput!) {\n  fileShare(id: $id) {\n    item {\n      id\n    }\n    tp {\n      id\n    }\n  }\n}\n"])));
+    var templateObject_1$r, templateObject_2$l, templateObject_3$i;
 
     exports.TrustedPartyService = /** @class */ (function (_super) {
         __extends(TrustedPartyService, _super);
@@ -12195,12 +12199,28 @@
         };
         TrustedPartyService.prototype.prepareCreateItemShareMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
-                var itemId, itemKeyId, tpId, tpSharedKeyId, accessRole, isDirectory, shareType, itemKey, wrappingKey, wrappedKey;
+                var itemId, itemKeyId, tpId, tpSharedKeyId, accessRole, isDirectory, shareType, 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;
+                            if (accessRole == exports.AccessRoleChoice.DENY) {
+                                if (itemKeyId || 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,
+                                            tpId: tpId,
+                                            accessRole: accessRole,
+                                            itemKeyId: null,
+                                            wrappingKeyId: null,
+                                            wrappedItemKey: null,
+                                            shareType: shareType,
+                                        },
+                                    }];
+                            }
                             return [4 /*yield*/, this.keyGraph.getKey(itemKeyId, function () { return isDirectory
                                     ? _this.itemService.getDirectoryKeyId(itemId)
                                     : _this.itemService.getFileKeyId(itemId); })];
@@ -12211,15 +12231,15 @@
                             wrappingKey = _a.sent();
                             return [4 /*yield*/, this.keyGraph.wrapKey(wrappingKey, itemKey.jwk)];
                         case 3:
-                            wrappedKey = _a.sent();
+                            wrappedItemKey = _a.sent();
                             return [2 /*return*/, {
                                     input: {
-                                        id: itemId,
+                                        itemId: itemId,
                                         tpId: tpId,
                                         accessRole: accessRole,
-                                        keyId: itemKey.id,
+                                        itemKeyId: itemKey.id,
                                         wrappingKeyId: wrappingKey.id,
-                                        wrappedKey: wrappedKey,
+                                        wrappedItemKey: wrappedItemKey,
                                         shareType: shareType,
                                     },
                                 }];
@@ -12236,11 +12256,18 @@
         };
         TrustedPartyService.prototype.updateDirectoryShareMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    return [2 /*return*/, new LrMutation({
-                            mutation: UpdateDirectoryShareMutation,
-                            variables: this.prepareUpdateItemShareMutation(options),
-                        })];
+                var _a, _b;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            _a = LrMutation.bind;
+                            _b = {
+                                mutation: UpdateDirectoryShareMutation
+                            };
+                            return [4 /*yield*/, this.prepareUpdateItemShareMutation(Object.assign(Object.assign({}, options), { isDirectory: true }))];
+                        case 1: return [2 /*return*/, new (_a.apply(LrMutation, [void 0, (_b.variables = _c.sent(),
+                                    _b)]))()];
+                    }
                 });
             });
         };
@@ -12253,22 +12280,138 @@
         };
         TrustedPartyService.prototype.updateFileShareMutation = function (options) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    return [2 /*return*/, new LrMutation({
-                            mutation: UpdateFileShareMutation,
-                            variables: this.prepareUpdateItemShareMutation(options),
-                        })];
+                var _a, _b;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            _a = LrMutation.bind;
+                            _b = {
+                                mutation: UpdateFileShareMutation
+                            };
+                            return [4 /*yield*/, this.prepareUpdateItemShareMutation(Object.assign(Object.assign({}, options), { isDirectory: false }))];
+                        case 1: return [2 /*return*/, new (_a.apply(LrMutation, [void 0, (_b.variables = _c.sent(),
+                                    _b)]))()];
+                    }
                 });
             });
         };
-        TrustedPartyService.prototype.prepareUpdateItemShareMutation = function (options) {
-            var itemShareId = options.itemShareId, accessRole = options.accessRole;
-            return {
-                input: {
+        TrustedPartyService.prototype.getDirectoryShare = function (itemShareId) {
+            return this.lrGraphQL.query({
+                query: DirectoryShareQuery,
+                variables: {
                     id: itemShareId,
-                    accessRole: accessRole,
                 },
-            };
+            });
+        };
+        TrustedPartyService.prototype.getFileShare = function (itemShareId) {
+            return this.lrGraphQL.query({
+                query: FileShareQuery,
+                variables: {
+                    id: itemShareId,
+                },
+            });
+        };
+        TrustedPartyService.prototype.prepareUpdateItemShareMutation = function (options) {
+            return __awaiter(this, void 0, void 0, function () {
+                var itemShareId, accessRole, isDirectory, itemId, itemKeyId, tpId, tpSharedKeyId, 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;
+                            if (accessRole == exports.AccessRoleChoice.DENY) {
+                                if (itemId || itemKeyId || tpId || tpSharedKeyId) {
+                                    throw new KcBadArgumentException('If accessRole is AccessRoleChoice.DENY, must not specify any of itemId, itemKeyId, tpId, or tpSharedKeyId parameters');
+                                }
+                                return [2 /*return*/, {
+                                        input: {
+                                            id: itemShareId,
+                                            accessRole: accessRole,
+                                            itemKeyId: null,
+                                            wrappingKeyId: null,
+                                            wrappedItemKey: null,
+                                        },
+                                    }];
+                            }
+                            getItemShare = function () { return __awaiter(_this, void 0, void 0, function () {
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            if (!!itemShare) return [3 /*break*/, 4];
+                                            if (!isDirectory) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, this.getDirectoryShare(itemShareId)];
+                                        case 1:
+                                            itemShare = (_a.sent())
+                                                .directoryShare;
+                                            return [3 /*break*/, 4];
+                                        case 2: return [4 /*yield*/, this.getFileShare(itemShareId)];
+                                        case 3:
+                                            itemShare = (_a.sent()).fileShare;
+                                            _a.label = 4;
+                                        case 4: return [2 /*return*/, itemShare];
+                                    }
+                                });
+                            }); };
+                            return [4 /*yield*/, this.keyGraph.getKey(itemKeyId, function () { return __awaiter(_this, void 0, void 0, function () {
+                                    var itemId_, _a;
+                                    return __generator(this, function (_b) {
+                                        switch (_b.label) {
+                                            case 0:
+                                                _a = itemId;
+                                                if (_a) return [3 /*break*/, 2];
+                                                return [4 /*yield*/, getItemShare()];
+                                            case 1:
+                                                _a = (_b.sent()).item.id;
+                                                _b.label = 2;
+                                            case 2:
+                                                itemId_ = _a;
+                                                if (isDirectory) {
+                                                    return [2 /*return*/, this.itemService.getDirectoryKeyId(itemId_)];
+                                                }
+                                                else {
+                                                    return [2 /*return*/, this.itemService.getFileKeyId(itemId_)];
+                                                }
+                                                return [2 /*return*/];
+                                        }
+                                    });
+                                }); })];
+                        case 1:
+                            itemKey = _a.sent();
+                            return [4 /*yield*/, this.keyGraph.getKey(tpSharedKeyId, function () { return __awaiter(_this, void 0, void 0, function () {
+                                    var tpId_, _a;
+                                    return __generator(this, function (_b) {
+                                        switch (_b.label) {
+                                            case 0:
+                                                _a = tpId;
+                                                if (_a) return [3 /*break*/, 2];
+                                                return [4 /*yield*/, getItemShare()];
+                                            case 1:
+                                                _a = (_b.sent()).tp.id;
+                                                _b.label = 2;
+                                            case 2:
+                                                tpId_ = _a;
+                                                return [4 /*yield*/, this.getTpCurrentUserSharedKey(tpId_)];
+                                            case 3: return [2 /*return*/, (_b.sent()).sharedKey.id];
+                                        }
+                                    });
+                                }); })];
+                        case 2:
+                            wrappingKey = _a.sent();
+                            return [4 /*yield*/, this.keyGraph.wrapKey(wrappingKey, itemKey.jwk)];
+                        case 3:
+                            wrappedItemKey = _a.sent();
+                            return [2 /*return*/, {
+                                    input: {
+                                        id: itemShareId,
+                                        accessRole: accessRole,
+                                        itemKeyId: itemKey.id,
+                                        wrappingKeyId: wrappingKey.id,
+                                        wrappedItemKey: wrappedItemKey,
+                                    },
+                                }];
+                    }
+                });
+            });
         };
         TrustedPartyService.prototype.deleteDirectoryShare = function (id) {
             return __awaiter(this, void 0, void 0, function () {
@@ -12702,9 +12845,9 @@
     ]; };
 
     var RequestUserDeleteMutation = gql__default['default'](templateObject_1$s || (templateObject_1$s = __makeTemplateObject(["\n  mutation RequestUserDelete($input: RequestUserDeleteInput!) {\n    requestUserDelete(input: $input) {\n      userDelete {\n        state\n        created\n      }\n    }\n  }\n"], ["\n  mutation RequestUserDelete($input: RequestUserDeleteInput!) {\n    requestUserDelete(input: $input) {\n      userDelete {\n        state\n        created\n      }\n    }\n  }\n"])));
-    var CancelUserDeleteMutation = gql__default['default'](templateObject_2$l || (templateObject_2$l = __makeTemplateObject(["\n  mutation CancelUserDelete($input: CancelUserDeleteInput!) {\n    cancelUserDelete(input: $input) {\n      id\n    }\n  }\n"], ["\n  mutation CancelUserDelete($input: CancelUserDeleteInput!) {\n    cancelUserDelete(input: $input) {\n      id\n    }\n  }\n"])));
-    var LoginHistoryQuery = gql__default['default'](templateObject_3$i || (templateObject_3$i = __makeTemplateObject(["\n  query LoginHistory($first: Int, $after: String) {\n    loginHistory(first: $first, after: $after) {\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      events\n    }\n  }\n"], ["\n  query LoginHistory($first: Int, $after: String) {\n    loginHistory(first: $first, after: $after) {\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      events\n    }\n  }\n"])));
-    var templateObject_1$s, templateObject_2$l, templateObject_3$i;
+    var CancelUserDeleteMutation = gql__default['default'](templateObject_2$m || (templateObject_2$m = __makeTemplateObject(["\n  mutation CancelUserDelete($input: CancelUserDeleteInput!) {\n    cancelUserDelete(input: $input) {\n      id\n    }\n  }\n"], ["\n  mutation CancelUserDelete($input: CancelUserDeleteInput!) {\n    cancelUserDelete(input: $input) {\n      id\n    }\n  }\n"])));
+    var LoginHistoryQuery = gql__default['default'](templateObject_3$j || (templateObject_3$j = __makeTemplateObject(["\n  query LoginHistory($first: Int, $after: String) {\n    loginHistory(first: $first, after: $after) {\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      events\n    }\n  }\n"], ["\n  query LoginHistory($first: Int, $after: String) {\n    loginHistory(first: $first, after: $after) {\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      events\n    }\n  }\n"])));
+    var templateObject_1$s, templateObject_2$m, templateObject_3$j;
 
     var UserService = /** @class */ (function () {
         function UserService(lrApollo) {