Merge branch 'main' into sea-snake/remove-last-used-identity

Author: aterga

.github/workflows/canister-tests.yml

@@ -502,6 +502,9 @@ jobs:
       matrix:
         device: ["desktop", "mobile"]
         shard: ["1_6", "2_6", "3_6", "4_6", "5_6", "6_6"]
+        include:
+          - device: "chrome-extension"
+            shard: "1_1"
       # Make sure that one failing test does not cancel all other matrix jobs
       fail-fast: false
 
@@ -589,6 +592,10 @@ jobs:
           dev_server_pid=$!
           echo "dev_server_pid=$dev_server_pid" >> "$GITHUB_OUTPUT"
 
+      - name: Build test app frontend (chrome extension)
+        if: matrix.device == 'chrome-extension'
+        run: npm run build --prefix demos/test-app
+
       - name: Run Playwright tests
         run: |
           npx playwright test --project ${{ matrix.device }} --workers 1 --shard=$(tr <<<'${{ matrix.shard }}' -s _ /) --reporter=line,html

demos/test-app/src/public/background.js

@@ -0,0 +1 @@
+chrome.runtime.onInstalled.addListener(() => {});

demos/test-app/src/public/manifest.json

@@ -0,0 +1,12 @@
+{
+  "manifest_version": 3,
+  "name": "II Test App",
+  "version": "1.0",
+  "background": {
+    "service_worker": "background.js"
+  },
+  "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+O98URHgu2I7Zbpfc28nI0GU7t4smaMaG25MEeHSjzLW2khGsGrBAFZBWrZ910RDGdZqp+1fCn+rr86fT/ahd05EBWJPCZ2R1JtDGhju2Rf2kGGiHMctlUHgx+J3O1T1mL/iOfjhWQ8p26keeaL36Tfp3FI7gUL9GgZV/mwE5NssvlPnZZpGI5Zxdtrh8q2gMzvGuu5LLwEO2GXPy9l3ExcDlRax9CUVAB5oCVlWaF3Lrbz0BZa+Ak6nJ0UGownAk470FneWKcl3UdPSkAM9yhCxtWcnImJOnT/LA8wqkF6H6Wg43gUMGbBCug7VCbYL/+T26qYLQSGH7RW7oxqwIDAQAB",
+  "content_security_policy": {
+    "extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'"
+  }
+}

playwright.config.ts

@@ -59,5 +59,9 @@ export default defineConfig({
         },
       },
     },
+    {
+      name: "chrome-extension",
+      testDir: "./src/frontend/tests/e2e-playwright-chrome-extension",
+    },
   ],
 });

src/frontend/src/lib/utils/transport/legacy.ts

@@ -11,6 +11,7 @@ import {
   AuthRequestCodec,
   DelegationParamsCodec,
   AuthResponseCodec,
+  OriginSchema,
 } from "$lib/utils/transport/utils";
 import {
   Delegation,
@@ -27,7 +28,7 @@ const REDIRECT_SESSION_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
 const OUTER_DELEGATION_EXPIRATION_MS = 30 * 24 * 60 * 60 * 1000; // 30 days
 
 const RedirectMessageSchema = z.object({
-  origin: z.httpUrl(),
+  origin: OriginSchema, // Accepts http, https, chrome-extension, etc.
   data: z.unknown(),
 });
 

src/frontend/src/lib/utils/transport/utils.ts

@@ -133,6 +133,11 @@ export const StringOrNumberToBigIntCodec = z.codec(
   },
 );
 
+/**
+ * Validates that a string is a valid origin with
+ * no path, query, or fragment. Accepts any URL
+ * scheme (e.g. http, https, chrome-extension).
+ */
 export const OriginSchema = z.string().refine(
   (value) => {
     try {

src/frontend/tests/e2e-playwright-chrome-extension/chromeExtension.spec.ts

@@ -0,0 +1,34 @@
+import { expect } from "@playwright/test";
+import { chromeExtensionTest } from "../e2e-playwright/fixtures/chrome-extension";
+import { addVirtualAuthenticator } from "../e2e-playwright/utils";
+
+const authorizeTest = chromeExtensionTest.extend({
+  authorizeConfig: ({ extensionUrl }, use) =>
+    use({
+      protocol: "legacy",
+      testAppURL: extensionUrl,
+    }),
+});
+
+authorizeTest.describe("Authorize from chrome extension", () => {
+  authorizeTest.afterEach(({ authorizedPrincipal }) => {
+    expect(authorizedPrincipal?.isAnonymous()).toBe(false);
+  });
+
+  authorizeTest("should authenticate", async ({ authorizePage }) => {
+    await addVirtualAuthenticator(authorizePage.page);
+    await authorizePage.page
+      .getByRole("button", { name: "Continue with Passkey" })
+      .click();
+    await authorizePage.page
+      .getByRole("button", { name: "Create new identity" })
+      .click();
+    await authorizePage.page.getByLabel("Identity name").fill("Extension User");
+    await authorizePage.page
+      .getByRole("button", { name: "Create identity" })
+      .click();
+    await authorizePage.page
+      .getByRole("button", { name: "Continue", exact: true })
+      .click();
+  });
+});

src/frontend/tests/e2e-playwright/fixtures/chrome-extension.ts

@@ -0,0 +1,43 @@
+import { chromium, type BrowserContext } from "@playwright/test";
+import path from "path";
+import { test } from "./";
+
+const pathToExtension = path.resolve("demos/test-app/dist");
+
+export const chromeExtensionTest = test.extend<{
+  context: BrowserContext;
+  extensionId: string;
+  extensionUrl: string;
+}>({
+  // Spread operator is required by PlayWright
+  // eslint-disable-next-line no-empty-pattern
+  context: async ({}, use) => {
+    const context = await chromium.launchPersistentContext("", {
+      channel: "chromium",
+      args: [
+        `--disable-extensions-except=${pathToExtension}`,
+        `--load-extension=${pathToExtension}`,
+        "--ignore-certificate-errors",
+        "--host-resolver-rules=MAP * localhost:5173, EXCLUDE localhost",
+      ],
+    });
+    // Close the default about:blank page so that page indices align
+    // with what the authorize fixtures expect.
+    const [defaultPage] = context.pages();
+    if (defaultPage !== undefined) {
+      await defaultPage.close();
+    }
+    await use(context);
+    await context.close();
+  },
+  extensionId: async ({ context }, use) => {
+    let [serviceWorker] = context.serviceWorkers();
+    if (serviceWorker === undefined) {
+      serviceWorker = await context.waitForEvent("serviceworker");
+    }
+    await use(serviceWorker.url().split("/")[2]);
+  },
+  extensionUrl: async ({ extensionId }, use) => {
+    await use(`chrome-extension://${extensionId}/index.html`);
+  },
+});