Merge pull request #117 from HunnySajid/feat/firefox-compatibility

feat: make requestAutoSignin compatible with firefox
WebOfTrust · Mar 1, 2024 · 7fa90d1 · 7fa90d1
2 parents b4c3367 + bf82b76
commit 7fa90d1
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 220 deletions.
diff --git a/example-web/my-app/package-lock.json b/example-web/my-app/package-lock.json
diff --git a/example-web/my-app/src/App.js b/example-web/my-app/src/App.js
@@ -8,7 +8,8 @@ import {
   requestCredential,
   requestAidORCred,
   trySettingVendorUrl,
-} from "./signify-polaris-web";
+  canCallAsync,
+} from "signify-polaris-web";
 import Button from "@mui/material/Button";
 import Alert from "@mui/material/Alert";
 import CircularProgress from "@mui/material/CircularProgress";
@@ -66,6 +67,18 @@ function App() {
     setParsedSignifyData(null);
   };
 
+  const handleRequestAutoSignin = async () => {
+    console.log("canCallAsync()", canCallAsync());
+    if (canCallAsync()) {
+      const resp = await requestAutoSignin();
+      if (resp) {
+        handleSignifyData(resp);
+      }
+    } else {
+      requestAutoSignin();
+    }
+  };
+
   const renderData = () => {
     if (extensionInstalled === null) return <CircularIndeterminate />;
 
@@ -93,7 +106,7 @@ function App() {
           <Button
             variant="contained"
             color="success"
-            onClick={requestAutoSignin}
+            onClick={handleRequestAutoSignin}
           >
             Auto Sign in
           </Button>

diff --git a/example-web/my-app/src/signify-polaris-web/index.js b/example-web/my-app/src/signify-polaris-web/index.js
diff --git a/example-web/my-app/src/signify-polaris-web/pubsub.js b/example-web/my-app/src/signify-polaris-web/pubsub.js
diff --git a/src/components/credentialList.tsx b/src/components/credentialList.tsx
@@ -35,7 +35,7 @@ export function CredentialList(): JSX.Element {
         </div>
       ))}
       {!isLoading && !credentials?.length ? (
-        <p className="">{formatMessage({ id: "message.noItems" })}</p>
+        <p className="text-xs">{formatMessage({ id: "message.noItems" })}</p>
       ) : (
         <></>
       )}

diff --git a/src/components/identifierList.tsx b/src/components/identifierList.tsx
@@ -94,7 +94,7 @@ export function IdentifierList(): JSX.Element {
         </div>
       ))}
       {!isLoading && !aids?.length ? (
-        <p className="">{formatMessage({ id: "message.noItems" })}</p>
+        <p className="text-xs">{formatMessage({ id: "message.noItems" })}</p>
       ) : (
         <></>
       )}

diff --git a/src/components/signinList.tsx b/src/components/signinList.tsx
@@ -91,7 +91,7 @@ export function SigninList(): JSX.Element {
         </div>
       ))}
       {!isLoading && !signins?.length ? (
-        <p className="">{formatMessage({ id: "message.noItems" })}</p>
+        <p className="text-xs">{formatMessage({ id: "message.noItems" })}</p>
       ) : (
         <></>
       )}

diff --git a/src/pages/background/index.ts b/src/pages/background/index.ts
@@ -83,7 +83,6 @@ chrome.runtime.onMessage.addListener(function (
         // Validate that message comes from a page that has a signin
         const origin = removeSlash(sender.url);
         const signins = await getSigninsByDomain(origin);
-        console.log("signins", signins);
         const autoSignin = signins?.find((signin) => signin.autoSignin);
         if (!signins?.length || !autoSignin) {
           sendResponse({
@@ -318,63 +317,35 @@ chrome.runtime.onMessageExternal.addListener(function (
     console.log("Message received from external source: ", sender);
     console.log("Message received from external request: ", message);
 
-    // if (
-    //   message.type === "fetch-resource" &&
-    //   message.subtype === "auto-signin-signature"
-    // ) {
-    //   // Validate that message comes from a page that has a signin
-    //   const origin = removeSlash(sender.url);
-    //   const signins = await getSigninsByDomain(origin);
-    //   console.log("signins", signins);
-    //   const autoSignin = signins?.find((signin) => signin.autoSignin);
-    //   if (!signins?.length || !autoSignin) {
-    //     sendResponse({
-    //       error: { code: 404, message: "auto signin not found" },
-    //     });
-    //     return;
-    //   }
-
-    //   const signedHeaders = await signifyService.signHeaders(
-    //     // sigin can either have identifier or credential
-    //     autoSignin?.identifier
-    //       ? autoSignin?.identifier?.name
-    //       : autoSignin?.credential?.issueeName,
-    //     origin
-    //   );
-    //   let jsonHeaders: { [key: string]: string } = {};
-    //   for (const pair of signedHeaders.entries()) {
-    //     jsonHeaders[pair[0]] = pair[1];
-    //   }
-    //   sendResponse({ data: { headers: jsonHeaders } });
-    // }
-
-
-    // if (
-    //   message.type === "vendor-info" &&
-    //   message.subtype === "attempt-set-vendor-url"
-    // ) {
-    //   const { vendorUrl } = message?.data ?? {};
-    //   if (!vendorUrl) {
-    //     return;
-    //   }
-
-    //   const _vendorUrl = await configService.getUrl();
-    //   if (!_vendorUrl) {
-    //     try {
-    //       const resp = await (await fetch(vendorUrl)).json();
-    //       if (resp?.agentUrl) {
-    //         await configService.setAgentUrl(resp?.agentUrl);
-    //       }
-    //       await configService.setData(resp);
-    //       if (resp?.icon) {
-    //         await setActionIcon(resp?.icon);
-    //       }
-    //       await configService.setUrl(vendorUrl);
-    //     } catch (error) {}
-    //   }
+    if (
+      message.type === "fetch-resource" &&
+      message.subtype === "auto-signin-signature"
+    ) {
+      // Validate that message comes from a page that has a signin
+      const origin = removeSlash(sender.url);
+      const signins = await getSigninsByDomain(origin);
+      console.log("signins", signins);
+      const autoSignin = signins?.find((signin) => signin.autoSignin);
+      if (!signins?.length || !autoSignin) {
+        sendResponse({
+          error: { code: 404, message: "auto signin not found" },
+        });
+        return;
+      }
 
-    //   sendResponse({ data: { _vendorUrl } });
-    // }
+      const signedHeaders = await signifyService.signHeaders(
+        // sigin can either have identifier or credential
+        autoSignin?.identifier
+          ? autoSignin?.identifier?.name
+          : autoSignin?.credential?.issueeName,
+        origin
+      );
+      let jsonHeaders: { [key: string]: string } = {};
+      for (const pair of signedHeaders.entries()) {
+        jsonHeaders[pair[0]] = pair[1];
+      }
+      sendResponse({ data: { headers: jsonHeaders } });
+    }
   })();
 
   // return true to indicate chrome api to send a response asynchronously

diff --git a/src/pages/content/index.tsx b/src/pages/content/index.tsx
@@ -110,7 +110,6 @@ window.addEventListener(
                 { type: "signify-signature", data: data },
                 "*"
               );
-              // pubsub.publish("signify-signature", data);
             }
           }