@eluvio/elv-client-js 4.2.8 → 4.2.10

package/package.json

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

package/src/RemoteSigner.js

@@ -73,17 +73,21 @@ class RemoteSigner extends Ethers.Signer {
     this.signer = this.provider.getSigner(this.address);
   }
 
-  async RetrieveCSAT({email, nonce, tenantId, force=false, duration=24}) {
-    nonce = nonce || Utils.B58(UUID.parse(UUID.v4()));
+  async RetrieveCSAT({email, nonce, installId, tenantId, force=false, duration=24, appName}) {
+    if(nonce && !installId) {
+      const buf = await crypto.subtle.digest("SHA-512", new TextEncoder("utf-8").encode(nonce));
+      installId = Array.prototype.map.call(new Uint8Array(buf), x=>(("00"+x.toString(16)).slice(-2))).join("");
+    }
 
     let response = await Utils.ResponseToJson(
       this.HttpClient.Request({
         method: "POST",
         body: {
           email,
-          nonce,
+          install_id: installId,
           force,
           tid: tenantId,
+          app_name: appName,
           exp: parseInt(duration * 60 * 60)
         },
         path: UrlJoin("as", "wlt", "sign", "csat"),
@@ -94,6 +98,7 @@ class RemoteSigner extends Ethers.Signer {
     );
 
     response.nonce = nonce;
+    response.installId = installId;
 
     return response;
   }
@@ -128,6 +133,23 @@ class RemoteSigner extends Ethers.Signer {
     );
   }
 
+  async RefreshCSAT({accessToken, refreshToken, nonce}) {
+    return await Utils.ResponseToJson(
+      this.HttpClient.Request({
+        method: "POST",
+        path: UrlJoin("as", "wlt", "refresh", "csat"),
+        body: {
+          last_csat: accessToken,
+          refresh_token: refreshToken,
+          nonce
+        },
+        headers: {
+          Authorization: `Bearer ${accessToken}`
+        },
+      })
+    );
+  }
+
   // Overrides
 
   getAddress() {

package/src/walletClient/index.js

@@ -396,7 +396,7 @@ class ElvWalletClient {
    * @methodGroup Login
    */
   async LogOut() {
-    if(this.__authorization && this.__authorization.nonce) {
+    if(this.__authorization && (this.__authorization.nonce || this.__authorization.installId)) {
       try {
         await this.client.signer.ReleaseCSAT({accessToken: this.AuthToken()});
       } catch(error) {
@@ -419,7 +419,7 @@ class ElvWalletClient {
   }
 
   async TokenStatus() {
-    if(!this.__authorization || !this.__authorization.nonce) {
+    if(!this.__authorization || !(this.__authorization.nonce || this.__authorization.installId)) {
       return true;
     }
 
@@ -482,6 +482,8 @@ class ElvWalletClient {
     shareEmail=false,
     extraData={},
     nonce,
+    installId,
+    appName,
     createRemoteToken=true,
     force=false,
     tokenDuration=24
@@ -497,9 +499,10 @@ class ElvWalletClient {
     let fabricToken, refreshToken, expiresAt;
     if(createRemoteToken && this.client.signer.remoteSigner) {
       expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
-      const tokenResponse = await this.client.signer.RetrieveCSAT({email, nonce, tenantId, force, duration: tokenDuration});
+      const tokenResponse = await this.client.signer.RetrieveCSAT({email, nonce, installId, appName, tenantId, force, duration: tokenDuration});
       fabricToken = tokenResponse.token;
-      nonce = tokenResponse.nonce;
+      nonce = tokenResponse.nonce || nonce;
+      installId = tokenResponse.installId || installId;
       refreshToken = tokenResponse.refresh_token;
     } else {
       expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
@@ -533,7 +536,8 @@ class ElvWalletClient {
         walletType: "Custodial",
         walletName: "Eluvio",
         register: true,
-        nonce
+        nonce,
+        installId
       }),
       signingToken: this.SetAuthorization({
         clusterToken: this.client.signer.authToken,
@@ -546,7 +550,8 @@ class ElvWalletClient {
         signerURIs,
         walletType: "Custodial",
         walletName: "Eluvio",
-        nonce
+        nonce,
+        installId
       })
     };
   }
@@ -607,7 +612,7 @@ class ElvWalletClient {
     return this.__authorization.fabricToken;
   }
 
-  SetAuthorization({clusterToken, fabricToken, refreshToken, tenantId, address, email, expiresAt, signerURIs, walletType, walletName, nonce, register=false}) {
+  SetAuthorization({clusterToken, fabricToken, refreshToken, tenantId, address, email, expiresAt, signerURIs, walletType, walletName, nonce, installId, register=false}) {
     address = this.client.utils.FormatAddress(address);
 
     this.__authorization = {
@@ -619,7 +624,8 @@ class ElvWalletClient {
       expiresAt,
       walletType,
       walletName,
-      nonce
+      nonce,
+      installId
     };
 
     if(clusterToken) {