@eluvio/elv-client-js 3.1.81 → 3.1.85

package/dist/src/ElvClient.js

@@ -619,18 +619,17 @@ function () {
   }, {
     key: "SetRemoteSigner",
     value: function SetRemoteSigner(_ref9) {
-      var idToken, authToken, tenantId, address, extraData, signer;
+      var idToken, authToken, tenantId, extraData, signer;
       return _regeneratorRuntime.async(function SetRemoteSigner$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
-              idToken = _ref9.idToken, authToken = _ref9.authToken, tenantId = _ref9.tenantId, address = _ref9.address, extraData = _ref9.extraData;
+              idToken = _ref9.idToken, authToken = _ref9.authToken, tenantId = _ref9.tenantId, extraData = _ref9.extraData;
               signer = new RemoteSigner({
                 rpcUris: this.authServiceURIs,
                 idToken: idToken,
                 authToken: authToken,
                 tenantId: tenantId,
-                address: address,
                 provider: this.ethClient.provider,
                 extraData: extraData
               });

package/dist/src/RemoteSigner.js

@@ -31,7 +31,6 @@ function (_Ethers$Signer) {
     var rpcUris = _ref.rpcUris,
         idToken = _ref.idToken,
         authToken = _ref.authToken,
-        address = _ref.address,
         tenantId = _ref.tenantId,
         provider = _ref.provider,
         _ref$extraData = _ref.extraData,
@@ -47,8 +46,6 @@ function (_Ethers$Signer) {
     _this.idToken = idToken;
     _this.tenantId = tenantId;
     _this.authToken = authToken;
-    _this.address = address ? Utils.FormatAddress(address) : undefined;
-    _this.id = _this.address ? "ikms".concat(Utils.AddressToHash(_this.address)) : undefined;
     _this.extraLoginData = extraData || {};
     _this.provider = provider;
     return _this;
@@ -57,7 +54,7 @@ function (_Ethers$Signer) {
   _createClass(RemoteSigner, [{
     key: "Initialize",
     value: function Initialize() {
-      var _ref2, addr, eth, token;
+      var _ref2, addr, eth, token, keys, address;
 
       return _regeneratorRuntime.async(function Initialize$(_context) {
         while (1) {
@@ -93,9 +90,35 @@ function (_Ethers$Signer) {
               this.id = eth;
 
             case 10:
+              if (this.address) {
+                _context.next = 16;
+                break;
+              }
+
+              _context.next = 13;
+              return _regeneratorRuntime.awrap(Utils.ResponseToJson(this.HttpClient.Request({
+                method: "GET",
+                path: UrlJoin("as", "wlt", "keys"),
+                headers: {
+                  Authorization: "Bearer ".concat(this.authToken)
+                }
+              })));
+
+            case 13:
+              keys = _context.sent;
+              address = keys.eth[0];
+
+              if (address && address.startsWith("0x")) {
+                this.address = address;
+              } else {
+                this.address = Utils.HashToAddress(keys.eth[0]);
+              }
+
+            case 16:
+              this.id = this.address ? "ikms".concat(Utils.AddressToHash(this.address)) : undefined;
               this.signer = this.provider.getSigner(this.address);
 
-            case 11:
+            case 18:
             case "end":
               return _context.stop();
           }

package/dist/src/Utils.js

@@ -21,6 +21,8 @@ var BigNumber = require("bignumber.js")["default"];
 var VarInt = require("varint");
 
 var URI = require("urijs");
+
+var keccak256 = require("ethers").utils.keccak256;
 /**
  * @namespace
  * @description This is a utility namespace mostly containing functions for managing
@@ -163,11 +165,13 @@ var Utils = {
    * Convert contract address to multiformat hash
    *
    * @param {string} address - Address of contract
+   * @param {boolean} key - Whether or not the first param is a public key. Defaults to address type
    *
    * @returns {string} - Hash of contract address
    */
   AddressToHash: function AddressToHash(address) {
-    address = address.replace("0x", "");
+    var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    address = address.replace(key ? "0x04" : "0x", "");
     return bs58.encode(Buffer.from(address, "hex"));
   },
 
@@ -208,12 +212,14 @@ var Utils = {
    * Convert any content fabric ID to the corresponding contract address
    *
    * @param {string} hash - Hash to convert to address
+   * @param {boolean} key - Whether or not the first param is a key. Defaults to address type
    *
    * @returns {string} - Contract address of item
    */
   HashToAddress: function HashToAddress(hash) {
-    hash = hash.substr(4);
-    return Utils.FormatAddress("0x" + bs58.decode(hash).toString("hex"));
+    var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    hash = key ? hash : hash.substr(4);
+    return Utils.FormatAddress((key ? "0x04" : "0x") + bs58.decode(hash).toString("hex"));
   },
 
   /**
@@ -667,6 +673,20 @@ var Utils = {
         return JSON.parse(JSON.stringify(value));
     }
   },
+
+  /**
+   * Converts the given string to a public address
+   *
+   * @param key - Public key to convert to a public address
+   *
+   * @returns {string} - the public address
+   */
+  PublicKeyToAddress: function PublicKeyToAddress(key) {
+    var keyData = new Uint8Array(Buffer.from(key.replace("0x04", ""), "hex"));
+    var keccakHash = keccak256(keyData);
+    var address = "0x" + keccakHash.slice(26);
+    return Utils.FormatAddress(address);
+  },
   PLATFORM_NODE: "node",
   PLATFORM_WEB: "web",
   PLATFORM_REACT_NATIVE: "react-native",

package/dist/src/client/ContentAccess.js

@@ -2389,19 +2389,20 @@ exports.AvailableOfferings = function _callee30(_ref22) {
  * @param {Object=} context - Additional audience data to include in the authorization request.
  * - Note: Context must be a map of string->string
  * @param {Object=} authorizationToken - Additional authorization token for authorizing this request
+ * @param {Object=} options - Additional query parameters to pass when requesting available playout options, such as clipping parameters.
  */
 
 
 exports.PlayoutOptions = function _callee33(_ref24) {
   var _this9 = this;
 
-  var offeringURI, objectId, versionHash, writeToken, linkPath, _ref24$signedLink, signedLink, _ref24$protocols, protocols, _ref24$handler, handler, _ref24$offering, offering, playoutType, _ref24$drms, drms, context, _ref24$hlsjsProfile, hlsjsProfile, authorizationToken, uriInfo, libraryId, offeringPath, link, _ref25, path, linkTarget, audienceData, authorization, queryParams, playoutOptions, playoutMap, sessionId, multiview, i, option, protocol, drm, playoutPath, licenseServers, cert, method, certUrl, protocolMatch, drmMatch;
+  var offeringURI, objectId, versionHash, writeToken, linkPath, _ref24$signedLink, signedLink, _ref24$protocols, protocols, _ref24$handler, handler, _ref24$offering, offering, playoutType, _ref24$drms, drms, context, _ref24$hlsjsProfile, hlsjsProfile, authorizationToken, _ref24$options, options, uriInfo, libraryId, offeringPath, link, _ref25, path, linkTarget, audienceData, authorization, queryParams, playoutOptions, playoutMap, sessionId, multiview, i, option, protocol, drm, playoutPath, licenseServers, cert, method, certUrl, protocolMatch, drmMatch;
 
   return _regeneratorRuntime.async(function _callee33$(_context33) {
     while (1) {
       switch (_context33.prev = _context33.next) {
         case 0:
-          offeringURI = _ref24.offeringURI, objectId = _ref24.objectId, versionHash = _ref24.versionHash, writeToken = _ref24.writeToken, linkPath = _ref24.linkPath, _ref24$signedLink = _ref24.signedLink, signedLink = _ref24$signedLink === void 0 ? false : _ref24$signedLink, _ref24$protocols = _ref24.protocols, protocols = _ref24$protocols === void 0 ? ["dash", "hls"] : _ref24$protocols, _ref24$handler = _ref24.handler, handler = _ref24$handler === void 0 ? "playout" : _ref24$handler, _ref24$offering = _ref24.offering, offering = _ref24$offering === void 0 ? "default" : _ref24$offering, playoutType = _ref24.playoutType, _ref24$drms = _ref24.drms, drms = _ref24$drms === void 0 ? [] : _ref24$drms, context = _ref24.context, _ref24$hlsjsProfile = _ref24.hlsjsProfile, hlsjsProfile = _ref24$hlsjsProfile === void 0 ? true : _ref24$hlsjsProfile, authorizationToken = _ref24.authorizationToken;
+          offeringURI = _ref24.offeringURI, objectId = _ref24.objectId, versionHash = _ref24.versionHash, writeToken = _ref24.writeToken, linkPath = _ref24.linkPath, _ref24$signedLink = _ref24.signedLink, signedLink = _ref24$signedLink === void 0 ? false : _ref24$signedLink, _ref24$protocols = _ref24.protocols, protocols = _ref24$protocols === void 0 ? ["dash", "hls"] : _ref24$protocols, _ref24$handler = _ref24.handler, handler = _ref24$handler === void 0 ? "playout" : _ref24$handler, _ref24$offering = _ref24.offering, offering = _ref24$offering === void 0 ? "default" : _ref24$offering, playoutType = _ref24.playoutType, _ref24$drms = _ref24.drms, drms = _ref24$drms === void 0 ? [] : _ref24$drms, context = _ref24.context, _ref24$hlsjsProfile = _ref24.hlsjsProfile, hlsjsProfile = _ref24$hlsjsProfile === void 0 ? true : _ref24$hlsjsProfile, authorizationToken = _ref24.authorizationToken, _ref24$options = _ref24.options, options = _ref24$options === void 0 ? {} : _ref24$options;
 
           if (!offeringURI) {
             _context33.next = 8;
@@ -2558,10 +2559,10 @@ exports.PlayoutOptions = function _callee33(_ref24) {
           };
 
           authorization = [_context33.t9, _context33.t10].flat().filter(_context33.t11);
-          queryParams = {
+          queryParams = _objectSpread({
             authorization: authorization,
             resolve: !!linkPath
-          };
+          }, options);
           _context33.t12 = Object;
           _context33.next = 61;
           return _regeneratorRuntime.awrap(this.utils.ResponseToJson(this.HttpClient.Request({
@@ -2825,17 +2826,18 @@ exports.PlayoutOptions = function _callee33(_ref24) {
  * @param {Object=} context - Additional audience data to include in the authorization request
  * - Note: Context must be a map of string->string
  * @param {Object=} authorizationToken - Additional authorization token for authorizing this request
+ * @param {Object=} options - Additional query parameters to pass when requesting available playout options, such as clipping parameters.
  */
 
 
 exports.BitmovinPlayoutOptions = function _callee34(_ref27) {
-  var objectId, versionHash, writeToken, linkPath, _ref27$signedLink, signedLink, _ref27$protocols, protocols, _ref27$drms, drms, _ref27$handler, handler, _ref27$offering, offering, playoutType, context, authorizationToken, playoutOptions, _ref28, linkTarget, authorization, config;
+  var objectId, versionHash, writeToken, linkPath, _ref27$signedLink, signedLink, _ref27$protocols, protocols, _ref27$drms, drms, _ref27$handler, handler, _ref27$offering, offering, playoutType, context, authorizationToken, _ref27$options, options, playoutOptions, _ref28, linkTarget, authorization, config;
 
   return _regeneratorRuntime.async(function _callee34$(_context34) {
     while (1) {
       switch (_context34.prev = _context34.next) {
         case 0:
-          objectId = _ref27.objectId, versionHash = _ref27.versionHash, writeToken = _ref27.writeToken, linkPath = _ref27.linkPath, _ref27$signedLink = _ref27.signedLink, signedLink = _ref27$signedLink === void 0 ? false : _ref27$signedLink, _ref27$protocols = _ref27.protocols, protocols = _ref27$protocols === void 0 ? ["dash", "hls"] : _ref27$protocols, _ref27$drms = _ref27.drms, drms = _ref27$drms === void 0 ? [] : _ref27$drms, _ref27$handler = _ref27.handler, handler = _ref27$handler === void 0 ? "playout" : _ref27$handler, _ref27$offering = _ref27.offering, offering = _ref27$offering === void 0 ? "default" : _ref27$offering, playoutType = _ref27.playoutType, context = _ref27.context, authorizationToken = _ref27.authorizationToken;
+          objectId = _ref27.objectId, versionHash = _ref27.versionHash, writeToken = _ref27.writeToken, linkPath = _ref27.linkPath, _ref27$signedLink = _ref27.signedLink, signedLink = _ref27$signedLink === void 0 ? false : _ref27$signedLink, _ref27$protocols = _ref27.protocols, protocols = _ref27$protocols === void 0 ? ["dash", "hls"] : _ref27$protocols, _ref27$drms = _ref27.drms, drms = _ref27$drms === void 0 ? [] : _ref27$drms, _ref27$handler = _ref27.handler, handler = _ref27$handler === void 0 ? "playout" : _ref27$handler, _ref27$offering = _ref27.offering, offering = _ref27$offering === void 0 ? "default" : _ref27$offering, playoutType = _ref27.playoutType, context = _ref27.context, authorizationToken = _ref27.authorizationToken, _ref27$options = _ref27.options, options = _ref27$options === void 0 ? {} : _ref27$options;
           versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
 
           if (!objectId) {
@@ -2856,7 +2858,8 @@ exports.BitmovinPlayoutOptions = function _callee34(_ref27) {
             playoutType: playoutType,
             hlsjsProfile: false,
             context: context,
-            authorizationToken: authorizationToken
+            authorizationToken: authorizationToken,
+            options: options
           }));
 
         case 5:

package/dist/src/client/ContentManagement.js

@@ -32,8 +32,7 @@ var _require = require("../Validation"),
     ValidateVersion = _require.ValidateVersion,
     ValidateWriteToken = _require.ValidateWriteToken,
     ValidateParameters = _require.ValidateParameters,
-    ValidatePresence = _require.ValidatePresence,
-    ValidateAddress = _require.ValidateAddress;
+    ValidatePresence = _require.ValidatePresence;
 
 exports.SetVisibility = function _callee(_ref) {
   var id, visibility, hasSetVisibility, event;
@@ -448,19 +447,20 @@ exports.CreateContentType = function _callee3(_ref4) {
  * @param {Object=} metadata - Metadata of library object
  * @param {string=} kmsId - ID of the KMS to use for content in this library. If not specified,
  * the default KMS will be used.
+ * @param {string=} tenantId - ID of the tenant to use for this library
  *
  * @returns {Promise<string>} - Library ID of created library
  */
 
 
 exports.CreateContentLibrary = function _callee4(_ref6) {
-  var name, description, image, imageName, _ref6$metadata, metadata, kmsId, _ref7, contractAddress, tenantId, libraryId, objectId, editResponse;
+  var name, description, image, imageName, _ref6$metadata, metadata, kmsId, tenantId, _ref7, contractAddress, libraryId, objectId, editResponse;
 
   return _regeneratorRuntime.async(function _callee4$(_context5) {
     while (1) {
       switch (_context5.prev = _context5.next) {
         case 0:
-          name = _ref6.name, description = _ref6.description, image = _ref6.image, imageName = _ref6.imageName, _ref6$metadata = _ref6.metadata, metadata = _ref6$metadata === void 0 ? {} : _ref6$metadata, kmsId = _ref6.kmsId;
+          name = _ref6.name, description = _ref6.description, image = _ref6.image, imageName = _ref6.imageName, _ref6$metadata = _ref6.metadata, metadata = _ref6$metadata === void 0 ? {} : _ref6$metadata, kmsId = _ref6.kmsId, tenantId = _ref6.tenantId;
 
           if (kmsId) {
             _context5.next = 9;
@@ -488,25 +488,32 @@ exports.CreateContentLibrary = function _callee4(_ref6) {
         case 13:
           _ref7 = _context5.sent;
           contractAddress = _ref7.contractAddress;
-          _context5.next = 17;
+
+          if (tenantId) {
+            _context5.next = 19;
+            break;
+          }
+
+          _context5.next = 18;
           return _regeneratorRuntime.awrap(this.userProfileClient.TenantId());
 
-        case 17:
+        case 18:
           tenantId = _context5.sent;
 
+        case 19:
           if (!tenantId) {
-            _context5.next = 21;
+            _context5.next = 22;
             break;
           }
 
-          _context5.next = 21;
+          _context5.next = 22;
           return _regeneratorRuntime.awrap(this.CallContractMethod({
             contractAddress: contractAddress,
             methodName: "putMeta",
             methodArgs: ["_tenantId", tenantId]
           }));
 
-        case 21:
+        case 22:
           metadata = _objectSpread({}, metadata, {
             name: name,
             description: description,
@@ -520,15 +527,15 @@ exports.CreateContentLibrary = function _callee4(_ref6) {
           this.Log("Contract address: ".concat(contractAddress)); // Set library content object type and metadata on automatically created library object
 
           objectId = libraryId.replace("ilib", "iq__");
-          _context5.next = 28;
+          _context5.next = 29;
           return _regeneratorRuntime.awrap(this.EditContentObject({
             libraryId: libraryId,
             objectId: objectId
           }));
 
-        case 28:
+        case 29:
           editResponse = _context5.sent;
-          _context5.next = 31;
+          _context5.next = 32;
           return _regeneratorRuntime.awrap(this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
@@ -536,8 +543,8 @@ exports.CreateContentLibrary = function _callee4(_ref6) {
             writeToken: editResponse.write_token
           }));
 
-        case 31:
-          _context5.next = 33;
+        case 32:
+          _context5.next = 34;
           return _regeneratorRuntime.awrap(this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
@@ -545,24 +552,24 @@ exports.CreateContentLibrary = function _callee4(_ref6) {
             commitMessage: "Create library"
           }));
 
-        case 33:
+        case 34:
           if (!image) {
-            _context5.next = 36;
+            _context5.next = 37;
             break;
           }
 
-          _context5.next = 36;
+          _context5.next = 37;
           return _regeneratorRuntime.awrap(this.SetContentLibraryImage({
             libraryId: libraryId,
             image: image,
             imageName: imageName
           }));
 
-        case 36:
+        case 37:
           this.Log("Library ".concat(libraryId, " created"));
           return _context5.abrupt("return", libraryId);
 
-        case 38:
+        case 39:
         case "end":
           return _context5.stop();
       }
@@ -1246,7 +1253,6 @@ exports.CopyContentObject = function _callee12(_ref15) {
  * @param {string} libraryId - ID of the library
  * @param {string} objectId - ID of the object
  * @param {string} publicKey - Public key for the target cap
- * @param {string} publicAddress - Public address for the target cap key
  * @param {string} writeToken - Write token for the content object - If specified, info will be retrieved from the write draft instead of creating a new draft and finalizing
  *
  * @returns {Promise<Object>}
@@ -1254,37 +1260,37 @@ exports.CopyContentObject = function _callee12(_ref15) {
 
 
 exports.CreateNonOwnerCap = function _callee13(_ref17) {
-  var objectId, libraryId, publicKey, publicAddress, writeToken, userCapKey, userCapValue, userConk, targetUserCapKey, targetUserCapValue, finalize;
+  var objectId, libraryId, publicKey, writeToken, userCapKey, userCapValue, userConk, publicAddress, targetUserCapKey, targetUserCapValue, finalize;
   return _regeneratorRuntime.async(function _callee13$(_context14) {
     while (1) {
       switch (_context14.prev = _context14.next) {
         case 0:
-          objectId = _ref17.objectId, libraryId = _ref17.libraryId, publicKey = _ref17.publicKey, publicAddress = _ref17.publicAddress, writeToken = _ref17.writeToken;
-          publicAddress = ValidateAddress(publicAddress);
+          objectId = _ref17.objectId, libraryId = _ref17.libraryId, publicKey = _ref17.publicKey, writeToken = _ref17.writeToken;
           userCapKey = "eluv.caps.iusr".concat(this.utils.AddressToHash(this.signer.address));
-          _context14.next = 5;
+          _context14.next = 4;
           return _regeneratorRuntime.awrap(this.ContentObjectMetadata({
             objectId: objectId,
             libraryId: libraryId,
             metadataSubtree: userCapKey
           }));
 
-        case 5:
+        case 4:
           userCapValue = _context14.sent;
 
           if (userCapValue) {
-            _context14.next = 8;
+            _context14.next = 7;
             break;
           }
 
           throw Error("No user cap found for current user");
 
-        case 8:
-          _context14.next = 10;
+        case 7:
+          _context14.next = 9;
           return _regeneratorRuntime.awrap(this.Crypto.DecryptCap(userCapValue, this.signer.signingKey.privateKey));
 
-        case 10:
+        case 9:
           userConk = _context14.sent;
+          publicAddress = this.utils.PublicKeyToAddress(publicKey);
           targetUserCapKey = "eluv.caps.iusr".concat(this.utils.AddressToHash(publicAddress));
           _context14.next = 14;
           return _regeneratorRuntime.awrap(this.Crypto.EncryptConk(userConk, publicKey));

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.1.81",
+  "version": "3.1.85",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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

package/src/ElvClient.js

@@ -599,13 +599,12 @@ class ElvClient {
    * @param {string=} tenantId - If specified, user will be associated with the tenant
    * @param {Object=} extraData - Additional data to pass to the login API
    */
-  async SetRemoteSigner({idToken, authToken, tenantId, address, extraData}) {
+  async SetRemoteSigner({idToken, authToken, tenantId, extraData}) {
     const signer = new RemoteSigner({
       rpcUris: this.authServiceURIs,
       idToken,
       authToken,
       tenantId,
-      address,
       provider: this.ethClient.provider,
       extraData
     });

package/src/RemoteSigner.js

@@ -8,7 +8,6 @@ class RemoteSigner extends Ethers.Signer {
     rpcUris,
     idToken,
     authToken,
-    address,
     tenantId,
     provider,
     extraData={}
@@ -22,8 +21,6 @@ class RemoteSigner extends Ethers.Signer {
     this.tenantId = tenantId;
 
     this.authToken = authToken;
-    this.address = address ? Utils.FormatAddress(address) : undefined;
-    this.id = this.address ? `ikms${Utils.AddressToHash(this.address)}` : undefined;
     this.extraLoginData = extraData || {};
 
     this.provider = provider;
@@ -47,6 +44,27 @@ class RemoteSigner extends Ethers.Signer {
       this.id = eth;
     }
 
+    if(!this.address) {
+      const keys = await Utils.ResponseToJson(
+        this.HttpClient.Request({
+          method: "GET",
+          path: UrlJoin("as", "wlt", "keys"),
+          headers: {
+            Authorization: `Bearer ${this.authToken}`
+          }
+        })
+      );
+
+      const address = keys.eth[0];
+
+      if(address && address.startsWith("0x")) {
+        this.address = address;
+      } else {
+        this.address = Utils.HashToAddress(keys.eth[0]);
+      }
+    }
+
+    this.id = this.address ? `ikms${Utils.AddressToHash(this.address)}` : undefined;
     this.signer = this.provider.getSigner(this.address);
   }
 

package/src/Utils.js

@@ -5,6 +5,10 @@ const BigNumber = require("bignumber.js").default;
 const VarInt = require("varint");
 const URI = require("urijs");
 
+const {
+  keccak256
+} = require("ethers").utils;
+
 /**
  * @namespace
  * @description This is a utility namespace mostly containing functions for managing
@@ -149,11 +153,12 @@ const Utils = {
    * Convert contract address to multiformat hash
    *
    * @param {string} address - Address of contract
+   * @param {boolean} key - Whether or not the first param is a public key. Defaults to address type
    *
    * @returns {string} - Hash of contract address
    */
-  AddressToHash: (address) => {
-    address = address.replace("0x", "");
+  AddressToHash: (address, key=false) => {
+    address = address.replace(key ? "0x04" : "0x", "");
     return bs58.encode(Buffer.from(address, "hex"));
   },
 
@@ -194,12 +199,13 @@ const Utils = {
    * Convert any content fabric ID to the corresponding contract address
    *
    * @param {string} hash - Hash to convert to address
+   * @param {boolean} key - Whether or not the first param is a key. Defaults to address type
    *
    * @returns {string} - Contract address of item
    */
-  HashToAddress: (hash) => {
-    hash = hash.substr(4);
-    return Utils.FormatAddress("0x" + bs58.decode(hash).toString("hex"));
+  HashToAddress: (hash, key=false) => {
+    hash = key ? hash : hash.substr(4);
+    return Utils.FormatAddress((key ? "0x04" : "0x") + bs58.decode(hash).toString("hex"));
   },
 
   /**
@@ -505,6 +511,21 @@ const Utils = {
     }
   },
 
+  /**
+   * Converts the given string to a public address
+   *
+   * @param key - Public key to convert to a public address
+   *
+   * @returns {string} - the public address
+   */
+  PublicKeyToAddress: (key) => {
+    const keyData = new Uint8Array(Buffer.from(key.replace("0x04", ""), "hex"));
+    const keccakHash = keccak256(keyData);
+    const address = "0x" + keccakHash.slice(26);
+
+    return Utils.FormatAddress(address);
+  },
+
   PLATFORM_NODE: "node",
   PLATFORM_WEB: "web",
   PLATFORM_REACT_NATIVE: "react-native",

package/src/client/ContentAccess.js

@@ -1325,6 +1325,7 @@ exports.AvailableOfferings = async function({
  * @param {Object=} context - Additional audience data to include in the authorization request.
  * - Note: Context must be a map of string->string
  * @param {Object=} authorizationToken - Additional authorization token for authorizing this request
+ * @param {Object=} options - Additional query parameters to pass when requesting available playout options, such as clipping parameters.
  */
 exports.PlayoutOptions = async function({
   offeringURI,
@@ -1340,7 +1341,8 @@ exports.PlayoutOptions = async function({
   drms=[],
   context,
   hlsjsProfile=true,
-  authorizationToken
+  authorizationToken,
+  options={}
 }) {
   if(offeringURI) {
     const uriInfo = offeringURI.match(/(hq__[^/]+)\/rep\/([^/]+)\/([^/]+)\/options.json/);
@@ -1421,7 +1423,8 @@ exports.PlayoutOptions = async function({
 
   let queryParams = {
     authorization,
-    resolve: !!linkPath
+    resolve: !!linkPath,
+    ...options
   };
 
   const playoutOptions = Object.values(
@@ -1590,6 +1593,7 @@ exports.PlayoutOptions = async function({
  * @param {Object=} context - Additional audience data to include in the authorization request
  * - Note: Context must be a map of string->string
  * @param {Object=} authorizationToken - Additional authorization token for authorizing this request
+ * @param {Object=} options - Additional query parameters to pass when requesting available playout options, such as clipping parameters.
  */
 exports.BitmovinPlayoutOptions = async function({
   objectId,
@@ -1603,7 +1607,8 @@ exports.BitmovinPlayoutOptions = async function({
   offering="default",
   playoutType,
   context,
-  authorizationToken
+  authorizationToken,
+  options={}
 }) {
   versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
 
@@ -1624,7 +1629,8 @@ exports.BitmovinPlayoutOptions = async function({
     playoutType,
     hlsjsProfile: false,
     context,
-    authorizationToken
+    authorizationToken,
+    options
   });
 
   delete playoutOptions.playoutMethods;

package/src/client/ContentManagement.js

@@ -22,7 +22,6 @@ const {
   ValidateWriteToken,
   ValidateParameters,
   ValidatePresence,
-  ValidateAddress
 } = require("../Validation");
 
 exports.SetVisibility = async function({id, visibility}) {
@@ -243,6 +242,7 @@ exports.CreateContentType = async function({name, metadata={}, bitcode}) {
  * @param {Object=} metadata - Metadata of library object
  * @param {string=} kmsId - ID of the KMS to use for content in this library. If not specified,
  * the default KMS will be used.
+ * @param {string=} tenantId - ID of the tenant to use for this library
  *
  * @returns {Promise<string>} - Library ID of created library
  */
@@ -253,6 +253,7 @@ exports.CreateContentLibrary = async function({
   imageName,
   metadata={},
   kmsId,
+  tenantId
 }) {
   if(!kmsId) {
     kmsId = `ikms${this.utils.AddressToHash(await this.DefaultKMSAddress())}`;
@@ -265,7 +266,10 @@ exports.CreateContentLibrary = async function({
 
 
   // Set tenant ID on the library if the user is associated with a tenant
-  const tenantId = await this.userProfileClient.TenantId();
+  if(!tenantId) {
+    tenantId = await this.userProfileClient.TenantId();
+  }
+
   if(tenantId) {
     await this.CallContractMethod({
       contractAddress,
@@ -691,13 +695,11 @@ exports.CopyContentObject = async function({libraryId, originalVersionHash, opti
  * @param {string} libraryId - ID of the library
  * @param {string} objectId - ID of the object
  * @param {string} publicKey - Public key for the target cap
- * @param {string} publicAddress - Public address for the target cap key
  * @param {string} writeToken - Write token for the content object - If specified, info will be retrieved from the write draft instead of creating a new draft and finalizing
  *
  * @returns {Promise<Object>}
  */
-exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, publicAddress, writeToken}) {
-  publicAddress = ValidateAddress(publicAddress);
+exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, writeToken}) {
   const userCapKey = `eluv.caps.iusr${this.utils.AddressToHash(this.signer.address)}`;
   const userCapValue = await this.ContentObjectMetadata({objectId, libraryId, metadataSubtree: userCapKey});
 
@@ -707,6 +709,8 @@ exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, publ
 
   const userConk = await this.Crypto.DecryptCap(userCapValue, this.signer.signingKey.privateKey);
 
+  const publicAddress = this.utils.PublicKeyToAddress(publicKey);
+
   const targetUserCapKey = `eluv.caps.iusr${this.utils.AddressToHash(publicAddress)}`;
   const targetUserCapValue = await this.Crypto.EncryptConk(userConk, publicKey);
 

package/testScripts/InitializeTenant.js

@@ -16,7 +16,6 @@ const reportTypes = [
 
 const liveTypes = [
   { name: "Eluvio LIVE Drop Event Site", spec: require("../typeSpecs/DropEventSite") },
-  { name: "Eluvio LIVE Event Site", spec: require("../typeSpecs/EventSite") },
   { name: "Eluvio LIVE Marketplace", spec: require("../typeSpecs/Marketplace") },
   { name: "Eluvio LIVE Tenant", spec: require("../typeSpecs/EventTenant") },
   { name: "NFT Collection", spec: require("../typeSpecs/NFTCollection") },