@eluvio/elv-client-js 4.0.36 → 4.0.38

package/package.json

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

package/src/walletClient/Utils.js

@@ -211,7 +211,9 @@ const Popup = ({url, title, w, h}) => {
     `
   );
 
-  if(window.focus) newWindow.focus();
+  if(newWindow && window.focus) {
+    newWindow.focus();
+  }
 
   return newWindow;
 };

package/src/walletClient/index.js

@@ -283,6 +283,42 @@ class ElvWalletClient {
     });
   }
 
+  async LogInURL({
+    mode="login",
+    provider,
+    marketplaceParams,
+    clearLogin
+  }) {
+    let loginUrl = new URL(this.appUrl);
+    loginUrl.hash = "/login";
+
+    loginUrl.searchParams.set("action", "login");
+
+    if(typeof window !== "undefined") {
+      loginUrl.searchParams.set("origin", window.location.origin);
+    }
+
+    if(provider) {
+      loginUrl.searchParams.set("provider", provider);
+    }
+
+    if(mode) {
+      loginUrl.searchParams.set("mode", mode);
+    }
+
+    if(marketplaceParams) {
+      loginUrl.searchParams.set("mid", (await this.MarketplaceInfo({marketplaceParams})).marketplaceHash);
+    } else if((this.selectedMarketplaceInfo || {}).marketplaceHash) {
+      loginUrl.searchParams.set("mid", this.selectedMarketplaceInfo.marketplaceHash);
+    }
+
+    if(clearLogin) {
+      loginUrl.searchParams.set("clear", "");
+    }
+
+    return loginUrl;
+  }
+
   /**
    * Direct the user to the Eluvio Media Wallet login page.
    *
@@ -313,29 +349,7 @@ class ElvWalletClient {
     clearLogin=false,
     callback
   }) {
-    let loginUrl = new URL(this.appUrl);
-    loginUrl.hash = "/login";
-
-    loginUrl.searchParams.set("origin", window.location.origin);
-    loginUrl.searchParams.set("action", "login");
-
-    if(provider) {
-      loginUrl.searchParams.set("provider", provider);
-    }
-
-    if(mode) {
-      loginUrl.searchParams.set("mode", mode);
-    }
-
-    if(marketplaceParams) {
-      loginUrl.searchParams.set("mid", (await this.MarketplaceInfo({marketplaceParams})).marketplaceHash);
-    } else if((this.selectedMarketplaceInfo || {}).marketplaceHash) {
-      loginUrl.searchParams.set("mid", this.selectedMarketplaceInfo.marketplaceHash);
-    }
-
-    if(clearLogin) {
-      loginUrl.searchParams.set("clear", "");
-    }
+    let loginUrl = await this.LogInURL({mode, provider, marketplaceParams, clearLogin});
 
     if(method === "redirect") {
       loginUrl.searchParams.set("response", "redirect");
@@ -632,10 +646,66 @@ class ElvWalletClient {
     return url.toString();
   }
 
+  async GenerateCodeAuth({url}={}) {
+    if(!url) {
+      url = await this.LogInURL({mode: "login"});
 
-  // Internal loading methods
+      url.searchParams.set("response", "code");
+      url.searchParams.set("source", "code");
+    }
+
+    const response = await Utils.ResponseToJson(
+      this.client.authClient.MakeAuthServiceRequest({
+        path: UrlJoin("as", "wlt", "login", "redirect", "metamask"),
+        method: "POST",
+        body: {
+          op: "create",
+          dest: url.toString()
+        }
+      })
+    );
 
+    response.code = response.id;
+    response.url = response.url.startsWith("https://") ? response.url : `https://${response.url}`;
+    response.metamask_url = response.metamask_url.startsWith("https://") ? response.metamask_url : `https://${response.metamask_url}`;
 
+    return response;
+  }
+
+  async SetCodeAuth({code, authToken}) {
+    await Utils.ResponseToJson(
+      this.client.authClient.MakeAuthServiceRequest({
+        path: UrlJoin("as", "wlt", "login", "session", code),
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${this.AuthToken()}`
+        },
+        body: {
+          op: "set",
+          id: code,
+          format: "auth_token",
+          payload: authToken
+        }
+      })
+    );
+  }
+
+  async GetCodeAuth({code, passcode}) {
+    try {
+      return await Utils.ResponseToJson(
+        this.client.authClient.MakeAuthServiceRequest({
+          path: UrlJoin("as", "wlt", "login", "redirect", "metamask", code, passcode),
+          method: "GET",
+        })
+      );
+    } catch(error) {
+      if(error && error.status === 404) { return undefined; }
+
+      throw error;
+    }
+  }
+
+  // Internal loading methods
 
   async LoadAvailableMarketplaces(forceReload=false) {
     if(!forceReload && Object.keys(this.availableMarketplaces) > 0) {

package/typeSpecs/Default.js

@@ -77,7 +77,7 @@ const defaultSpec = {
   ],
   searchable_links: [
     {target: "/public/asset_metadata", link_key: "asset_metadata"},
-    {target: "/public/assets", link_key: "assets"},
+    {target: "/assets", link_key: "assets"},
     {target: "/offerings", link_key: "offerings"},
     {target: "/video_tags", link_key: "video_tags"}
   ]

package/utilities/GenerateFabricToken.js

@@ -0,0 +1,23 @@
+const { ElvClient } = require("../src/ElvClient");
+
+const GenerateFabricToken = async () => {
+  try {
+    const client = await ElvClient.FromNetworkName({networkName: "main"});
+
+    const wallet = client.GenerateWallet();
+    const signer = wallet.AddAccount({
+      privateKey: process.env.PRIVATE_KEY
+    });
+
+    client.SetSigner({signer});
+
+    console.log(await client.CreateFabricToken({duration: process.env.DURATION}));
+  } catch(error) {
+    console.error(error);
+    console.error(JSON.stringify(error, null, 2));
+  }
+
+  process.exit(0);
+};
+
+GenerateFabricToken();