@eluvio/elv-client-js 4.2.25 → 4.2.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.2.25",
+  "version": "4.2.29",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",
@@ -35,6 +35,10 @@
   "browser": {
     "fs": false
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/eluv-io/elv-client-js.git"
+  },
   "files": [
     "/build",
     "/dist",

package/src/EthClient.js

@@ -309,6 +309,7 @@ class EthClient {
     methodName,
     methodArgs,
     value,
+    overrides={},
     timeout,
     formatArguments=true,
     cacheContract=true,
@@ -319,7 +320,6 @@ class EthClient {
     if(!abi) { abi = await this.client.ContractAbi({contractAddress}); }
 
     const contract = this.Contract({contractAddress, abi, cacheContract, overrideCachedContract});
-
     // Make method call
     const createMethodCall = await this.CallContractMethod({
       contract,
@@ -327,6 +327,7 @@ class EthClient {
       methodName,
       methodArgs,
       value,
+      overrides,
       formatArguments,
       cacheContract
     });

package/src/client/ABRPublishing.js

@@ -78,6 +78,11 @@ const MezJobMainOfferingKey = function(abrMezOfferings) {
  * -           ...
  * -         ]
  * -
+ * - For a presigned URL, `path` and `storage_endpoint` are not required and `cloud_credentials` should be:
+ * -         {
+ * -           signed_url: "YOUR_PRESIGNED_S3_URL"
+ * -         }
+ * -
  * - The simplest case is a one element array with .path_matchers == [".*"], in which case the same credentials will be used for all items in fileInfo
  *
  * @throws {Object} error - If the initialization of the master fails, error details can be found in error.body
@@ -127,8 +132,11 @@ exports.CreateProductionMaster = async function({
         let matched = false;
         for(let j = 0; !matched && j < access.length; j++) {
           let credentialSet = access[j];
+          const remoteAccess = credentialSet.remote_access;
           // strip trailing slash to get bucket name for credential set
-          const credentialSetBucket = credentialSet.remote_access.path.replace(/\/$/, "");
+          const credentialSetBucket = remoteAccess.path
+            ? remoteAccess.path.replace(/\/$/, "")
+            : undefined;
           const matchers = credentialSet.path_matchers;
           for(let k = 0; !matched && k < matchers.length; k++) {
             const matcher = new RegExp(matchers[k]);
@@ -139,7 +147,7 @@ exports.CreateProductionMaster = async function({
               const s3prefixMatch = (s3prefixRegex.exec(fileSourcePath));
               if(s3prefixMatch) {
                 const bucketName = s3prefixMatch[1];
-                if(bucketName !== credentialSetBucket) {
+                if(credentialSetBucket && bucketName !== credentialSetBucket) {
                   throw Error("Full S3 file path \"" + fileSourcePath + "\" matched to credential set with different bucket name '" + credentialSetBucket + "'");
                 }
               }
@@ -154,7 +162,7 @@ exports.CreateProductionMaster = async function({
           }
         }
         if(!matched) {
-          throw Error("no credential set found for file path: \"" + filePath + "\"");
+          throw Error("no credential set found for file path: \"" + oneFileInfo.source + "\"");
         }
       }
 
@@ -162,10 +170,13 @@ exports.CreateProductionMaster = async function({
       for(let i = 0; i < access.length; i++) {
         const credentialSet = access[i];
         if(credentialSet.hasOwnProperty("matched") && credentialSet.matched.length > 0) {
-          const region = credentialSet.remote_access.storage_endpoint.region;
-          const bucket = credentialSet.remote_access.path.replace(/\/$/, "");
-          const accessKey = credentialSet.remote_access.cloud_credentials.access_key_id;
-          const secret = credentialSet.remote_access.cloud_credentials.secret_access_key;
+          const remoteAccess = credentialSet.remote_access;
+          const cloudCredentials = remoteAccess.cloud_credentials;
+          const region = remoteAccess.storage_endpoint && remoteAccess.storage_endpoint.region;
+          const bucket = remoteAccess.path && remoteAccess.path.replace(/\/$/, "");
+          const accessKey = cloudCredentials.access_key_id;
+          const secret = cloudCredentials.secret_access_key;
+          const signedUrl = cloudCredentials.signed_url;
 
           await this.UploadFilesFromS3({
             libraryId,
@@ -176,6 +187,7 @@ exports.CreateProductionMaster = async function({
             bucket,
             accessKey,
             secret,
+            signedUrl,
             copy,
             callback,
             encryption: encrypt ? "cgck" : "none"
@@ -212,22 +224,24 @@ exports.CreateProductionMaster = async function({
     constant: false
   });
 
+  const mergeMetadata = {
+    ...(metadata || {}),
+    name: name !== undefined ? name : (metadata || {}).name,
+    description: description !== undefined ? description : (metadata || {}).description,
+    reference: access && !copy,
+    public: {
+      ...((metadata || {}).public || {}),
+      name: name !== undefined ? name : ((metadata || {}).public || {}).name,
+      description: description !== undefined ? description : ((metadata || {}).public || {}).description
+    },
+    elv_created_at: new Date().getTime(),
+  };
+
   await this.MergeMetadata({
     libraryId,
     objectId,
     writeToken,
-    metadata: {
-      ...(metadata || {}),
-      name,
-      description,
-      reference: access && !copy,
-      public: {
-        ...((metadata || {}).public || {}),
-        name: name || "",
-        description: description || ""
-      },
-      elv_created_at: new Date().getTime(),
-    }
+    metadata: mergeMetadata
   });
 
   let additionalReturnVals;

package/src/client/ContentAccess.js

@@ -9,6 +9,7 @@ const objectPath = require("object-path");
 
 const HttpClient = require("../HttpClient");
 const ContentObjectAudit = require("../ContentObjectAudit");
+const bs58 = require("bs58");
 
 const {
   ValidateLibrary,
@@ -17,6 +18,7 @@ const {
   ValidatePartHash,
   ValidateWriteToken,
   ValidateParameters,
+  ValidatePresence,
 } = require("../Validation");
 
 const MergeWith = require("lodash/mergeWith");
@@ -2713,7 +2715,6 @@ exports.LinkData = async function({libraryId, objectId, versionHash, writeToken,
   );
 };
 
-
 /* Encryption */
 
 exports.CreateEncryptionConk = async function({libraryId, objectId, versionHash, writeToken, createKMSConk=true}) {
@@ -2793,6 +2794,74 @@ exports.CreateEncryptionConk = async function({libraryId, objectId, versionHash,
   return this.encryptionConks[objectId];
 };
 
+/**
+ * Encrypt the owner encryption key using the new user details provided
+ *
+ * @methodGroup Encryption
+ * @namedParams
+ * @param {string=} libraryId - ID of a library
+ * @param {string=} objectId - ID of an object
+ * @param {string=} versionHash - Hash of an object version
+ * @param {string=} writeToken - The write token for the object
+ * @param {Object=} newEncodedUserPublicKey - raw public key or base-58 encoded publicKey of the new user prefixed 'kupk'
+ */
+exports.MigrateEncryptionConkForUserProvided = async function({libraryId, objectId, versionHash, writeToken, newEncodedUserPublicKey}) {
+  if(this.signer.remoteSigner) {
+    return;
+  }
+
+  ValidateParameters({libraryId, objectId, versionHash});
+  ValidateWriteToken(writeToken);
+
+  if(!objectId) {
+    objectId = this.utils.DecodeVersionHash(versionHash).objectId;
+  }
+
+  ValidatePresence("newEncodedUserPublicKey", newEncodedUserPublicKey);
+
+  let publicKey;
+  if(!newEncodedUserPublicKey.startsWith("kupk")){
+    publicKey = newEncodedUserPublicKey;
+  } else {
+    const publicKeyBytes = bs58.decode(newEncodedUserPublicKey.slice(4));
+    if(publicKeyBytes.length !== 65) {
+      publicKey = "0x" + Buffer.concat([Buffer.from([0x04]), publicKeyBytes]).toString("hex");
+    } else {
+      publicKey = "0x" + publicKeyBytes.toString("hex");
+    }
+  }
+
+  // Decrypt using existing user key
+  const existingCapKey = `eluv.caps.iusr${this.utils.AddressToHash(this.signer.address)}`;
+  const existingUserCap =
+    await this.ContentObjectMetadata({
+      libraryId,
+      objectId,
+      writeToken,
+      metadataSubtree: existingCapKey
+    });
+
+  if(!existingUserCap) {
+    throw (`No encryption conk present for ${objectId} for user ${this.signer.address}`);
+  }
+
+  this.encryptionConks[objectId] = await this.Crypto.DecryptCap(existingUserCap, this.signer._signingKey().privateKey);
+
+  // Encrypt with the new key
+  const encryptedConk = await this.Crypto.EncryptConk(this.encryptionConks[objectId], publicKey);
+  const newUserCap = `eluv.caps.iusr${this.utils.AddressToHash(this.utils.PublicKeyToAddress(publicKey))}`;
+
+  await this.ReplaceMetadata({
+    libraryId,
+    objectId,
+    writeToken,
+    metadataSubtree: newUserCap,
+    metadata: encryptedConk
+  });
+
+  return this.encryptionConks[objectId];
+};
+
 /**
  * Retrieve the encryption conk for the specified object. If one has not yet been created
  * and a writeToken has been specified, this method will create a new conk and