@eluvio/elv-client-js 3.1.94 → 3.1.95

package/package.json

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

package/src/ElvClient.js

@@ -694,6 +694,67 @@ class ElvClient {
     return this.utils.FormatAddress(this.signer.address);
   }
 
+  /*
+    TOKEN                  211b  PREFIX + BODY | aplsjcJf1HYcDDUuCdXcSZtU86nYK162YmYJeuqwMczEBJVkD5D5EvsBvVwYDRsf4hzDvBWMoe9piBpqx...
+    PREFIX                   6b  aplsjc | apl=plain s=ES256K jc=json-compressed
+    BODY                   205b  base58(SIGNATURE + PAYLOAD)
+    SIGNATURE + PAYLOAD    151b  151b * 138 / 100 + 1 = 209b (>= 205b)
+    SIGNATURE               66b  ES256K_Di9Lu83mz4wMoehCEeQhKpJJ7ApmDZLumAa2Cge48F6EHYnbn8msATGGpjucScwimei1TWGd7aeyQY45AdXd5tT1Z
+    PAYLOAD                 85b  json-compressed
+    json                    79b  {"adr":"VVf4DQU357tDnZGYQeDrntRJ5rs=","spc":"ispc3ANoVSzNA3P6t7abLR69ho5YPPZU"}
+   */
+
+  /**
+   * Create a signed authorization token that can be used to authorize against the fabric
+   *
+   * @methodGroup Authorization
+   * @namedParams
+   * @param {number} duration=86400000 - Time until the token expires, in milliseconds (1 hour = 60 * 60 * 1000 = 3600000). Default is 24 hours.
+   * @param {Object=} spec - Additional attributes for this token
+   * @param {string=} address - Address of the signing account - if not specified, the current signer address will be used.
+   * @param {function=} Sign - If specified, this function will be used to produce the signature instead of the client's current signer
+   * @param {boolean=} addEthereumPrefix=true - If specified, the 'Ethereum Signed Message' prefixed hash format will be performed. Disable this if the provided Sign method already does this (e.g. Metamask)
+   */
+  async CreateFabricToken({
+    duration=24 * 60 * 60 * 1000,
+    spec={},
+    address,
+    Sign,
+    addEthereumPrefix=true,
+  }={}) {
+    address = address || this.CurrentAccountAddress();
+
+    let token = {
+      ...spec,
+      sub:`iusr${Utils.AddressToHash(address)}`,
+      adr: Buffer.from(address.replace(/^0x/, ""), "hex").toString("base64"),
+      spc: await this.ContentSpaceId(),
+      iat: Date.now(),
+      exp: Date.now() + duration,
+    };
+
+    if(!Sign) {
+      Sign = async message => this.authClient.Sign(message);
+    }
+
+    let message = `Eluvio Content Fabric Access Token 1.0\n${JSON.stringify(token)}`;
+
+    if(addEthereumPrefix) {
+      message = Ethers.utils.keccak256(Buffer.from(`\x19Ethereum Signed Message:\n${message.length}${message}`, "utf-8"));
+    }
+
+    const signature = await Sign(message);
+
+    const compressedToken = Pako.deflateRaw(Buffer.from(JSON.stringify(token), "utf-8"));
+    return `acspjc${this.utils.B58(
+      Buffer.concat([
+        Buffer.from(signature.replace(/^0x/, ""), "hex"),
+        Buffer.from(compressedToken)
+      ])
+    )}`;
+  }
+
+
   /**
    * Issue a self-signed authorization token
    *
@@ -705,7 +766,7 @@ class ElvClient {
    * @param {string=} policyId - The object ID of the policy for this token
    * @param {string=} subject - The subject of the token
    * @param {string} grantType=read - Permissions to grant for this token. Options: "access", "read", "create", "update", "read-crypt"
-   * @param {number} duration - Time until the token expires, in milliseconds (1 hour = 60 * 60 * 1000)
+   * @param {number} duration - Time until the token expires, in milliseconds (1 hour = 60 * 60 * 1000 = 3600000)
    * @param {boolean} allowDecryption=false - If specified, the re-encryption key will be included in the token,
    * enabling the user of this token to download encrypted content from the specified object
    * @param {Object=} context - Additional JSON context

package/src/RemoteSigner.js

@@ -85,24 +85,28 @@ class RemoteSigner extends Ethers.Signer {
    */
   async signDigest(digest) {
     if(!this.signatureCache[digest]) {
-      this.signatureCache[digest] = new Promise(async resolve => {
-        let signature = await Utils.ResponseToJson(
-          this.HttpClient.Request({
-            method: "POST",
-            path: UrlJoin("as", "wlt", "sign", "eth", this.id),
-            headers: {
-              Authorization: `Bearer ${this.authToken}`
-            },
-            body: {
-              hash: digest
-            }
-          })
-        );
-
-        signature.v = parseInt(signature.v, 16);
-        signature.recoveryParam = signature.v - 27;
-
-        resolve(signature);
+      this.signatureCache[digest] = new Promise(async (resolve, reject) => {
+        try {
+          let signature = await Utils.ResponseToJson(
+            this.HttpClient.Request({
+              method: "POST",
+              path: UrlJoin("as", "wlt", "sign", "eth", this.id),
+              headers: {
+                Authorization: `Bearer ${this.authToken}`
+              },
+              body: {
+                hash: digest
+              }
+            })
+          );
+
+          signature.v = parseInt(signature.v, 16);
+          signature.recoveryParam = signature.v - 27;
+
+          resolve(signature);
+        } catch(error) {
+          reject(error);
+        }
       });
     }
 

package/testScripts/Test.js

@@ -13,25 +13,6 @@ 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));