@eluvio/elv-client-js 3.1.63 → 3.1.67

package/dist/src/client/NFT.js

@@ -51,18 +51,18 @@ exports.MintNFT = function _callee(_ref) {
           ValidatePresence("email or address", email || address);
           ValidatePresence("collectionId", collectionId);
           ValidatePresence("items", items);
-          ValidateObject(collectionId);
+          ValidateObject(collectionId); // If address not specified, make call to initialize address for email
 
-          if (address) {
-            _context.next = 22;
-            break;
-          }
-
-          // If address not specified, make call to initialize address for email
           accountInitializationBody = {
-            ts: Date.now(),
-            email: email
+            ts: Date.now()
           };
+
+          if (email) {
+            accountInitializationBody.email = email;
+          } else {
+            accountInitializationBody.addr = address;
+          }
+
           _context.next = 10;
           return _regeneratorRuntime.awrap(this.Sign(JSON.stringify(accountInitializationBody)));
 
@@ -90,8 +90,6 @@ exports.MintNFT = function _callee(_ref) {
           _ref2 = _context.sent;
           addr = _ref2.addr;
           address = this.utils.FormatAddress(addr);
-
-        case 22:
           requestBody = {
             "tickets": null,
             "products": items.map(function (item) {
@@ -111,6 +109,8 @@ exports.MintNFT = function _callee(_ref) {
 
           if (email) {
             requestBody.email = email;
+          } else {
+            requestBody.addr = address;
           }
 
           requestBody.extra.elv_addr = address;

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.1.63",
+  "version": "3.1.67",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3205,6 +3205,11 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
+    "country-codes-list": {
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/country-codes-list/-/country-codes-list-1.6.8.tgz",
+      "integrity": "sha512-wsqH44Yx3pTyPA77jYt2Nxso6kXziMwxI37fJFQLcd/3ome8Gqz6areaeG1w8zfeU9i+cZvJA3k2Mo5EW7rAtg=="
+    },
     "create-ecdh": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
@@ -7731,9 +7736,9 @@
       }
     },
     "minizlib": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz",
-      "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
       "dev": true,
       "requires": {
         "minipass": "^3.0.0",
@@ -8813,9 +8818,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
     "path-to-regexp": {
@@ -10635,15 +10640,15 @@
       "dev": true
     },
     "tar": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz",
-      "integrity": "sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "dev": true,
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
         "minipass": "^3.0.0",
-        "minizlib": "^2.1.0",
+        "minizlib": "^2.1.1",
         "mkdirp": "^1.0.3",
         "yallist": "^4.0.0"
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.1.63",
+  "version": "3.1.67",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/ElvClient.js",
   "author": "Kevin Talmadge",
@@ -45,6 +45,7 @@
     "/contracts",
     "/src",
     "/testScripts",
+    "/typeSpecs",
     "/utilities",
     "TestConfiguration.json",
     "LICENSE",
@@ -64,6 +65,7 @@
     "buffer": "^5.2.1",
     "cbor": "^4.1.5",
     "columnify": "^1.5.4",
+    "country-codes-list": "^1.6.8",
     "crocks": "^0.12.4",
     "deep-equal": "^1.0.1",
     "ellipsize": "^0.1.0",

package/src/AuthorizationClient.js

@@ -134,6 +134,12 @@ class AuthorizationClient {
         this.noCache = true;
       }
 
+      if(this.client.signer && this.client.signer.remoteSigner) {
+        // Channel auth not supported for remote signer, use a self-signed no-auth token instead
+        noAuth = true;
+        channelAuth = false;
+      }
+
       let authorizationToken;
       if(channelAuth) {
         authorizationToken = await this.GenerateChannelContentToken({

package/src/ElvClient.js

@@ -349,6 +349,7 @@ class ElvClient {
     this.contentTypes = {};
     this.encryptionConks = {};
     this.stateChannelAccess = {};
+    this.objectTenantIds = {};
     this.objectLibraryIds = {};
     this.objectImageUrls = {};
     this.visibilityInfo = {};
@@ -589,12 +590,14 @@ class ElvClient {
    * @namedParams
    * @param {string=} idToken - OAuth ID token
    * @param {string=} authToken - Eluvio authorization token previously issued from OAuth ID token
+   * @param {string=} tenantId - If specified, user will be associated with the tenant
    */
-  async SetRemoteSigner({idToken, authToken, address}) {
+  async SetRemoteSigner({idToken, authToken, tenantId, address}) {
     const signer = new RemoteSigner({
       rpcUris: this.authServiceURIs,
       idToken,
       authToken,
+      tenantId,
       address,
       provider: this.ethClient.provider
     });
@@ -864,6 +867,13 @@ class ElvClient {
     this.staticToken = token;
   }
 
+  /**
+   * Clear the set static token for the client
+   */
+  ClearStaticToken() {
+    this.staticToken = undefined;
+  }
+
   /**
    * Authorize the client against the specified policy.
    *

package/src/FrameClient.js

@@ -288,6 +288,7 @@ class FrameClient {
       "CallContractMethod",
       "CallContractMethodAndWait",
       "ClearCache",
+      "ClearStaticToken",
       "Collection",
       "ConfigUrl",
       "ContentLibraries",

package/src/RemoteSigner.js

@@ -14,6 +14,8 @@ class RemoteSigner extends Ethers.Signer {
   }) {
     super();
 
+    this.remoteSigner = true;
+
     this.HttpClient = new HttpClient({uris: rpcUris});
     this.idToken = idToken;
     this.tenantId = tenantId;

package/src/client/ContentAccess.js

@@ -616,6 +616,35 @@ exports.ContentObjectOwner = async function({objectId}) {
   );
 };
 
+/**
+ * Retrieve the tenant ID associated with the specified content object
+ *
+ * @methodGroup Content Objects
+ *
+ * @namedParams
+ * @param {string=} objectId - ID of the object
+ * @param {string=} versionHash - Version hash of the object
+ *
+ * @returns {Promise<string>} - Tenant ID of the object
+ */
+exports.ContentObjectTenantId = async function({objectId, versionHash}) {
+  versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
+
+  if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
+
+  if(!this.objectTenantIds[objectId]) {
+    this.objectTenantIds[objectId] = await this.authClient.MakeElvMasterCall({
+      methodName: "elv_getTenantById",
+      params: [
+        this.contentSpaceId,
+        objectId
+      ]
+    });
+  }
+
+  return this.objectTenantIds[objectId];
+};
+
 /**
  * Retrieve the library ID for the specified content object
  *

package/src/client/NFT.js

@@ -38,31 +38,31 @@ exports.MintNFT = async function({tenantId, email, address, collectionId, items,
 
   ValidateObject(collectionId);
 
-  if(!address) {
-    // If address not specified, make call to initialize address for email
-    const accountInitializationBody = {
-      ts: Date.now(),
-      email
-    };
-
-    const accountInitializationSignature = await this.Sign(
-      JSON.stringify(accountInitializationBody)
-    );
-
-    const {addr} = await this.utils.ResponseToJson(
-      await this.authClient.MakeAuthServiceRequest({
-        method: "POST",
-        path: `/as/tnt/prov/eth/${tenantId}`,
-        body: accountInitializationBody,
-        headers: {
-          "Authorization": `Bearer ${accountInitializationSignature}`
-        }
-      })
-    );
-
-    address = this.utils.FormatAddress(addr);
+  // If address not specified, make call to initialize address for email
+  let accountInitializationBody = { ts: Date.now() };
+  if(email) {
+    accountInitializationBody.email = email;
+  } else {
+    accountInitializationBody.addr = address;
   }
 
+  const accountInitializationSignature = await this.Sign(
+    JSON.stringify(accountInitializationBody)
+  );
+
+  const {addr} = await this.utils.ResponseToJson(
+    await this.authClient.MakeAuthServiceRequest({
+      method: "POST",
+      path: `/as/tnt/prov/eth/${tenantId}`,
+      body: accountInitializationBody,
+      headers: {
+        "Authorization": `Bearer ${accountInitializationSignature}`
+      }
+    })
+  );
+
+  address = this.utils.FormatAddress(addr);
+
   let requestBody = {
     "tickets": null,
     "products": items.map(item => ({
@@ -79,10 +79,13 @@ exports.MintNFT = async function({tenantId, email, address, collectionId, items,
     }
   };
 
+
   ValidateAddress(address);
 
   if(email) {
     requestBody.email = email;
+  } else {
+    requestBody.addr = address;
   }
 
   requestBody.extra.elv_addr = address;

package/testScripts/InitializeTenant.js

@@ -14,6 +14,15 @@ const reportTypes = [
   "Views Over Program Duration"
 ];
 
+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") },
+  { name: "NFT Template", spec: require("../typeSpecs/NFTTemplate") }
+];
+
 const STANDARD_DRM_CERT={
   elv: {
     media: {
@@ -63,12 +72,17 @@ const SetLibraryPermissions = async (client, libraryId, tenantAdmins, contentAdm
 const SetObjectPermissions = async (client, objectId, tenantAdmins, contentAdmins, contentUsers) => {
   let promises = [
     // Tenant admins
+    client.AddContentObjectGroupPermission({objectId, groupAddress: tenantAdmins, permission: "see"}),
+    client.AddContentObjectGroupPermission({objectId, groupAddress: tenantAdmins, permission: "access"}),
     client.AddContentObjectGroupPermission({objectId, groupAddress: tenantAdmins, permission: "manage"}),
 
     // Content admins
+    client.AddContentObjectGroupPermission({objectId, groupAddress: contentAdmins, permission: "see"}),
+    client.AddContentObjectGroupPermission({objectId, groupAddress: contentAdmins, permission: "access"}),
     client.AddContentObjectGroupPermission({objectId, groupAddress: contentAdmins, permission: "manage"}),
 
     // Content users
+    client.AddContentObjectGroupPermission({objectId, groupAddress: contentUsers, permission: "see"}),
     client.AddContentObjectGroupPermission({objectId, groupAddress: contentUsers, permission: "access"})
   ];
 
@@ -241,7 +255,7 @@ const InitializeTenant = async ({configUrl, kmsId, tenantName}) => {
                 "playlists",
                 "gallery",
                 "live_stream"
-              ],
+              ]
             }
           }
         }
@@ -258,6 +272,23 @@ const InitializeTenant = async ({configUrl, kmsId, tenantName}) => {
     console.log(`\t${tenantName} - Channel: ${channelTypeId}`);
     console.log(`\t${tenantName} - Live Stream: ${streamTypeId}`);
 
+    for(let i = 0; i < liveTypes.length; i++) {
+      const typeId = await client.CreateContentType({
+        name: `${tenantName} - ${liveTypes[i].name}`,
+        metadata: {
+          ...typeMetadata,
+          public: {
+            ...typeMetadata.public,
+            title_configuration: liveTypes[i].spec
+          }
+        }
+      });
+
+      await SetObjectPermissions(client, typeId, tenantAdminGroupAddress, contentAdminGroupAddress, contentUserGroupAddress);
+
+      console.log(`\t${tenantName} - ${liveTypes[i].name}: ${typeId}`);
+    }
+
 
     /* Create libraries - Properties, Title Masters, Title Mezzanines and add each to the groups */
 

package/testScripts/Test.js

@@ -13,6 +13,25 @@ const Test = async () => {
     });
 
     client.SetSigner({signer});
+
+
+    const ethUrl = "https://host-216-66-40-19.contentfabric.io/eth";
+    const asUrl = "https://host-66-220-3-86.contentfabric.io";
+
+    client.SetNodes({
+      ethereumURIs: [
+        ethUrl
+      ],
+      authServiceURIs: [
+        asUrl
+      ]
+    });
+
+    console.log(
+      await client.ContentObjectTenantId({
+        objectId: "iq__3PXRZX5NCzPQsfTEquCctB2K3KJh"
+      })
+    )
   } catch(error) {
     console.error(error);
     console.error(JSON.stringify(error, null, 2));

package/typeSpecs/Default.js

@@ -0,0 +1,80 @@
+const defaultSpec = {
+  "profile": {
+    name: "Default",
+    version: "0.1",
+  },
+  manageApp: "default",
+  controls: [
+    "images",
+    "playlists"
+  ],
+  asset_types: [
+    "primary",
+    "clip"
+  ],
+  title_types: [
+    "collection",
+    "episode",
+    "season",
+    "series",
+    "site",
+    "title"
+  ],
+  default_image_keys: [
+    "portrait",
+    "landscape"
+  ],
+  info_fields: [
+    {name: "release_date", type: "date"},
+    {name: "synopsis", type: "textarea"},
+    {name: "copyright"},
+    {name: "creator"},
+    {name: "runtime", type: "integer"},
+  ],
+  localizations: [],
+  associated_assets: [
+    {
+      name: "titles",
+      label: "Titles",
+      indexed: true,
+      slugged: true,
+      defaultable: true,
+      orderable: true
+    },
+    {
+      name: "series",
+      label: "Series",
+      asset_types: ["primary"],
+      title_types: ["series"],
+      for_title_types: ["site", "collection"],
+      indexed: true,
+      slugged: true,
+      defaultable: false,
+      orderable: true
+    },
+    {
+      name: "seasons",
+      label: "Seasons",
+      asset_types: ["primary"],
+      title_types: ["season"],
+      for_title_types: ["series"],
+      indexed: true,
+      slugged: true,
+      defaultable: false,
+      orderable: true
+    },
+    {
+      name: "episodes",
+      label: "Episodes",
+      asset_types: ["primary"],
+      title_types: ["episode"],
+      for_title_types: ["season"],
+      indexed: true,
+      slugged: true,
+      defaultable: false,
+      orderable: true
+    }
+  ]
+};
+
+module.exports = defaultSpec;