URLにDIDが使えるようにする (#23)

app/routes/$handle.tsx

···
 };
 
 export async function loader({ request, params }: Route.LoaderArgs) {
-  const maybeHandle = params.handle;
-  if (!maybeHandle || !maybeHandle.includes(".")) {
-    return notFound();
-  }
   // この順で処理した場合ボードを持たない(=このサービスのユーザーでない)ユーザーの
   // データも作られてしまうが、一旦このままにしておく
   const user = await userService.findOrFetchUser({
-    handleOrDid: maybeHandle,
+    handleOrDid: params.handle,
   });
   if (!user) {
     return notFound();

app/server/service/userService/user.spec.ts

···
       // assert
       expect(actual).toBeNull();
     });
+    test("入力が明らかにドメインでなければnullを返す", async () => {
+      // arrange
+      // act
+      const actual = await userService.findOrFetchUser({
+        handleOrDid: "invalid",
+      });
+      // assert
+      expect(actual).toBeNull();
+    });
+    test("入力がDIDとして不正であればnullを返す", async () => {
+      // arrange
+      // act
+      const actual = await userService.findOrFetchUser({
+        handleOrDid: "did:plc:invalid",
+      });
+      // assert
+      expect(actual).toBeNull();
+    });
   });
 });

app/server/service/userService/user.ts

···
 import type { AppBskyActorDefs } from "@atproto/api";
+import { isDid } from "@atproto/did";
 import type { Prisma, User } from "@prisma/client";
 
 import { LinkatAgent } from "~/libs/agent";
···
   tx?: Prisma.TransactionClient;
   handleOrDid: string;
 }) => {
+  if (!handleOrDid.includes(".") && !isDid(handleOrDid)) {
+    return null;
+  }
   const user = await findUser({ tx, handleOrDid });
   if (user && !shouldRefetch(user)) {
     return user;

package.json

···
   },
   "dependencies": {
     "@atproto/api": "0.13.18",
+    "@atproto/did": "0.1.3",
     "@atproto/identity": "0.4.3",
     "@atproto/jwk-jose": "0.1.2",
     "@atproto/lexicon": "0.4.3",

pnpm-lock.yaml

···
       '@atproto/api':
         specifier: 0.13.18
         version: 0.13.18
+      '@atproto/did':
+        specifier: 0.1.3
+        version: 0.1.3
       '@atproto/identity':
         specifier: 0.4.3
         version: 0.4.3
···
 
   '@atproto/did@0.1.2':
     resolution: {integrity: sha512-gmY1SyAuqfmsFbIXkUIScfnULqn39FoUNz4oE0fUuMu9in6PEyoxlmD2lAo7Q3KMy3X/hvTn2u5f8W/2KuDg1w==}
+
+  '@atproto/did@0.1.3':
+    resolution: {integrity: sha512-ULD8Gw/KRRwLFZ2Z2L4DjmdOMrg8IYYlcjdSc+GQ2/QJSVnD2zaJJVTLd3vls121wGt/583rNaiZTT2DpBze4w==}
 
   '@atproto/identity@0.4.3':
     resolution: {integrity: sha512-DLXMWh57dHvIeBl+IvC+q20z0IdDZT1awOn84vDyxacL9DfhbiTy/zCUPFEzHyvfrilNG1tDA4zQzURubdFqNg==}
···
       uint8arrays: 3.0.0
 
   '@atproto/did@0.1.2':
+    dependencies:
+      zod: 3.23.8
+
+  '@atproto/did@0.1.3':
     dependencies:
       zod: 3.23.8