@eluvio/elv-client-js 4.0.105 → 4.0.107

package/src/UserProfileClient.js

@@ -420,20 +420,20 @@ await client.userProfileClient.UserMetadata()
   }
 
   /**
-   * Return the ID of the tenant this user belongs to, if set.
+   * Return the ID of the tenant admin group set for current user
    *
    * @return {Promise<string>} - Tenant ID
    */
   async TenantId() {
     if(!this.tenantId) {
-      this.tenantId = await this.UserMetadata({metadataSubtree: "tenantId"});
+      const {objectId} = await this.UserWalletObjectInfo();
+      this.tenantId = await this.client.TenantId({ objectId });
     }
-
     return this.tenantId;
   }
 
   /**
-   * Set the current user's tenant
+   * Set the current user's tenant admin group ID
    *
    * Note: This method is not accessible to applications. Eluvio core will drop the request.
    *
@@ -441,7 +441,8 @@ await client.userProfileClient.UserMetadata()
    * @param {string} id - The tenant ID in hash format
    * @param {string} address - The group address to use in the hash if id is not provided
    */
-  async SetTenantId({id, address}) {
+  async SetTenantId({ id, address }) {
+
     if(id && (!id.startsWith("iten") || !Utils.ValidHash(id))) {
       throw Error(`Invalid tenant ID: ${id}`);
     }
@@ -454,19 +455,11 @@ await client.userProfileClient.UserMetadata()
       id = `iten${Utils.AddressToHash(address)}`;
     }
 
-    try {
-      const version = await this.client.AccessType({id});
-
-      if(version !== this.client.authClient.ACCESS_TYPES.GROUP) {
-        throw Error("Invalid tenant ID: " + id);
-      }
-    } catch(error) {
-      throw Error("Invalid tenant ID: " + id);
-    }
-
-    await this.ReplaceUserMetadata({metadataSubtree: "tenantId", metadata: id});
+    const {objectId} = await this.UserWalletObjectInfo();
 
-    this.tenantId = id;
+    const tenantInfo = await this.client.SetTenantId({ objectId, tenantId: id });
+    this.tenantContractId = tenantInfo.tenantContractId;
+    this.tenantId = tenantInfo.tenantId;
   }
 
   /**
@@ -477,9 +470,7 @@ await client.userProfileClient.UserMetadata()
   async TenantContractId() {
     if(!this.tenantContractId) {
       const {objectId} = await this.UserWalletObjectInfo();
-      this.tenantContractId = await this.client.TenantContractId({
-        contractAddress: this.client.utils.HashToAddress(objectId)
-      });
+      this.tenantContractId = await this.client.TenantContractId({ objectId });
     }
     return this.tenantContractId;
   }
@@ -498,6 +489,14 @@ await client.userProfileClient.UserMetadata()
 
     const tenantInfo = await this.client.SetTenantContractId({ objectId,tenantContractId });
     this.tenantContractId = tenantInfo.tenantContractId;
+    this.tenantId = tenantInfo.tenantId;
+  }
+
+  async ResetTenantId(){
+    const {objectId} = await this.UserWalletObjectInfo();
+    await this.client.ResetTenantId({objectId});
+    this.tenantId = this.client.TenantId({objectId});
+    this.tenantContractId = this.client.TenantContractId({objectId});
   }
 
   /**

package/src/client/Contracts.js

@@ -11,7 +11,8 @@ const {
   ValidateAddress,
   ValidateParameters,
   ValidatePresence,
-  ValidateObject, ValidateVersion
+  ValidateObject,
+  ValidateVersion
 } = require("../Validation");
 const Utils=require("../Utils");
 
@@ -579,19 +580,7 @@ exports.SendFunds = async function({recipient, ether}) {
   return await transaction.wait();
 };
 
-/**
- * Retrieve the ID of the tenant contract for the specified object
- *
- * @methodGroup Tenant
- * @namedParams
- * @param {string=} contractAddress - The address of the object
- * @param {string=} objectId - The ID of the object
- * @param {string=} versionHash - A version hash of the object
- *
- * @returns {Promise<string|undefined>}
- */
-exports.TenantContractId = async function({contractAddress, objectId, versionHash}) {
-
+const GetObjectIDAndContractAddress = async function({contractAddress, objectId, versionHash}){
   if(contractAddress){
     ValidateAddress(contractAddress);
     objectId = Utils.AddressToObjectId(contractAddress);
@@ -606,32 +595,165 @@ exports.TenantContractId = async function({contractAddress, objectId, versionHas
     throw Error("contractAddress or objectId or versionHash not specified");
   }
 
-  const hasGetMetaMethod = await this.authClient.ContractHasMethod({
-    contractAddress: contractAddress,
-    methodName: "getMeta"
-  });
+  return {
+    contractAddress,
+    objectId
+  };
+};
+
+/**
+ * Retrieve the ID of the tenant admin group set for the specified object
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} contractAddress - The address of the object
+ * @param {string=} objectId - The ID of the object
+ * @param {string=} versionHash - A version hash of the object
+ *
+ * @returns {Promise<string|undefined>}
+ */
+exports.TenantId = async function({contractAddress, objectId, versionHash}) {
 
-  if(hasGetMetaMethod) {
-    const tenantContractId = await this.ContractMetadata({
-      contractAddress:contractAddress,
-      metadataKey:"_ELV_TENANT_ID"
+  objectInfo = await GetObjectIDAndContractAddress({contractAddress, objectId, versionHash});
+  contractAddress = objectInfo.contractAddress;
+  objectId = objectInfo.objectId;
+
+  let tenantId;
+  try {
+    const hasGetMetaMethod = await this.authClient.ContractHasMethod({
+      contractAddress: contractAddress,
+      methodName: "getMeta"
     });
-    if(tenantContractId !== "") {
-      return tenantContractId;
+
+    if(hasGetMetaMethod) {
+      tenantId = await this.ContractMetadata({
+        contractAddress:contractAddress,
+        metadataKey:"_tenantId"
+      });
     }
+
+    // If the getMeta method does not exist or is not set in the contract, check the fabric metadata.
+    if(tenantId === undefined) {
+      const libraryId = await this.ContentObjectLibraryId({ objectId });
+
+      tenantId = await this.ContentObjectMetadata({
+        libraryId,
+        objectId,
+        metadataSubtree: "tenantId",
+      });
+    }
+    return tenantId;
+  } catch(e) {
+    return "";
   }
+};
 
-  const libraryId = await this.ContentObjectLibraryId({ objectId });
+/**
+ * Retrieve the ID of the tenant contract for the specified object
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} contractAddress - The address of the object
+ * @param {string=} objectId - The ID of the object
+ * @param {string=} versionHash - A version hash of the object
+ *
+ * @returns {Promise<string|undefined>}
+ */
+exports.TenantContractId = async function({contractAddress, objectId, versionHash}) {
 
-  return await this.ContentObjectMetadata({
-    libraryId,
-    objectId,
-    metadataSubtree: "tenantContractId",
+  objectInfo = await GetObjectIDAndContractAddress({contractAddress, objectId, versionHash});
+  contractAddress = objectInfo.contractAddress;
+  objectId = objectInfo.objectId;
+
+  try {
+    const hasGetMetaMethod = await this.authClient.ContractHasMethod({
+      contractAddress: contractAddress,
+      methodName: "getMeta"
+    });
+    let tenantContractId;
+    if(hasGetMetaMethod) {
+      tenantContractId = await this.ContractMetadata({
+        contractAddress:contractAddress,
+        metadataKey:"_ELV_TENANT_ID"
+      });
+    }
+
+    // If the getMeta method does not exist or is not set in the contract, check the fabric metadata.
+    if(tenantContractId === undefined) {
+      const libraryId = await this.ContentObjectLibraryId({ objectId });
+
+      tenantContractId = await this.ContentObjectMetadata({
+        libraryId,
+        objectId,
+        metadataSubtree: "tenantContractId",
+      });
+    }
+    return tenantContractId;
+  } catch(e) {
+    return "";
+  }
+};
+
+/**
+ * Set the tenant contract ID and tenant admin group ID for the specified object
+ * when tenant admin group ID is provided
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} contractAddress - The address of the object
+ * @param {string=} objectId - The ID of the object
+ * @param {string=} versionHash - A version hash of the object
+ * @param {string} tenantContractId - The tenant contract ID to set
+ * @param {string} tenantId - The tenant ID to set
+ *
+ * @returns {Promise<{tenantId: (undefined|string), tenantContractId}>}
+ */
+exports.SetTenantId = async function({contractAddress, objectId, versionHash, tenantId}) {
+  objectInfo = await GetObjectIDAndContractAddress({contractAddress, objectId, versionHash});
+  contractAddress = objectInfo.contractAddress;
+  objectId = objectInfo.objectId;
+
+  const objectVersion = await this.authClient.AccessType(objectId);
+  if(objectVersion !== this.authClient.ACCESS_TYPES.GROUP &&
+    objectVersion !== this.authClient.ACCESS_TYPES.WALLET &&
+    objectVersion !== this.authClient.ACCESS_TYPES.LIBRARY &&
+    objectVersion !== this.authClient.ACCESS_TYPES.TYPE &&
+    objectVersion !== this.authClient.ACCESS_TYPES.TENANT) {
+    throw Error(`Invalid object ID: ${objectId}, 
+    applicable only for wallet,group, library or content_type object.`);
+  }
+
+  ValidateObject(tenantId);
+
+  if(!tenantId.startsWith("iten") || !Utils.ValidHash(tenantId)) {
+    throw Error(`Invalid tenant ID: ${tenantId}`);
+  }
+
+  const version = await this.authClient.AccessType(tenantId);
+  if(version !== this.authClient.ACCESS_TYPES.GROUP) {
+    throw Error("Invalid tenant ID: " + tenantId);
+  }
+
+  // get tenantContractId set for the tenant admin group
+  tenantContractId = await this.TenantContractId({
+    objectId: tenantId
   });
+  if(tenantContractId){
+    return await this.SetTenantContractId({
+      contractAddress,
+      objectId,
+      versionHash,
+      tenantContractId
+    });
+  } else {
+    throw Error("Invalid tenantId: tenant contract id not found");
+  }
 };
 
+
 /**
- * Set the tenant contract ID for the specified object
+ * Set the tenant contract ID and tenant admin group ID for the specified object
+ * when tenant contract ID is provided
  *
  * @methodGroup Tenant
  * @namedParams
@@ -644,19 +766,20 @@ exports.TenantContractId = async function({contractAddress, objectId, versionHas
  */
 exports.SetTenantContractId = async function({contractAddress, objectId, versionHash, tenantContractId}) {
 
-  if(contractAddress){
-    ValidateAddress(contractAddress);
-    objectId = Utils.AddressToObjectId(contractAddress);
-  } else if(versionHash){
-    ValidateVersion(versionHash);
-    objectId = this.utils.DecodeVersionHash(versionHash).objectId;
-    contractAddress = Utils.HashToAddress(objectId);
-  } else if(objectId){
-    ValidateObject(objectId);
-    contractAddress=Utils.HashToAddress(objectId);
-  } else {
-    throw Error("contractAddress or objectId or versionHash not specified");
+  objectInfo = await GetObjectIDAndContractAddress({contractAddress, objectId, versionHash});
+  contractAddress = objectInfo.contractAddress;
+  objectId = objectInfo.objectId;
+
+  const objectVersion = await this.authClient.AccessType(objectId);
+  if(objectVersion !== this.authClient.ACCESS_TYPES.GROUP &&
+    objectVersion !== this.authClient.ACCESS_TYPES.WALLET &&
+    objectVersion !== this.authClient.ACCESS_TYPES.LIBRARY &&
+    objectVersion !== this.authClient.ACCESS_TYPES.TYPE &&
+    objectVersion !== this.authClient.ACCESS_TYPES.TENANT) {
+    throw Error(`Invalid object ID: ${objectId}, 
+    applicable only for wallet,group, library or content_type object.`);
   }
+
   ValidateObject(tenantContractId);
 
   if(tenantContractId && (!tenantContractId.startsWith("iten") || !Utils.ValidHash(tenantContractId))) {
@@ -727,3 +850,82 @@ exports.SetTenantContractId = async function({contractAddress, objectId, version
     tenantId: !tenantAdminGroupAddress ? undefined : `iten${Utils.AddressToHash(tenantAdminGroupAddress)}`
   };
 };
+
+/**
+ * Remove the tenant contract ID and tenant admin group ID for the specified object
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} contractAddress - The address of the object
+ * @param {string=} objectId - The ID of the object
+ * @param {string=} versionHash - A version hash of the object
+ *
+ * @returns {Promise<void>}
+ */
+exports.ResetTenantId = async function({contractAddress, objectId, versionHash}) {
+
+  objectInfo = await GetObjectIDAndContractAddress({contractAddress, objectId, versionHash});
+  contractAddress = objectInfo.contractAddress;
+  objectId = objectInfo.objectId;
+
+  const objectVersion = await this.authClient.AccessType(objectId);
+  if(objectVersion !== this.authClient.ACCESS_TYPES.GROUP &&
+    objectVersion !== this.authClient.ACCESS_TYPES.WALLET &&
+    objectVersion !== this.authClient.ACCESS_TYPES.LIBRARY &&
+    objectVersion !== this.authClient.ACCESS_TYPES.TYPE &&
+    objectVersion !== this.authClient.ACCESS_TYPES.TENANT) {
+    throw Error(`Invalid object ID: ${objectId}, 
+    applicable only for wallet,group, library or content_type object.`);
+  }
+
+  let tenantContractId = this.TenantContractId({objectId});
+  let tenantId = this.TenantId({objectId});
+
+  if(tenantContractId || tenantId){
+    const hasPutMetaMethod = await this.authClient.ContractHasMethod({
+      contractAddress: contractAddress,
+      methodName: "putMeta"
+    });
+
+    if(hasPutMetaMethod) {
+
+      await this.ReplaceContractMetadata({
+        contractAddress: contractAddress,
+        metadataKey: "_ELV_TENANT_ID",
+        metadata: ""
+      });
+
+      await this.ReplaceContractMetadata({
+        contractAddress: contractAddress,
+        metadataKey: "_tenantId",
+        metadata: ""
+      });
+
+    } else {
+      const libraryId = await this.ContentObjectLibraryId({ objectId });
+      const editRequest = await this.EditContentObject({libraryId, objectId});
+
+      await this.MergeMetadata({
+        libraryId,
+        objectId,
+        writeToken: editRequest.write_token,
+        metadata:  {
+          tenantContractId: undefined,
+          tenantId: undefined
+        },
+      });
+
+      await this.FinalizeContentObject({
+        libraryId,
+        objectId,
+        writeToken: editRequest.write_token,
+        commitMessage: "remove tenant_contract_id"
+      });
+    }
+  } else {
+    // eslint-disable-next-line no-console
+    console.warn("No tenant ID associated with current tenant.");
+  }
+};
+
+

package/src/client/LiveConf.js

@@ -508,7 +508,7 @@ class LiveConf {
       elem.media_type = 1;
       elem.stream_name = "video";
       elem.stream_index = 0;
-      elem.representation = "videovideo_" + videoStream.width + "x" + videoStream.height + "_h264@" + elem.bit_rate;
+      elem.representation = "videovideo_" + elem.width + "x" + elem.height + "_h264@" + elem.bit_rate;
       conf.live_recording.recording_config.recording_params.ladder_specs.push(elem);
     }
     // Currently the recording bitrate is the top bitrate of the ladder (it will be configurable separately in the future)