Skip to content

Commit

Permalink
feat: add error states for general, passkey and wallet-connect errors (
Browse files Browse the repository at this point in the history
…#959)

*feat: added .nvmrc to enforce node version for local development

* feat: auth card error states

* feat: add wallet error states

* feat: integrate error states to wallet connect

* feat: storybook auto-docs, all auth types in story

* fix: registration disclaimer opening new tab

---------

Co-authored-by: rob chang <[email protected]>
  • Loading branch information
iykazrji and RobChangCA committed Sep 13, 2024
1 parent f26f271 commit 329abe9
Show file tree
Hide file tree
Showing 42 changed files with 2,023 additions and 169 deletions.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
22.8.0
1 change: 0 additions & 1 deletion account-kit/react/.storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { StorybookConfig } from "@storybook/react-vite";

import react from "@vitejs/plugin-react";
import { mergeConfig } from "vite";

Expand Down
1 change: 0 additions & 1 deletion account-kit/react/.storybook/preview.ts

This file was deleted.

59 changes: 59 additions & 0 deletions account-kit/react/.storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import "./tailwind.css";

import type { Preview } from "@storybook/react";
import { initialize, mswLoader } from "msw-storybook-addon";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { AlchemyAccountProvider, createConfig } from "../src";
import React, { useEffect } from "react";
import { sepolia } from "@account-kit/infra";

const queryClient = new QueryClient();

initialize();

const config = createConfig(
{
rpcUrl: "/api/rpc",
chain: sepolia,
ssr: true,
},
{
illustrationStyle: "outline",
auth: {
sections: [[{ type: "email" as const }], [{ type: "passkey" as const }]],
addPasskeyOnSignup: true,
},
}
);

const preview: Preview = {
decorators: [
(Story, { args }) => {
// Sync CSS variables
useEffect(() => {
const root = document.querySelector(":root") as HTMLElement;
if (args.isLight === false) {
root.classList.remove("light");
root.classList.add("dark");
} else {
root.classList.remove("dark");
root.classList.add("light");
}
}, [args]);
return (
<QueryClientProvider client={queryClient}>
<AlchemyAccountProvider config={config} queryClient={queryClient}>
<Story />
</AlchemyAccountProvider>
</QueryClientProvider>
);
},
],
args: {
isLight: true,
},
loaders: [mswLoader],
tags: ["autodocs"],
};

export default preview;
7 changes: 7 additions & 0 deletions account-kit/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
"@storybook/testing-library": "^0.2.2",
"@tanstack/react-query": "^5.28.9",
"autoprefixer": "^10.4.20",
"msw": "^2.4.4",
"msw-storybook-addon": "^2.0.3",
"postcss": "^8.4.45",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down Expand Up @@ -101,5 +103,10 @@
"gitHead": "ee46e8bb857de3b631044fa70714ea706d9e317d",
"optionalDependencies": {
"alchemy-sdk": "^3.0.0"
},
"msw": {
"workerDirectory": [
"public"
]
}
}
284 changes: 284 additions & 0 deletions account-kit/react/public/mockServiceWorker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
/* eslint-disable */
/* tslint:disable */

/**
* Mock Service Worker.
* @see https://github.com/mswjs/msw
* - Please do NOT modify this file.
* - Please do NOT serve this file on production.
*/

const PACKAGE_VERSION = "2.4.4";
const INTEGRITY_CHECKSUM = "26357c79639bfa20d64c0efca2a87423";
const IS_MOCKED_RESPONSE = Symbol("isMockedResponse");
const activeClientIds = new Set();

self.addEventListener("install", function () {
self.skipWaiting();
});

self.addEventListener("activate", function (event) {
event.waitUntil(self.clients.claim());
});

self.addEventListener("message", async function (event) {
const clientId = event.source.id;

if (!clientId || !self.clients) {
return;
}

const client = await self.clients.get(clientId);

if (!client) {
return;
}

const allClients = await self.clients.matchAll({
type: "window",
});

switch (event.data) {
case "KEEPALIVE_REQUEST": {
sendToClient(client, {
type: "KEEPALIVE_RESPONSE",
});
break;
}

case "INTEGRITY_CHECK_REQUEST": {
sendToClient(client, {
type: "INTEGRITY_CHECK_RESPONSE",
payload: {
packageVersion: PACKAGE_VERSION,
checksum: INTEGRITY_CHECKSUM,
},
});
break;
}

case "MOCK_ACTIVATE": {
activeClientIds.add(clientId);

sendToClient(client, {
type: "MOCKING_ENABLED",
payload: true,
});
break;
}

case "MOCK_DEACTIVATE": {
activeClientIds.delete(clientId);
break;
}

case "CLIENT_CLOSED": {
activeClientIds.delete(clientId);

const remainingClients = allClients.filter((client) => {
return client.id !== clientId;
});

// Unregister itself when there are no more clients
if (remainingClients.length === 0) {
self.registration.unregister();
}

break;
}
}
});

