@eluvio/elv-client-js 3.1.79 → 3.1.80

package/src/UserProfileClient.js

@@ -56,6 +56,8 @@ await client.userProfileClient.UserMetadata()
     this.client = client;
     this.debug = debug;
     this.userWalletAddresses = {};
+    this.walletAddress = undefined;
+    this.walletAddressRetrieved = false;
   }
 
   async CreateWallet() {
@@ -130,13 +132,17 @@ await client.userProfileClient.UserMetadata()
    * @return {Promise<string>} - The contract address of the current user's wallet contract
    */
   async WalletAddress(autoCreate=true) {
-    if(this.walletAddress) { return this.walletAddress; }
+    if(this.walletAddress || this.walletAddressRetrieved) { return this.walletAddress; }
 
-    const walletAddress = await this.client.CallContractMethod({
-      contractAddress: Utils.HashToAddress(this.client.contentSpaceId),
-      methodName: "userWallets",
-      methodArgs: [this.client.signer.address]
-    });
+    if(!this.walletAddressPromise) {
+      this.walletAddressPromise = this.client.CallContractMethod({
+        contractAddress: Utils.HashToAddress(this.client.contentSpaceId),
+        methodName: "userWallets",
+        methodArgs: [this.client.signer.address]
+      });
+    }
+
+    const walletAddress = await this.walletAddressPromise;
 
     if(!Utils.EqualAddress(walletAddress, Utils.nullAddress)) {
       this.walletAddress = walletAddress;
@@ -146,6 +152,8 @@ await client.userProfileClient.UserMetadata()
       await this.CreateWallet();
     }
 
+    this.walletAddressRetrieved = true;
+
     return this.walletAddress;
   }
 

package/src/client/ContentAccess.js

@@ -760,17 +760,22 @@ exports.MetadataAuth = async function({
   objectId,
   versionHash,
   path="/",
-  channelAuth=false
+  channelAuth=false,
+  noAuth=false
 }) {
   ValidateParameters({libraryId, objectId, versionHash});
 
   if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
 
-  const visibility = await this.Visibility({id: objectId});
-  const accessType = await this.AccessType({id: objectId});
-  const isPublic = (path || "").replace(/^\/+/, "").startsWith("public");
-
-  let noAuth = visibility >= 10 || (isPublic && visibility >= 1);
+  noAuth = this.noAuth || noAuth;
+  let isPublic = noAuth;
+  let accessType;
+  if(!noAuth) {
+    const visibility = await this.Visibility({id: objectId});
+    accessType = await this.AccessType({id: objectId});
+    isPublic = (path || "").replace(/^\/+/, "").startsWith("public");
+    noAuth = visibility >= 10 || (isPublic && visibility >= 1);
+  }
 
   if(this.oauthToken) {
     // Check that KMS is set on this object
@@ -823,6 +828,7 @@ exports.MetadataAuth = async function({
  * - Note: Selection is relative to "metadataSubtree". For example, metadataSubtree="public" and select=["name", "description"] would select "public/name" and "public/description"
  * @param {Array<string>=} remove - Exclude the specified items from the retrieved metadata
  * @param {string=} authorizationToken - Additional authorization token for this request
+ * @param {string=} noAuth=false - If specified, the normal authorization flow will be skipped. Useful if you know the metadata you're retrieving is publicly accessible
  * @param {boolean=} resolveLinks=false - If specified, links in the metadata will be resolved
  * @param {boolean=} resolveIncludeSource=false - If specified, resolved links will include the hash of the link at the root of the metadata
 
@@ -857,6 +863,7 @@ exports.ContentObjectMetadata = async function({
   select=[],
   remove=[],
   authorizationToken,
+  noAuth=false,
   resolveLinks=false,
   resolveIncludeSource=false,
   resolveIgnoreErrors=false,
@@ -877,7 +884,7 @@ exports.ContentObjectMetadata = async function({
   let path = UrlJoin("q", writeToken || versionHash || objectId, "meta", metadataSubtree);
 
   // Main authorization
-  let defaultAuthToken = await this.MetadataAuth({libraryId, objectId, versionHash, path: metadataSubtree});
+  let defaultAuthToken = await this.MetadataAuth({libraryId, objectId, versionHash, path: metadataSubtree, noAuth});
 
   // All authorization
   const authTokens = [authorizationToken, queryParams.authorization, defaultAuthToken].flat().filter(token => token);
@@ -2259,9 +2266,7 @@ exports.LinkUrl = async function({
   }
 
   let authorization = [ authorizationToken ];
-  if(!noAuth) {
-    authorization.push(await this.MetadataAuth({libraryId, objectId, versionHash, path: linkPath, channelAuth}));
-  }
+  authorization.push(await this.MetadataAuth({libraryId, objectId, versionHash, path: linkPath, channelAuth, noAuth}));
 
   if(queryParams.authorization) {
     authorization.push(queryParams.authorization);

package/testScripts/CreateABRMezzanine.js

@@ -270,7 +270,6 @@ const Create = async ({
     Report(createResponse);
 
     const objectId = createResponse.id;
-    await client.SetVisibility({id: objectId, visibility: 0});
 
     console.log("Starting Mezzanine Job(s)");
 

package/testScripts/OfferingRemoveDash.js

@@ -0,0 +1,49 @@
+/* eslint-disable no-console */
+
+// Removes HLS playout options from an existing offering of a mezzanine
+
+const ScriptOffering = require("./parentClasses/ScriptOffering");
+
+class OfferingRemoveDash extends ScriptOffering {
+
+  async body() {
+    const client = await this.client();
+
+    const libraryId = this.args.libraryId;
+    const objectId = this.args.objectId;
+    const offeringKey = this.args.offeringKey;
+
+    let dashFound = false;
+
+    let metadata = await client.ContentObjectMetadata({
+      libraryId,
+      objectId
+    });
+
+    this.validateOffering(metadata, offeringKey);
+
+    // loop through playout formats, delete ones where protocol is Dash
+    const playoutFormatKeys = Object.keys(metadata.offerings[offeringKey].playout.playout_formats);
+    for(let i = 0; i < playoutFormatKeys.length; i++) {
+      const key = playoutFormatKeys[i];
+      if(metadata.offerings[offeringKey].playout.playout_formats[key].protocol.type === "ProtoDash") {
+        console.log("Found Dash playout format '" + key + "', removing...");
+        delete metadata.offerings[offeringKey].playout.playout_formats[key];
+        dashFound = true;
+      }
+    }
+
+    if(dashFound) {
+      await this.metadataWrite(metadata);
+    } else {
+      console.log("No playout formats found with Dash");
+    }
+  }
+
+  header() {
+    return "Removing playout formats with Dash from mezzanine offering '" + this.args.offeringKey + "'... ";
+  }
+}
+
+const script = new OfferingRemoveDash;
+script.run();

package/typeSpecs/DropEventSite.js

@@ -6,7 +6,7 @@ const currencyOptions = [...new Set(Object.values(require("country-codes-list").
 const eventSiteSpec = {
   "profile": {
     name: "Eluvio LIVE Event Site",
-    version: "0.2",
+    version: "0.3",
   },
   manageApp: "default",
   associate_permissions: true,
@@ -50,17 +50,25 @@ const eventSiteSpec = {
       "type": "Text"
     },
     {
-      "label": "Eluvio LIVE Tenant",
-      "name": "tenant",
-      "type": "fabric_link",
-      "hash_only": true,
-      "no_localize": true
+      "name": "tenant_slug",
+      "type": "text",
+      "required": true,
     },
     {
-      "name": "marketplace",
-      "type": "fabric_link",
-      "hash_only": true,
-      "no_localize": true
+      "name": "marketplace_info",
+      "type": "subsection",
+      "fields": [
+        {
+          "name": "tenant_slug",
+          "type": "text",
+          "hint": "The slug of the tenant in which the marketplace is defined"
+        },
+        {
+          "name": "marketplace_slug",
+          "type": "text",
+          "hint": "The slug of the marketplace"
+        }
+      ]
     },
     {
       "name": "state",
@@ -81,6 +89,7 @@ const eventSiteSpec = {
     },
     {
       "name": "theme",
+      "label": "Color Scheme",
       "type": "select",
       "options": [
         "light",
@@ -473,22 +482,38 @@ const eventSiteSpec = {
       ]
     },
     {
+      "name": "event_info_modals",
+      "type": "list",
       "fields": [
         {
-          "name": "name",
+          "name": "button_text",
           "type": "text"
         },
         {
+          "name": "pages",
+          "type": "list",
           "fields": [
             {
-              "hint": "A description displayed next to the 'Next' button when viewing the previous page.",
               "name": "page_title",
               "type": "text"
             },
             {
-              "extensions": imageTypes,
               "name": "image",
-              "type": "file"
+              "extensions": imageTypes,
+              "type": "file",
+              "unless": "./video",
+              "hint": "Select an image for this page. Each page may only have one image or one video"
+            },
+            {
+              "name": "video",
+              "type": "fabric_link",
+              "video_preview": true,
+              "unless": "./image",
+              "hint": "Select a video for this page. Each page may only have one image or one video"
+            },
+            {
+              "name": "text",
+              "type": "rich_text"
             },
             {
               "name": "text_color",
@@ -508,17 +533,9 @@ const eventSiteSpec = {
                 "label": "White"
               }
             },
-            {
-              "name": "text",
-              "type": "rich_text"
-            }
-          ],
-          "name": "pages",
-          "type": "list"
+          ]
         }
-      ],
-      "name": "event_descriptions",
-      "type": "list"
+      ]
     },
     {
       "fields": [
@@ -1799,7 +1816,58 @@ const eventSiteSpec = {
           ]
         }
       ]
-    }
+    },
+
+
+
+    {
+      "fields": [
+        {
+          "name": "name",
+          "type": "text"
+        },
+        {
+          "fields": [
+            {
+              "hint": "A description displayed next to the 'Next' button when viewing the previous page.",
+              "name": "page_title",
+              "type": "text"
+            },
+            {
+              "extensions": imageTypes,
+              "name": "image",
+              "type": "file"
+            },
+            {
+              "name": "text_color",
+              "type": "color",
+              "no_label": true,
+              "default_value": {
+                "color": "#000000",
+                "label": "Black"
+              }
+            },
+            {
+              "name": "background_color",
+              "type": "color",
+              "no_label": true,
+              "default_value": {
+                "color": "#FFFFFF",
+                "label": "White"
+              }
+            },
+            {
+              "name": "text",
+              "type": "rich_text"
+            }
+          ],
+          "name": "pages",
+          "type": "list"
+        }
+      ],
+      "name": "event_descriptions",
+      "type": "list"
+    },
   ]
 };
 

package/typeSpecs/EventTenant.js

@@ -3,7 +3,7 @@ const imageTypes = ["gif", "jpg", "jpeg", "png", "svg", "webp"];
 const eventTenantSpec = {
   "profile": {
     name: "Eluvio LIVE Tenant",
-    version: "0.1",
+    version: "0.3",
   },
   "hide_image_tab": true,
   manageApp: "default",