@eluvio/elv-client-js 4.0.104 → 4.0.107

package/dist/src/client/NFT.js

@@ -1,8 +1,8 @@
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
  * Methods for creating and managing NFTs
  *

package/dist/src/walletClient/ClientMethods.js

@@ -1,8 +1,8 @@
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Utils = require("../Utils");
 var UrlJoin = require("url-join");
 var _require = require("./Utils"),

package/dist/src/walletClient/Profile.js

@@ -2,8 +2,8 @@ var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _typeof = require("@babel/runtime/helpers/typeof");
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Utils = require("../Utils");
 var UrlJoin = require("url-join");
 var StateStorePath = function StateStorePath(_ref) {

package/dist/src/walletClient/Utils.js

@@ -2,8 +2,8 @@ var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _slicedToArray = require("@babel/runtime/helpers/slicedToArray");
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Utils = require("../Utils");
 var RarityToPercentage = function RarityToPercentage(rarity) {
   if (!rarity) {

package/dist/src/walletClient/index.js

@@ -7,8 +7,8 @@ var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
 var _excluded = ["code", "address", "type", "authToken", "expiresAt"];
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var _require = require("../ElvClient"),
   ElvClient = _require.ElvClient;
 var Configuration = require("./Configuration");
@@ -79,7 +79,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     this.utils = client.utils;
     this.ForbiddenMethods = ElvWalletClient.ForbiddenMethods;
   }
-  _createClass(ElvWalletClient, [{
+  return _createClass(ElvWalletClient, [{
     key: "Log",
     value: function Log(message) {
       var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -136,7 +136,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "PersonalSign",
-    value: function () {
+    value: (function () {
       var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
         var message, parameters, url;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -265,7 +265,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _PersonalSign.apply(this, arguments);
       }
       return PersonalSign;
-    }()
+    }())
   }, {
     key: "LogInURL",
     value: function () {
@@ -344,7 +344,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "LogIn",
-    value: function () {
+    value: (function () {
       var _LogIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref5) {
         var _this = this;
         var _ref5$method, method, provider, _ref5$mode, mode, callbackUrl, marketplaceParams, _ref5$clearLogin, clearLogin, callback, loginUrl;
@@ -463,9 +463,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @methodGroup Login
      */
+    )
   }, {
     key: "LogOut",
-    value: function () {
+    value: (function () {
       var _LogOut = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
         return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
@@ -508,7 +509,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _LogOut.apply(this, arguments);
       }
       return LogOut;
-    }()
+    }())
   }, {
     key: "TokenStatus",
     value: function () {
@@ -548,7 +549,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Authenticate",
-    value: function () {
+    value: (function () {
       var _Authenticate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref7) {
         var token, decodedToken;
         return _regeneratorRuntime.wrap(function _callee10$(_context10) {
@@ -614,9 +615,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * - signingToken - Identical to `authToken`, but also includes the ability to perform arbitrary signatures with the custodial wallet. This token should be protected and should not be
      * shared with third parties.
      */
+    )
   }, {
     key: "AuthenticateOAuth",
-    value: function () {
+    value: (function () {
       var _AuthenticateOAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref8) {
         var idToken, tenantId, email, signerURIs, _ref8$shareEmail, shareEmail, _ref8$extraData, extraData, nonce, _ref8$createRemoteTok, createRemoteToken, _ref8$force, force, tokenDuration, fabricToken, expiresAt, tokenResponse, address, decodedToken;
         return _regeneratorRuntime.wrap(function _callee11$(_context11) {
@@ -653,6 +655,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
               return this.client.signer.RetrieveCSAT({
                 email: email,
                 nonce: nonce,
+                tenantId: tenantId,
                 force: force
               });
             case 12:
@@ -743,9 +746,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * @returns {Promise<string>} - Returns an authorization token that can be used to initialize the client using <a href="#Authenticate">Authenticate</a>.
      * Save this token to avoid having to reauthenticate. This token expires after 24 hours.
      */
+    )
   }, {
     key: "AuthenticateExternalWallet",
-    value: function () {
+    value: (function () {
       var _AuthenticateExternalWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref9) {
         var _this2 = this;
         var address, _ref9$tokenDuration, tokenDuration, _ref9$walletName, walletName, Sign, expiresAt, fabricToken;
@@ -814,6 +818,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @returns {string} - The client auth token
      */
+    )
   }, {
     key: "ClientAuthToken",
     value: function ClientAuthToken() {
@@ -1114,8 +1119,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 produceLinkUrls: true,
                 authorizationToken: this.publicStaticToken,
                 noAuth: true,
-                select: ["info/marketplace_order", "tenants/*/.", "tenants/*/info/branding", "tenants/*/marketplaces/*/.", "tenants/*/marketplaces/*/info/tenant_id", "tenants/*/marketplaces/*/info/tenant_name", "tenants/*/marketplaces/*/info/branding", "tenants/*/marketplaces/*/info/storefront/background", "tenants/*/marketplaces/*/info/storefront/background_mobile"],
-                remove: ["tenants/*/info/branding/wallet_css", "tenants/*/marketplaces/*/info/branding/custom_css"]
+                select: ["info/marketplace_order", "tenants/*/.", "tenants/*/info/branding/show", "tenants/*/info/branding/name", "tenants/*/marketplaces/*/.", "tenants/*/marketplaces/*/info/tenant_id", "tenants/*/marketplaces/*/info/tenant_name", "tenants/*/marketplaces/*/info/branding/show", "tenants/*/marketplaces/*/info/branding/name"]
               });
             case 5:
               metadata = _context18.sent;
@@ -1978,7 +1982,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Initialize",
-    value: function () {
+    value: (function () {
       var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref24) {
         var client, _ref24$appId, appId, _ref24$network, network, _ref24$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref24$storeAuthToken, storeAuthToken, _ref24$skipMarketplac, skipMarketplaceLoad, _ref25, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
         return _regeneratorRuntime.wrap(function _callee25$(_context25) {
@@ -2096,9 +2100,8 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _Initialize.apply(this, arguments);
       }
       return Initialize;
-    }()
+    }())
   }]);
-  return ElvWalletClient;
 }();
 Object.assign(ElvWalletClient.prototype, require("./ClientMethods"));
 Object.assign(ElvWalletClient.prototype, require("./Profile"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.104",
+  "version": "4.0.107",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",

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/abr_profiles/abr_profile_live_drm.js

@@ -1863,6 +1863,28 @@ const AbrProfileLiveDrm = {
     }
   },
   "playout_formats": {
+    "dash-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "min_buffer_length": 2,
+        "type": "ProtoDash"
+      }
+    },
+    "dash-widevine": {
+      "drm": {
+        "content_id": "",
+        "enc_scheme_name": "cenc",
+        "license_servers": [],
+        "type": "DrmWidevine"
+      },
+      "protocol": {
+        "min_buffer_length": 2,
+        "type": "ProtoDash"
+      }
+    },
     "hls-fairplay": {
       "drm": {
         "enc_scheme_name": "cbcs",

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.");
+  }
+};
+
+