@eluvio/elv-client-js 4.2.22 → 4.2.24

package/dist/src/Crypto.js

@@ -117,15 +117,43 @@ var Crypto = {
       }, _callee2);
     }))();
   },
-  DecryptCap: function DecryptCap(encryptedCap, privateKey) {
+  // accepts either a raw private key string (legacy usage) or a signer
+  DecryptCap: function DecryptCap(encryptedCap, signerOrPrivateKey) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      var elvCrypto, ephemeralKey, tag, data, cap;
+      var privateKey, elvCrypto, ephemeralKey, tag, data, cap;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context3.next = 2;
+            if (!(typeof signerOrPrivateKey === "string")) {
+              _context3.next = 4;
+              break;
+            }
+            privateKey = signerOrPrivateKey;
+            _context3.next = 15;
+            break;
+          case 4:
+            if (!(signerOrPrivateKey && signerOrPrivateKey.remoteSigner)) {
+              _context3.next = 10;
+              break;
+            }
+            _context3.next = 7;
+            return signerOrPrivateKey.DecryptCap(encryptedCap);
+          case 7:
+            return _context3.abrupt("return", _context3.sent);
+          case 10:
+            if (!(signerOrPrivateKey && typeof signerOrPrivateKey._signingKey === "function")) {
+              _context3.next = 14;
+              break;
+            }
+            privateKey = signerOrPrivateKey._signingKey().privateKey;
+            _context3.next = 15;
+            break;
+          case 14:
+            throw Error("Crypto.DecryptCap: second argument must be a signer or a private key string");
+          case 15:
+            _context3.next = 17;
             return Crypto.ElvCrypto();
-          case 2:
+          case 17:
             elvCrypto = _context3.sent;
             privateKey = new Uint8Array(Buffer.from(privateKey.replace("0x", ""), "hex"));
             encryptedCap = Buffer.from(encryptedCap, "base64");
@@ -134,7 +162,7 @@ var Crypto = {
             data = encryptedCap.slice(81);
             cap = elvCrypto.decryptECIES(new Uint8Array(data), privateKey, new Uint8Array(ephemeralKey), new Uint8Array(tag));
             return _context3.abrupt("return", JSON.parse(Buffer.from(cap).toString()));
-          case 10:
+          case 25:
           case "end":
             return _context3.stop();
         }

package/dist/src/ElvClient.js

@@ -1724,24 +1724,11 @@ var ElvClient = /*#__PURE__*/function () {
               throw "Signer not set";
             case 3:
               ValidatePresence("message", message);
-              if (!this.signer.remoteSigner) {
-                _context23.next = 10;
-                break;
-              }
-              _context23.next = 7;
-              return this.signer.DecryptCap(message);
+              _context23.next = 6;
+              return this.Crypto.DecryptCap(message, this.signer);
+            case 6:
+              return _context23.abrupt("return", _context23.sent);
             case 7:
-              _context23.t0 = _context23.sent;
-              _context23.next = 13;
-              break;
-            case 10:
-              _context23.next = 12;
-              return this.Crypto.DecryptCap(message, this.signer._signingKey().privateKey);
-            case 12:
-              _context23.t0 = _context23.sent;
-            case 13:
-              return _context23.abrupt("return", _context23.t0);
-            case 14:
             case "end":
               return _context23.stop();
           }

package/dist/src/FrameClient.js

@@ -449,7 +449,7 @@ var FrameClient = /*#__PURE__*/function () {
   }, {
     key: "AllowedMethods",
     value: function AllowedMethods() {
-      return ["AccessGroupManagers", "AccessGroupMembers", "AccessGroupOwner", "AccessInfo", "AccessRequest", "AccessType", "AddAccessGroupManager", "AddAccessGroupMember", "AddContentLibraryGroup", "AddContentObjectGroupPermission", "AddLibraryContentType", "AssetMetadata", "AuditContentObject", "AuditStream", "AvailableDRMs", "AvailableOfferings", "AwaitPending", "BitmovinPlayoutOptions", "BlockNumber", "CallBitcodeMethod", "CallContractMethod", "CallContractMethodAndWait", "ClearCache", "ClearStaticToken", "Collection", "CollectionTransactions", "ConfigUrl", "ContentLibraries", "ContentLibrary", "ContentLibraryGroupPermissions", "ContentLibraryOwner", "ContentObject", "ContentObjectAccessComplete", "ContentObjectGraph", "ContentObjectGroupPermissions", "ContentObjectImageUrl", "ContentObjectLibraryId", "ContentObjectMetadata", "ContentObjectOwner", "ContentObjectTenantId", "ContentObjectVersions", "ContentObjects", "ContentPart", "ContentParts", "ContentSpaceId", "ContentType", "ContentTypeOwner", "ContentTypes", "ContractAbi", "ContractEvents", "ContractInfo", "ContractMetadata", "ContractName", "CopyContentObject", "CreateABRMezzanine", "CreateAccessGroup", "CreateAndFinalizeContentObject", "CreateAuthorizationToken", "CreateContentLibrary", "CreateContentObject", "CreateContentType", "CreateEncryptionConk", "CreateFabricToken", "CreateFileDirectories", "CreateFileUploadJob", "CreateLinks", "CreateNTPInstance", "CreateNonOwnerCap", "CreatePart", "CreateProductionMaster", "CreateShare", "CreateSignedMessageJSON", "CreateSignedToken", "CreateStaticToken", "CurrentAccountAddress", "CustomContractAddress", "DecodeSignedMessageJSON", "Decrypt", "DecryptECIES", "DefaultKMSAddress", "DeleteAccessGroup", "DeleteContentLibrary", "DeleteContentObject", "DeleteContentVersion", "DeleteFiles", "DeleteMetadata", "DeleteNTPInstance", "DeletePart", "DeleteWriteToken", "DeployContract", "Download", "DownloadEncrypted", "DownloadFile", "DownloadPart", "EditAndFinalizeContentObject", "EditContentObject", "EmbedUrl", "Encrypt", "EncryptECIES", "EncryptionConk", "Events", "ExtractEventFromLogs", "ExtractValueFromEvent", "FabricUrl", "FileUrl", "FinalizeABRMezzanine", "FinalizeContentObject", "FinalizePart", "FinalizeStateChannelAccess", "FinalizeUploadJob", "FormatContractArguments", "GenerateStateChannelToken", "GenerateSignedLinkToken", "GetBalance", "GlobalUrl", "InitializeAuthPolicy", "IssueNTPCode", "IssueSignedNTPCode", "LatestVersionHash", "LibraryContentTypes", "LinkAccessGroupToOauth", "LinkData", "LinkTarget", "LinkUrl", "ListAccessGroups", "ListFiles", "ListNTPInstances", "LRODraftInfo", "LROStatus", "MakeAuthServiceRequest", "MakeFileServiceRequest", "MergeContractMetadata", "MergeMetadata", "MetadataAuth", "MintNFT", "MoveFiles", "NetworkInfo", "NodeId", "Nodes", "NTPInstance", "ObjectCleanup", "OutputsCreate", "OutputsDelete", "OutputsList", "OutputsListItem", "OutputsModify", "OutputsModifyBatch", "OutputsResolveSrtPullUrls", "OutputsState", "OutputsStop", "Permission", "PlayoutOptions", "PlayoutPathResolution", "ProduceMetadataLinks", "Proofs", "PublicRep", "PublishContentVersion", "QParts", "RecordWriteToken", "RedeemCode", "RedeemShareToken", "RemoveAccessGroupManager", "RemoveAccessGroupMember", "RemoveContentObjectGroupPermission", "RemoveContentLibraryGroup", "RemoveLibraryContentType", "Rep", "ReplaceContractMetadata", "ReplaceMetadata", "Request", "ResetRegion", "ResetTenantId", "RevokeShare", "SendFunds", "SetAccessCharge", "StreamApplyProfile", "SetAuth", "SetAuthContext", "SetAuthPolicy", "SetContentLibraryImage", "SetContentObjectImage", "SetCustomContentContract", "SetGroupPermission", "SetNodes", "SetOauthToken", "SetPolicyAuthorization", "SetSignerFromOauthToken", "SetStaticToken", "SetTenantContractId", "SetTenantId", "TenantAdminGroup", "ContentAdminGroup", "TenantUsersGroup", "SetVisibility", "SetPermission", "ShareInfo", "Shares", "SpaceNodes", "StartABRMezzanineJobs", "StreamAddWatermark", "StreamApplyProfile", "StreamAssignProfile", "StreamConfig", "StreamConfigProfile", "StreamConfigProfiles", "StreamCopyToVod", "StreamCreate", "StreamInitialize", "StreamInsertion", "StreamLinkToSite", "StreamListUrls", "StreamRemoveLinkToSite", "StreamRemoveWatermark", "StreamSaveConfigProfile", "StreamSetOfferingAndDRM", "StreamSiteSettings", "StreamStartRecording", "StreamStartOrStopOrReset", "StreamStatus", "StreamStopRecording", "StreamUnassignProfile", "StreamUpdateConfig", "SuspendNTPInstance", "TenantContractId", "TenantId", "UnlinkAccessGroupFromOauth", "UpdateContentObjectGraph", "UpdateNTPInstance", "UpdateShare", "UploadFileData", "UploadFilesFromS3", "UploadJobStatus", "UploadPart", "UploadPartChunk", "UploadStatus", "UseRegion", "Visibility", "WriteTokenNodeUrlLocal", "WriteTokenNodeUrlNetwork"];
+      return ["AccessGroupManagers", "AccessGroupMembers", "AccessGroupOwner", "AccessInfo", "AccessRequest", "AccessType", "AddAccessGroupManager", "AddAccessGroupMember", "AddContentLibraryGroup", "AddContentObjectGroupPermission", "AddLibraryContentType", "AssetMetadata", "AuditContentObject", "AuditStream", "AvailableDRMs", "AvailableOfferings", "AwaitPending", "BitmovinPlayoutOptions", "BlockNumber", "CallBitcodeMethod", "CallContractMethod", "CallContractMethodAndWait", "ClearCache", "ClearStaticToken", "Collection", "CollectionTransactions", "ConfigUrl", "ContentLibraries", "ContentLibrary", "ContentLibraryGroupPermissions", "ContentLibraryOwner", "ContentObject", "ContentObjectAccessComplete", "ContentObjectGraph", "ContentObjectGroupPermissions", "ContentObjectImageUrl", "ContentObjectLibraryId", "ContentObjectMetadata", "ContentObjectOwner", "ContentObjectTenantId", "ContentObjectVersions", "ContentObjects", "ContentPart", "ContentParts", "ContentSpaceId", "ContentType", "ContentTypeOwner", "ContentTypes", "ContractAbi", "ContractEvents", "ContractInfo", "ContractMetadata", "ContractName", "CopyContentObject", "CreateABRMezzanine", "CreateAccessGroup", "CreateAndFinalizeContentObject", "CreateAuthorizationToken", "CreateContentLibrary", "CreateContentObject", "CreateContentType", "CreateEncryptionConk", "CreateFabricToken", "CreateFileDirectories", "CreateFileUploadJob", "CreateLinks", "CreateNTPInstance", "CreateNonOwnerCap", "CreatePart", "CreateProductionMaster", "CreateShare", "CreateSignedMessageJSON", "CreateSignedToken", "CreateStaticToken", "CurrentAccountAddress", "CustomContractAddress", "DecodeSignedMessageJSON", "Decrypt", "DecryptECIES", "DefaultKMSAddress", "DeleteAccessGroup", "DeleteContentLibrary", "DeleteContentObject", "DeleteContentVersion", "DeleteFiles", "DeleteMetadata", "DeleteNTPInstance", "DeletePart", "DeleteWriteToken", "DeployContract", "Download", "DownloadEncrypted", "DownloadFile", "DownloadPart", "EditAndFinalizeContentObject", "EditContentObject", "EmbedUrl", "Encrypt", "EncryptECIES", "EncryptionConk", "Events", "ExtractEventFromLogs", "ExtractValueFromEvent", "FabricUrl", "FileUrl", "FinalizeABRMezzanine", "FinalizeContentObject", "FinalizePart", "FinalizeStateChannelAccess", "FinalizeUploadJob", "FormatContractArguments", "GenerateStateChannelToken", "GenerateSignedLinkToken", "GetBalance", "GlobalUrl", "InitializeAuthPolicy", "IssueNTPCode", "IssueSignedNTPCode", "LatestVersionHash", "LibraryContentTypes", "LinkAccessGroupToOauth", "LinkData", "LinkTarget", "LinkUrl", "ListAccessGroups", "ListFiles", "ListNTPInstances", "LRODraftInfo", "LROStatus", "MakeAuthServiceRequest", "MakeFileServiceRequest", "MergeContractMetadata", "MergeMetadata", "MetadataAuth", "MintNFT", "MoveFiles", "NetworkInfo", "NodeId", "Nodes", "NTPInstance", "ObjectCleanup", "OutputsCreate", "OutputsDelete", "OutputsDeleteBatch", "OutputsList", "OutputsListItem", "OutputsModify", "OutputsModifyBatch", "OutputsReset", "OutputsResolveSrtPullUrls", "OutputsState", "OutputsStop", "Permission", "PlayoutOptions", "PlayoutPathResolution", "ProduceMetadataLinks", "Proofs", "PublicRep", "PublishContentVersion", "QParts", "RecordWriteToken", "RedeemCode", "RedeemShareToken", "RemoveAccessGroupManager", "RemoveAccessGroupMember", "RemoveContentObjectGroupPermission", "RemoveContentLibraryGroup", "RemoveLibraryContentType", "Rep", "ReplaceContractMetadata", "ReplaceMetadata", "Request", "ResetRegion", "ResetTenantId", "RevokeShare", "SendFunds", "SetAccessCharge", "StreamApplyProfile", "SetAuth", "SetAuthContext", "SetAuthPolicy", "SetContentLibraryImage", "SetContentObjectImage", "SetCustomContentContract", "SetGroupPermission", "SetNodes", "SetOauthToken", "SetPolicyAuthorization", "SetSignerFromOauthToken", "SetStaticToken", "SetTenantContractId", "SetTenantId", "TenantAdminGroup", "ContentAdminGroup", "TenantUsersGroup", "SetVisibility", "SetPermission", "ShareInfo", "Shares", "SpaceNodes", "StartABRMezzanineJobs", "StreamAddWatermark", "StreamApplyProfile", "StreamAssignProfile", "StreamConfig", "StreamConfigProfile", "StreamConfigProfiles", "StreamCopyToVod", "StreamCreate", "StreamInitialize", "StreamInsertion", "StreamLinkToSite", "StreamListUrls", "StreamRemoveLinkToSite", "StreamRemoveWatermark", "StreamSaveConfigProfile", "StreamSetOfferingAndDRM", "StreamSiteSettings", "StreamStartRecording", "StreamStartOrStopOrReset", "StreamStatus", "StreamStopRecording", "StreamUnassignProfile", "StreamUpdateConfig", "SuspendNTPInstance", "TenantContractId", "TenantId", "UnlinkAccessGroupFromOauth", "UpdateContentObjectGraph", "UpdateNTPInstance", "UpdateShare", "UploadFileData", "UploadFilesFromS3", "UploadJobStatus", "UploadPart", "UploadPartChunk", "UploadStatus", "UseRegion", "Visibility", "WriteTokenNodeUrlLocal", "WriteTokenNodeUrlNetwork"];
     }
   }, {
     key: "AllowedUserProfileMethods",

package/dist/src/client/ContentAccess.js

@@ -4198,74 +4198,61 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
         case 14:
           existingUserCap = _context47.sent;
           if (!existingUserCap) {
-            _context47.next = 28;
+            _context47.next = 21;
             break;
           }
-          if (!this.signer.remoteSigner) {
-            _context47.next = 22;
-            break;
-          }
-          _context47.next = 19;
-          return this.signer.DecryptCap(existingUserCap);
-        case 19:
-          _context47.t0 = _context47.sent;
-          _context47.next = 25;
-          break;
-        case 22:
-          _context47.next = 24;
-          return this.Crypto.DecryptCap(existingUserCap, this.signer._signingKey().privateKey);
-        case 24:
-          _context47.t0 = _context47.sent;
-        case 25:
-          this.encryptionConks[objectId] = _context47.t0;
-          _context47.next = 42;
+          _context47.next = 18;
+          return this.Crypto.DecryptCap(existingUserCap, this.signer);
+        case 18:
+          this.encryptionConks[objectId] = _context47.sent;
+          _context47.next = 35;
           break;
-        case 28:
-          _context47.next = 30;
+        case 21:
+          _context47.next = 23;
           return this.Crypto.GeneratePrimaryConk({
             spaceId: this.contentSpaceId,
             objectId: objectId
           });
-        case 30:
+        case 23:
           this.encryptionConks[objectId] = _context47.sent;
-          _context47.t1 = this;
-          _context47.t2 = libraryId;
-          _context47.t3 = objectId;
-          _context47.t4 = writeToken;
-          _context47.t5 = capKey;
-          _context47.next = 38;
+          _context47.t0 = this;
+          _context47.t1 = libraryId;
+          _context47.t2 = objectId;
+          _context47.t3 = writeToken;
+          _context47.t4 = capKey;
+          _context47.next = 31;
           return this.Crypto.EncryptConk(this.encryptionConks[objectId], this.signer._signingKey().publicKey);
-        case 38:
-          _context47.t6 = _context47.sent;
-          _context47.t7 = {
-            libraryId: _context47.t2,
-            objectId: _context47.t3,
-            writeToken: _context47.t4,
-            metadataSubtree: _context47.t5,
-            metadata: _context47.t6
+        case 31:
+          _context47.t5 = _context47.sent;
+          _context47.t6 = {
+            libraryId: _context47.t1,
+            objectId: _context47.t2,
+            writeToken: _context47.t3,
+            metadataSubtree: _context47.t4,
+            metadata: _context47.t5
           };
-          _context47.next = 42;
-          return _context47.t1.ReplaceMetadata.call(_context47.t1, _context47.t7);
-        case 42:
+          _context47.next = 35;
+          return _context47.t0.ReplaceMetadata.call(_context47.t0, _context47.t6);
+        case 35:
           if (!createKMSConk) {
-            _context47.next = 72;
+            _context47.next = 65;
             break;
           }
-          _context47.prev = 43;
-          _context47.next = 46;
+          _context47.prev = 36;
+          _context47.next = 39;
           return this.authClient.KMSAddress({
             objectId: objectId
           });
-        case 46:
+        case 39:
           kmsAddress = _context47.sent;
-          _context47.next = 49;
+          _context47.next = 42;
           return this.authClient.KMSInfo({
             objectId: objectId
           });
-        case 49:
+        case 42:
           kmsPublicKey = _context47.sent.publicKey;
           kmsCapKey = "eluv.caps.ikms".concat(this.utils.AddressToHash(kmsAddress));
-          _context47.next = 53;
+          _context47.next = 46;
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             // Cap may only exist in draft
@@ -4273,47 +4260,47 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
             writeToken: writeToken,
             metadataSubtree: kmsCapKey
           });
-        case 53:
+        case 46:
           existingKMSCap = _context47.sent;
           if (existingKMSCap) {
-            _context47.next = 66;
+            _context47.next = 59;
             break;
           }
-          _context47.t8 = this;
-          _context47.t9 = libraryId;
-          _context47.t10 = objectId;
-          _context47.t11 = writeToken;
-          _context47.t12 = kmsCapKey;
-          _context47.next = 62;
+          _context47.t7 = this;
+          _context47.t8 = libraryId;
+          _context47.t9 = objectId;
+          _context47.t10 = writeToken;
+          _context47.t11 = kmsCapKey;
+          _context47.next = 55;
           return this.Crypto.EncryptConk(this.encryptionConks[objectId], kmsPublicKey);
-        case 62:
-          _context47.t13 = _context47.sent;
-          _context47.t14 = {
-            libraryId: _context47.t9,
-            objectId: _context47.t10,
-            writeToken: _context47.t11,
-            metadataSubtree: _context47.t12,
-            metadata: _context47.t13
+        case 55:
+          _context47.t12 = _context47.sent;
+          _context47.t13 = {
+            libraryId: _context47.t8,
+            objectId: _context47.t9,
+            writeToken: _context47.t10,
+            metadataSubtree: _context47.t11,
+            metadata: _context47.t12
           };
-          _context47.next = 66;
-          return _context47.t8.ReplaceMetadata.call(_context47.t8, _context47.t14);
-        case 66:
-          _context47.next = 72;
+          _context47.next = 59;
+          return _context47.t7.ReplaceMetadata.call(_context47.t7, _context47.t13);
+        case 59:
+          _context47.next = 65;
           break;
-        case 68:
-          _context47.prev = 68;
-          _context47.t15 = _context47["catch"](43);
+        case 61:
+          _context47.prev = 61;
+          _context47.t14 = _context47["catch"](36);
           // eslint-disable-next-line no-console
           console.error("Failed to create encryption cap for KMS:");
           // eslint-disable-next-line no-console
-          console.error(_context47.t15);
-        case 72:
+          console.error(_context47.t14);
+        case 65:
           return _context47.abrupt("return", this.encryptionConks[objectId]);
-        case 73:
+        case 66:
         case "end":
           return _context47.stop();
       }
-    }, _callee47, this, [[43, 68]]);
+    }, _callee47, this, [[36, 61]]);
   }));
   return function (_x43) {
     return _ref86.apply(this, arguments);
@@ -4399,7 +4386,7 @@ exports.EncryptionConk = /*#__PURE__*/function () {
           return _context48.abrupt("return", _context48.sent);
         case 21:
           if (this.encryptionConks[objectId]) {
-            _context48.next = 45;
+            _context48.next = 38;
             break;
           }
           capKey = "eluv.caps.iusr".concat(this.utils.AddressToHash(this.signer.address));
@@ -4415,34 +4402,21 @@ exports.EncryptionConk = /*#__PURE__*/function () {
         case 25:
           existingUserCap = _context48.sent;
           if (!existingUserCap) {
-            _context48.next = 39;
-            break;
-          }
-          if (!this.signer.remoteSigner) {
-            _context48.next = 33;
+            _context48.next = 32;
             break;
           }
-          _context48.next = 30;
-          return this.signer.DecryptCap(existingUserCap);
-        case 30:
-          _context48.t0 = _context48.sent;
-          _context48.next = 36;
-          break;
-        case 33:
-          _context48.next = 35;
-          return this.Crypto.DecryptCap(existingUserCap, this.signer._signingKey().privateKey);
-        case 35:
-          _context48.t0 = _context48.sent;
-        case 36:
-          this.encryptionConks[objectId] = _context48.t0;
-          _context48.next = 45;
+          _context48.next = 29;
+          return this.Crypto.DecryptCap(existingUserCap, this.signer);
+        case 29:
+          this.encryptionConks[objectId] = _context48.sent;
+          _context48.next = 38;
           break;
-        case 39:
+        case 32:
           if (!writeToken) {
-            _context48.next = 44;
+            _context48.next = 37;
             break;
           }
-          _context48.next = 42;
+          _context48.next = 35;
           return this.CreateEncryptionConk({
             libraryId: libraryId,
             objectId: objectId,
@@ -4450,14 +4424,14 @@ exports.EncryptionConk = /*#__PURE__*/function () {
             writeToken: writeToken,
             createKMSConk: false
           });
-        case 42:
-          _context48.next = 45;
+        case 35:
+          _context48.next = 38;
           break;
-        case 44:
+        case 37:
           throw "No encryption conk present for " + objectId;
-        case 45:
+        case 38:
           return _context48.abrupt("return", this.encryptionConks[objectId]);
-        case 46:
+        case 39:
         case "end":
           return _context48.stop();
       }

package/dist/src/client/ContentManagement.js

@@ -1064,47 +1064,34 @@ exports.CopyContentObject = /*#__PURE__*/function () {
           // User CAP
           userCapKey = "eluv.caps.iusr".concat(this.utils.AddressToHash(this.signer.address));
           if (!metadata[userCapKey]) {
-            _context13.next = 40;
+            _context13.next = 33;
             break;
           }
-          if (!this.signer.remoteSigner) {
-            _context13.next = 24;
-            break;
-          }
-          _context13.next = 21;
-          return this.signer.DecryptCap(metadata[userCapKey]);
-        case 21:
-          _context13.t0 = _context13.sent;
-          _context13.next = 27;
-          break;
-        case 24:
-          _context13.next = 26;
-          return this.Crypto.DecryptCap(metadata[userCapKey], this.signer._signingKey().privateKey);
-        case 26:
-          _context13.t0 = _context13.sent;
-        case 27:
-          userConkKey = _context13.t0;
+          _context13.next = 20;
+          return this.Crypto.DecryptCap(metadata[userCapKey], this.signer);
+        case 20:
+          userConkKey = _context13.sent;
           userConkKey.qid = objectId;
-          _context13.t1 = this;
-          _context13.t2 = libraryId;
-          _context13.t3 = objectId;
-          _context13.t4 = writeToken;
-          _context13.t5 = userCapKey;
-          _context13.next = 36;
+          _context13.t0 = this;
+          _context13.t1 = libraryId;
+          _context13.t2 = objectId;
+          _context13.t3 = writeToken;
+          _context13.t4 = userCapKey;
+          _context13.next = 29;
           return this.Crypto.EncryptConk(userConkKey, this.signer._signingKey().publicKey);
-        case 36:
-          _context13.t6 = _context13.sent;
-          _context13.t7 = {
-            libraryId: _context13.t2,
-            objectId: _context13.t3,
-            writeToken: _context13.t4,
-            metadataSubtree: _context13.t5,
-            metadata: _context13.t6
+        case 29:
+          _context13.t5 = _context13.sent;
+          _context13.t6 = {
+            libraryId: _context13.t1,
+            objectId: _context13.t2,
+            writeToken: _context13.t3,
+            metadataSubtree: _context13.t4,
+            metadata: _context13.t5
           };
-          _context13.next = 40;
-          return _context13.t1.ReplaceMetadata.call(_context13.t1, _context13.t7);
-        case 40:
-          _context13.next = 42;
+          _context13.next = 33;
+          return _context13.t0.ReplaceMetadata.call(_context13.t0, _context13.t6);
+        case 33:
+          _context13.next = 35;
           return Promise.all(Object.keys(metadata).filter(function (key) {
             return key.startsWith("eluv.caps.ikms");
           }).map( /*#__PURE__*/function () {
@@ -1131,28 +1118,28 @@ exports.CopyContentObject = /*#__PURE__*/function () {
               return _ref24.apply(this, arguments);
             };
           }()));
-        case 42:
+        case 35:
           if (!(permission !== "owner")) {
-            _context13.next = 45;
+            _context13.next = 38;
             break;
           }
-          _context13.next = 45;
+          _context13.next = 38;
           return this.CreateEncryptionConk({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: writeToken,
             createKMSConk: true
           });
-        case 45:
-          _context13.next = 47;
+        case 38:
+          _context13.next = 40;
           return this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: writeToken
           });
-        case 47:
+        case 40:
           return _context13.abrupt("return", _context13.sent);
-        case 48:
+        case 41:
         case "end":
           return _context13.stop();
       }
@@ -1197,42 +1184,29 @@ exports.CreateNonOwnerCap = /*#__PURE__*/function () {
           }
           throw Error("No user cap found for current user");
         case 7:
-          if (!this.signer.remoteSigner) {
-            _context14.next = 13;
-            break;
-          }
-          _context14.next = 10;
-          return this.signer.DecryptCap(userCapValue);
-        case 10:
-          _context14.t0 = _context14.sent;
-          _context14.next = 16;
-          break;
-        case 13:
-          _context14.next = 15;
-          return this.Crypto.DecryptCap(userCapValue, this.signer._signingKey().privateKey);
-        case 15:
-          _context14.t0 = _context14.sent;
-        case 16:
-          userConk = _context14.t0;
+          _context14.next = 9;
+          return this.Crypto.DecryptCap(userCapValue, this.signer);
+        case 9:
+          userConk = _context14.sent;
           publicAddress = this.utils.PublicKeyToAddress(publicKey);
           targetUserCapKey = "eluv.caps.iusr".concat(this.utils.AddressToHash(publicAddress));
-          _context14.next = 21;
+          _context14.next = 14;
           return this.Crypto.EncryptConk(userConk, publicKey);
-        case 21:
+        case 14:
           targetUserCapValue = _context14.sent;
           finalize = !writeToken;
           if (writeToken) {
-            _context14.next = 27;
+            _context14.next = 20;
             break;
           }
-          _context14.next = 26;
+          _context14.next = 19;
           return this.EditContentObject({
             libraryId: libraryId,
             objectId: objectId
           }).writeToken;
-        case 26:
+        case 19:
           writeToken = _context14.sent;
-        case 27:
+        case 20:
           this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
@@ -1241,17 +1215,17 @@ exports.CreateNonOwnerCap = /*#__PURE__*/function () {
             metadata: targetUserCapValue
           });
           if (!finalize) {
-            _context14.next = 31;
+            _context14.next = 24;
             break;
           }
-          _context14.next = 31;
+          _context14.next = 24;
           return this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: writeToken,
             commitMessage: "Create non-owner cap"
           });
-        case 31:
+        case 24:
         case "end":
           return _context14.stop();
       }

package/dist/src/client/Contracts.js

@@ -1579,13 +1579,13 @@ function _GetTenantGroupAddress() {
         case 20:
           _context33.prev = 20;
           _context33.t0 = _context33["catch"](11);
-          this.Log(_context33.t0);
+          ctx.Log(_context33.t0);
           throw new Error("Failed to retrieve ".concat(groupName, " group address."));
         case 24:
         case "end":
           return _context33.stop();
       }
-    }, _callee33, this, [[11, 20]]);
+    }, _callee33, null, [[11, 20]]);
   }));
   return _GetTenantGroupAddress.apply(this, arguments);
 }