@eluvio/elv-client-js 4.2.13 → 4.2.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.2.13",
+  "version": "4.2.14",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",
@@ -101,6 +101,8 @@
     "@babel/cli": "^7.28.0",
     "@babel/plugin-transform-runtime": "^7.8.3",
     "@babel/preset-env": "^7.4.5",
+    "@eslint/eslintrc": "^3.3.3",
+    "@eslint/js": "^9.39.1",
     "@jsdoc/salty": "^0.2.9",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
@@ -108,7 +110,6 @@
     "colors": "^1.4.0",
     "copy-webpack-plugin": "^6.0.2",
     "eslint": "^9.32.0",
-    "eslint-plugin-html": "^5.0.0",
     "jsdoc": "^4.0.0",
     "jsdom": "^26.1.0",
     "moment": "^2.27.0",

package/src/ElvClient.js

@@ -838,10 +838,11 @@ class ElvClient {
    * @param {Array<string>=} signerURIs - (Only if using custom OAuth) - URIs corresponding to the key server(s) to use
    * @param {boolean=} unsignedPublicAuth=false - If specified, the client will use an unsigned static token for calls that don't require authorization (reduces remote signature calls)
    */
-  async SetRemoteSigner({idToken, authToken, tenantId, extraData, signerURIs, unsignedPublicAuth}) {
+  async SetRemoteSigner({idToken, userIdCode, authToken, tenantId, extraData, signerURIs, unsignedPublicAuth}) {
     const signer = new RemoteSigner({
       signerURIs: signerURIs || this.authServiceURIs,
       idToken,
+      userIdCode,
       authToken,
       tenantId,
       provider: await this.ethClient.Provider(),

package/src/FrameClient.js

@@ -486,6 +486,9 @@ class FrameClient {
       "SetStaticToken",
       "SetTenantContractId",
       "SetTenantId",
+      "TenantAdminGroup",
+      "ContentAdminGroup",
+      "TenantUsersGroup",
       "SetVisibility",
       "SetPermission",
       "ShareInfo",

package/src/LogMessage.js

@@ -29,4 +29,4 @@ const LogMessage = (reporter, message, error = false) => {
       console.log(standardMsg);
 };
 
-module.exports = {LogMessage};
+module.exports = {LogMessage};

package/src/RemoteSigner.js

@@ -8,6 +8,7 @@ class RemoteSigner extends Ethers.Signer {
   constructor({
     signerURIs,
     idToken,
+    userIdCode,
     authToken,
     tenantId,
     provider,
@@ -21,6 +22,7 @@ class RemoteSigner extends Ethers.Signer {
 
     this.HttpClient = new HttpClient({uris: signerURIs});
     this.idToken = idToken;
+    this.userIdCode = userIdCode;
     this.tenantId = tenantId;
 
     this.authToken = authToken;
@@ -33,13 +35,25 @@ class RemoteSigner extends Ethers.Signer {
 
   async Initialize() {
     if(!this.authToken) {
+      let body = {
+        ext: this.extraLoginData || {}
+      };
+
+      if(this.tenantId) {
+        body.tid = this.tenantId;
+      }
+
+      if(this.userIdCode) {
+        body.code = this.userIdCode;
+      }
+
       const {addr, eth, token} = await Utils.ResponseToJson(
         this.HttpClient.Request({
-          path: UrlJoin("as", "wlt", "login", "jwt"),
+          path: UrlJoin("as", "wlt", "login", this.userIdCode ? "code" : "jwt"),
           method: "POST",
-          body: this.tenantId ? { tid: this.tenantId, ext: this.extraLoginData || {} } : { ext: this.extraLoginData || {} },
+          body,
           headers: {
-            Authorization: `Bearer ${this.idToken}`
+            Authorization: `Bearer ${this.userIdCode || this.idToken}`
           }
         })
       );

package/src/client/ABRPublishing.js

@@ -323,7 +323,7 @@ exports.CreateABRMezzanine = async function({
     // determine master object id if a master write token was passed in
     ValidateWriteToken(masterWriteToken);
     masterObjectId = this.utils.DecodeWriteToken(masterWriteToken).objectId;
-    masterLibId = await client.ContentObjectLibraryId({objectId: masterObjectId});
+    masterLibId = await this.ContentObjectLibraryId({objectId: masterObjectId});
   }
 
   // if pre-existing mez object id passed in, validate

package/src/client/ContentAccess.js

@@ -597,19 +597,19 @@ exports.ContentObject = async function({objectId, versionHash, writeToken, noCac
   const id = writeToken || versionHash || objectId;
   if(noCache || !this.objectInfo[id] || Date.now() - this.objectInfo[id].retrievedAt > 30000) {
     let path = UrlJoin("q", id);
+    const info = await this.HttpClient.RequestJsonBody({
+      headers: await this.authClient.AuthorizationHeader({objectId, versionHash}),
+      method: "GET",
+      path: path,
+      queryParams: {
+        details: true,
+        profile: true
+      }
+    })
+
     this.objectInfo[id] = {
       retrievedAt: Date.now(),
-      info: (
-        await this.HttpClient.RequestJsonBody({
-          headers: await this.authClient.AuthorizationHeader({objectId, versionHash}),
-          method: "GET",
-          path: path,
-          queryParams: {
-            details: true,
-            profile: true
-          }
-        })
-      )
+      info
     };
   }
 
@@ -1909,6 +1909,7 @@ exports.MakeFileServiceRequest = async function({
  * @param {string=} versionHash - Hash of the object version - if not specified, latest version will be used
  * @param {string=} writeToken - Write token of an object draft - if calling bitcode of a draft object
  * @param {string} method - Bitcode method to call
+ * @param {string} verb - HTTP verb (GET, POST, PUT, DELETE, ...)
  * @param {Object=} queryParams - Query parameters to include in the request
  * @param {Object=} body - Request body to include, if calling a non-constant method
  * @param {Object=} headers - Request headers to include
@@ -1924,6 +1925,7 @@ exports.CallBitcodeMethod = async function({
   versionHash,
   writeToken,
   method,
+  verb,
   queryParams={},
   body={},
   headers={},
@@ -1952,9 +1954,10 @@ exports.CallBitcodeMethod = async function({
     ).Authorization;
   }
 
+  verb = verb ? verb : (constant ? "GET" : "POST");
   this.Log(
     `Calling bitcode method: ${libraryId || ""} ${objectId || versionHash} ${writeToken || ""}
-      ${constant ? "GET" : "POST"} ${path}
+      ${verb} ${path}
       Query Params:
       ${JSON.stringify(queryParams || "")}
       Body:
@@ -1968,7 +1971,7 @@ exports.CallBitcodeMethod = async function({
     await this.HttpClient.Request({
       body,
       headers,
-      method: constant ? "GET" : "POST",
+      method: verb,
       path,
       queryParams,
       allowFailover: false

package/src/client/Contracts.js

@@ -785,7 +785,6 @@ exports.SetTenantContractId = async function({contractAddress, objectId, version
   if(tenantContractId && (!tenantContractId.startsWith("iten") || !Utils.ValidHash(tenantContractId))) {
     throw Error(`Invalid tenant ID: ${tenantContractId}`);
   }
-  const tenantAddress = Utils.HashToAddress(tenantContractId);
 
   const version = await this.authClient.AccessType(tenantContractId);
   if(version !== this.authClient.ACCESS_TYPES.TENANT) {
@@ -793,12 +792,7 @@ exports.SetTenantContractId = async function({contractAddress, objectId, version
   }
 
   // get tenant admin group
-  const tenantAdminGroupAddress = await this.CallContractMethod({
-    contractAddress: tenantAddress,
-    methodName: "groupsMapping",
-    methodArgs: ["tenant_admin", 0],
-    formatArguments: true,
-  });
+  const tenantAdminGroupAddress = await this.TenantAdminGroup({tenantContractId});
 
   const hasPutMetaMethod = await this.authClient.ContractHasMethod({
     contractAddress: contractAddress,
@@ -928,6 +922,93 @@ exports.ResetTenantId = async function({contractAddress, objectId, versionHash})
   }
 };
 
+async function GetTenantGroupAddress({ctx, tenantContractId, groupName}) {
+  if(!tenantContractId) {
+    throw new Error("tenantContractId is required");
+  }
+
+  if(!tenantContractId.startsWith("iten")) {
+    throw new Error(`Invalid Tenant Contract ID format: ${tenantContractId}`);
+  }
+
+  const tenantAddress = Utils.HashToAddress(tenantContractId);
+
+  // Needs to be tenant type
+  const version = await ctx.authClient.AccessType(tenantContractId);
+  if(version !== ctx.authClient.ACCESS_TYPES.TENANT) {
+    throw new Error(
+      `Contract ${tenantContractId} is not a Tenant. Actual version: ${version}`
+    );
+  }
+
+  try {
+    const groupAddress = await ctx.CallContractMethod({
+      contractAddress: tenantAddress,
+      methodName: "groupsMapping",
+      methodArgs: [groupName, 0],
+      formatArguments: true,
+    });
+
+    if (!groupAddress) {
+      throw new Error(`${groupName} group address not set.`);
+    }
+
+    return groupAddress;
+  } catch (err) {
+    this.Log(err);
+    throw new Error(`Failed to retrieve ${groupName} group address.`);
+  }
+
+}
+
+/**
+ * Returns the tenant_admin group address for a given tenant contract.
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} tenantContractId - The ID of the tenant contract
+ * @returns {Promise<*|undefined>}
+ */
+exports.TenantAdminGroup = async function({ tenantContractId }) {
+  return GetTenantGroupAddress({
+    ctx : this,
+    tenantContractId,
+    groupName: "tenant_admin"
+  });
+};
+
+/**
+ * Returns the content_admin group address for a given tenant contract.
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} tenantContractId - The ID of the tenant contract
+ * @returns {Promise<*|undefined>}
+ */
+exports.ContentAdminGroup = async function({tenantContractId}){
+  return GetTenantGroupAddress({
+    ctx : this,
+    tenantContractId,
+    groupName: "content_admin"
+  });
+};
+
+/**
+ * Returns the tenant_users group address for a given tenant contract.
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} tenantContractId - The ID of the tenant contract
+ * @returns {Promise<*|undefined>}
+ */
+exports.TenantUsersGroup = async function({tenantContractId}){
+  return GetTenantGroupAddress({
+    ctx : this,
+    tenantContractId,
+    groupName: "tenant_users"
+  });
+};
+
 /**
  * Enum for object types that can be cleaned up after object deletion.
  * Used by the ObjectCleanup method to determine which associated objects to clean.

package/src/walletClient/index.js

@@ -476,6 +476,7 @@ class ElvWalletClient {
    */
   async AuthenticateOAuth({
     idToken,
+    userIdCode,
     tenantId,
     email,
     signerURIs,
@@ -494,7 +495,17 @@ class ElvWalletClient {
       tenantId = this.selectedMarketplaceInfo.tenantId;
     }
 
-    await this.client.SetRemoteSigner({idToken, tenantId, signerURIs, extraData: { ...extraData, share_email: shareEmail }, unsignedPublicAuth: true});
+    await this.client.SetRemoteSigner({
+      idToken,
+      userIdCode,
+      tenantId,
+      signerURIs,
+      extraData: {
+        ...extraData,
+        share_email: shareEmail
+      },
+      unsignedPublicAuth: true
+    });
 
     let fabricToken, refreshToken, expiresAt;
     if(createRemoteToken && this.client.signer.remoteSigner) {
@@ -511,9 +522,9 @@ class ElvWalletClient {
         context: email ? {usr: {email}} : {}
       });
     }
-    const address = this.client.utils.FormatAddress(this.client.CurrentAccountAddress());
 
-    if(!email) {
+    const address = this.client.utils.FormatAddress(this.client.CurrentAccountAddress());
+    if(!email && idToken) {
       try {
         const decodedToken = JSON.parse(this.utils.FromB64URL(idToken.split(".")[1]));
         email = decodedToken.email;
@@ -1253,7 +1264,7 @@ class ElvWalletClient {
       return response
         .map(status => {
           let [op, address, id] = status.op.split(":");
-          address = address.startsWith("0x") ? Utils.FormatAddress(address) : address;
+          address = address && address.startsWith("0x") ? Utils.FormatAddress(address) : address;
 
           let confirmationId, tokenId, offerId, giftId;
           if(op === "nft-buy") {