wip

dfinity · Oct 24, 2023 · 366097c · 366097c
1 parent fde2362
commit 366097c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 154 deletions.
diff --git a/src/frontend/src/flows/verifiableCredentials/allow.ts b/src/frontend/src/flows/verifiableCredentials/allow.ts
@@ -23,7 +23,7 @@ const allowTemplate = ({
       <h1 class="t-title t-title--main">Credential Access Request</h1>
     </hgroup>
     <p class="t-paragraph">
-      Allow sharing VerifiedEmployee credential issued by
+      Allow verifying credential
       <strong class="t-strong">${providerOrigin}</strong> with
       <strong class="t-strong">${relyingOrigin}</strong>?
     </p>
@@ -51,7 +51,7 @@ const allowTemplate = ({
 
 export const allowPage = renderPage(allowTemplate);
 
-// Prompt the allow verifying credentials
+// Prompt to allow verifying credentials
 export const allow = ({
   relyingOrigin,
   providerOrigin,

diff --git a/src/frontend/src/flows/verifiableCredentials/prompt.ts b/src/frontend/src/flows/verifiableCredentials/prompt.ts
diff --git a/src/frontend/src/index.ts b/src/frontend/src/index.ts
@@ -88,10 +88,12 @@ const init = async () => {
   // https://github.com/dfinity/internet-identity#build-features
   showWarningIfNecessary();
 
+  const [path] = window.location.pathname.split("/").filter(Boolean);
+
   // Redirect to the FAQ
   // The canister should already be handling this with a 301 when serving "/faq", this is just a safety
   // measure.
-  if (window.location.pathname === "/faq") {
+  if (path === "faq") {
     const faqUrl = "https://identitysupport.dfinity.org/hc/en-us";
     window.location.replace(faqUrl);
   }
@@ -105,10 +107,7 @@ const init = async () => {
   const connection = new Connection(readCanisterId());
 
   // Check for VC flow
-  if (
-    window.location.pathname === "/vc-flow" ||
-    window.location.pathname === "/vc-flow/"
-  ) {
+  if (path === "vc-flow") {
     return vcFlow({ connection });
   }
 

diff --git a/src/frontend/vc-flow/index.html b/src/frontend/vc-flow/index.html
@@ -4,8 +4,6 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <!-- CSP directives injected by the canister -->
-    <meta replaceme-with-csp />
     <title>Internet Identity</title>
     <link rel="shortcut icon" href="/favicon.ico" />
     <link rel="stylesheet" href="../src/styles/main.css" />
@@ -14,10 +12,5 @@
   <body>
     <main id="pageContent" aria-live="polite"></main>
     <div id="loaderContainer"></div>
-
-    <!-- this is replaced by the backend before serving -->
-    <!-- XXX: DO NOT CHANGE! or if you do, change the bit that matches on this
-      exact string in the canister code-->
-    <script id="setupJs"></script>
   </body>
 </html>
diff --git a/src/showcase/src/pages/[page].astro b/src/showcase/src/pages/[page].astro
@@ -54,7 +54,6 @@ export const iiPageNames = [
   "showMessage",
   "showSpinner",
   "addDeviceSuccess",
-  "vcPrompt",
   "vcAllow",
   "vcSelect",
 ];

diff --git a/src/showcase/src/showcase.ts b/src/showcase/src/showcase.ts
@@ -59,7 +59,6 @@ import { TemplateResult, html, render } from "lit-html";
 import { asyncReplace } from "lit-html/directives/async-replace.js";
 
 import { allowPage } from "$src/flows/verifiableCredentials/allow";
-import { promptPage } from "$src/flows/verifiableCredentials/prompt";
 import { selectPage } from "$src/flows/verifiableCredentials/select";
 
 const identityBackground = loadIdentityBackground();
@@ -641,13 +640,6 @@ export const iiPages: Record<string, () => void> = {
       deviceAlias: chromeDevice.alias,
       onContinue: () => console.log("Continue"),
     }),
-  vcPrompt: () =>
-    promptPage({
-      _i18n: i18n,
-      userNumber: BigInt(1234),
-      knownDapp: openChat,
-      cancel: () => console.log("cancel"),
-    }),
   vcAllow: () =>
     allowPage({
       relyingOrigin: "https://oc.app",