self.addEventListener("fetch", function (event) {
const { request } = event;

// Bypass navigation requests.
if (request.mode === "navigate") {
return;
}

// Opening the DevTools triggers the "only-if-cached" request
// that cannot be handled by the worker. Bypass such requests.
if (request.cache === "only-if-cached" && request.mode !== "same-origin") {
return;
}

// Bypass all requests when there are no active clients.
// Prevents the self-unregistered worked from handling requests
// after it's been deleted (still remains active until the next reload).
if (activeClientIds.size === 0) {
return;
}

// Generate unique request ID.
const requestId = crypto.randomUUID();
event.respondWith(handleRequest(event, requestId));
});

async function handleRequest(event, requestId) {
const client = await resolveMainClient(event);
const response = await getResponse(event, client, requestId);

// Send back the response clone for the "response:*" life-cycle events.
// Ensure MSW is active and ready to handle the message, otherwise
// this message will pend indefinitely.
if (client && activeClientIds.has(client.id)) {
(async function () {
const responseClone = response.clone();

sendToClient(
client,
{
type: "RESPONSE",
payload: {
requestId,
isMockedResponse: IS_MOCKED_RESPONSE in response,
type: responseClone.type,
status: responseClone.status,
statusText: responseClone.statusText,
body: responseClone.body,
headers: Object.fromEntries(responseClone.headers.entries()),
},
},
[responseClone.body]
);
})();
}

return response;
}

// Resolve the main client for the given event.
// Client that issues a request doesn't necessarily equal the client
// that registered the worker. It's with the latter the worker should
// communicate with during the response resolving phase.
async function resolveMainClient(event) {
const client = await self.clients.get(event.clientId);

if (client?.frameType === "top-level") {
return client;
}

const allClients = await self.clients.matchAll({
type: "window",
});

return allClients
.filter((client) => {
// Get only those clients that are currently visible.
return client.visibilityState === "visible";
})
.find((client) => {
// Find the client ID that's recorded in the
// set of clients that have registered the worker.
return activeClientIds.has(client.id);
});
}

async function getResponse(event, client, requestId) {
const { request } = event;

// Clone the request because it might've been already used
// (i.e. its body has been read and sent to the client).
const requestClone = request.clone();

function passthrough() {
const headers = Object.fromEntries(requestClone.headers.entries());

// Remove internal MSW request header so the passthrough request
// complies with any potential CORS preflight checks on the server.
// Some servers forbid unknown request headers.
delete headers["x-msw-intention"];

return fetch(requestClone, { headers });
}

// Bypass mocking when the client is not active.
if (!client) {
return passthrough();
}

// Bypass initial page load requests (i.e. static assets).
// The absence of the immediate/parent client in the map of the active clients
// means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
// and is not ready to handle requests.
if (!activeClientIds.has(client.id)) {
return passthrough();
}

// Notify the client that a request has been intercepted.
const requestBuffer = await request.arrayBuffer();
const clientMessage = await sendToClient(
client,
{
type: "REQUEST",
payload: {
id: requestId,
url: request.url,
mode: request.mode,
method: request.method,
headers: Object.fromEntries(request.headers.entries()),
cache: request.cache,
credentials: request.credentials,
destination: request.destination,
integrity: request.integrity,
redirect: request.redirect,
referrer: request.referrer,
referrerPolicy: request.referrerPolicy,
body: requestBuffer,
keepalive: request.keepalive,
},
},
[requestBuffer]
);

switch (clientMessage.type) {
case "MOCK_RESPONSE": {
return respondWithMock(clientMessage.data);
}

case "PASSTHROUGH": {
return passthrough();
}
}

return passthrough();
}

function sendToClient(client, message, transferrables = []) {
return new Promise((resolve, reject) => {
const channel = new MessageChannel();

channel.port1.onmessage = (event) => {
if (event.data && event.data.error) {
return reject(event.data.error);
}

resolve(event.data);
};

client.postMessage(
message,
[channel.port2].concat(transferrables.filter(Boolean))
);
});
}

async function respondWithMock(response) {
// Setting response status code to 0 is a no-op.
// However, when responding with a "Response.error()", the produced Response
// instance will have status code set to 0. Since it's not possible to create
// a Response instance with status code 0, handle that use-case separately.
if (response.status === 0) {
return Response.error();
}

const mockedResponse = new Response(response.body, response);

Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
value: true,
enumerable: true,
});

return mockedResponse;
}
Loading

0 comments on commit 329abe9

Please sign in to comment.