feat: add re-introduce user.id fields

denoland · Jan 22, 2024 · 6ee70ac · 6ee70ac
1 parent 5ec7f0b
commit 6ee70ac
Show file tree

Hide file tree

Showing 12 changed files with 120 additions and 70 deletions.
diff --git a/e2e_test.ts b/e2e_test.ts
@@ -125,6 +125,7 @@ Deno.test("[e2e] GET /", async () => {
 
 Deno.test("[e2e] GET /callback", async (test) => {
   setupEnv();
+  const id = crypto.randomUUID();
   const login = crypto.randomUUID();
   const sessionId = crypto.randomUUID();
 
@@ -137,17 +138,19 @@ Deno.test("[e2e] GET /callback", async (test) => {
       },
       sessionId,
     };
-    const id = crypto.randomUUID();
     const handleCallbackStub = stub(
       _internals,
       "handleCallback",
       returnsNext([Promise.resolve(handleCallbackResp)]),
     );
     const githubRespBody = {
+      id,
       login,
       email: crypto.randomUUID(),
     };
-    const stripeRespBody: Partial<Stripe.Response<Stripe.Customer>> = { id };
+    const stripeRespBody: Partial<Stripe.Response<Stripe.Customer>> = {
+      id: crypto.randomUUID(),
+    };
     const fetchStub = stub(
       window,
       "fetch",
@@ -161,7 +164,7 @@ Deno.test("[e2e] GET /callback", async (test) => {
     handleCallbackStub.restore();
     fetchStub.restore();
 
-    const user = await getUser(githubRespBody.login);
+    const user = await getUser(githubRespBody.id);
     assert(user !== null);
     assertEquals(user.sessionId, handleCallbackResp.sessionId);
   });
@@ -175,17 +178,19 @@ Deno.test("[e2e] GET /callback", async (test) => {
       },
       sessionId: crypto.randomUUID(),
     };
-    const id = crypto.randomUUID();
     const handleCallbackStub = stub(
       _internals,
       "handleCallback",
       returnsNext([Promise.resolve(handleCallbackResp)]),
     );
     const githubRespBody = {
+      id,
       login,
       email: crypto.randomUUID(),
     };
-    const stripeRespBody: Partial<Stripe.Response<Stripe.Customer>> = { id };
+    const stripeRespBody: Partial<Stripe.Response<Stripe.Customer>> = {
+      id: crypto.randomUUID(),
+    };
     const fetchStub = stub(
       window,
       "fetch",
@@ -199,7 +204,7 @@ Deno.test("[e2e] GET /callback", async (test) => {
     handleCallbackStub.restore();
     fetchStub.restore();
 
-    const user = await getUser(githubRespBody.login);
+    const user = await getUser(githubRespBody.id);
     assert(user !== null);
     assertNotEquals(user.sessionId, sessionId);
   });
@@ -418,7 +423,7 @@ Deno.test("[e2e] POST /submit", async (test) => {
         body,
       }),
     );
-    const items = await collectValues(listItemsByUser(user.login));
+    const items = await collectValues(listItemsByUser(user.id));
 
     assertRedirect(resp, "/");
     // Deep partial match since the item ID is a ULID generated at runtime
@@ -493,7 +498,7 @@ Deno.test("[e2e] GET /api/users/[login]/items", async (test) => {
   const user = randomUser();
   const item: Item = {
     ...randomItem(),
-    userLogin: user.login,
+    userId: user.id,
   };
   const req = new Request(`http://localhost/api/users/${user.login}/items`);
 
@@ -547,7 +552,7 @@ Deno.test("[e2e] POST /api/vote", async (test) => {
   });
 
   await test.step("creates a vote", async () => {
-    const item = { ...randomItem(), userLogin: user.login };
+    const item = { ...randomItem(), userId: user.id };
     await createItem(item);
     const resp = await handler(
       new Request(url, {
@@ -700,7 +705,7 @@ Deno.test("[e2e] POST /api/stripe-webhooks", async (test) => {
     constructEventAsyncStub.restore();
 
     assertEquals(resp.status, STATUS_CODE.Created);
-    assertEquals(await getUser(user.login), { ...user, isSubscribed: true });
+    assertEquals(await getUser(user.id), { ...user, isSubscribed: true });
   });
 
   await test.step("serves not found response if the user is not found for subscription deletion", async () => {
@@ -750,7 +755,7 @@ Deno.test("[e2e] POST /api/stripe-webhooks", async (test) => {
 
     constructEventAsyncStub.restore();
 
-    assertEquals(await getUser(user.login), { ...user, isSubscribed: false });
+    assertEquals(await getUser(user.id), { ...user, isSubscribed: false });
     assertEquals(resp.status, STATUS_CODE.Accepted);
   });
 
@@ -970,11 +975,11 @@ Deno.test("[e2e] GET /api/me/votes", async () => {
   await createItem(item1);
   await createItem(item2);
   await createVote({
-    userLogin: user.login,
+    userId: user.id,
     itemId: item1.id,
   });
   await createVote({
-    userLogin: user.login,
+    userId: user.id,
     itemId: item2.id,
   });
   const resp = await handler(

diff --git a/islands/ItemsList.tsx b/islands/ItemsList.tsx
@@ -105,12 +105,12 @@ function ItemSummary(props: ItemSummaryProps) {
         </p>
         <p class="text-gray-500">
           <GitHubAvatarImg
-            login={props.item.userLogin}
+            login={props.item.id}
             size={24}
             class="mr-2"
           />
-          <a class="hover:underline" href={`/users/${props.item.userLogin}`}>
-            {props.item.userLogin}
+          <a class="hover:underline" href={`/users/${props.item.id}`}>
+            {props.item.userId}
           </a>{" "}
           {timeAgo(new Date(decodeTime(props.item.id)))}
         </p>

diff --git a/plugins/kv_oauth.ts b/plugins/kv_oauth.ts
@@ -42,10 +42,11 @@ export default {
         );
 
         const githubUser = await getGitHubUser(tokens.accessToken);
-        const user = await getUser(githubUser.login);
+        const user = await getUser(githubUser.id);
 
         if (user === null) {
           const user: User = {
+            id: githubUser.id,
             login: githubUser.login,
             sessionId,
             isSubscribed: false,

diff --git a/routes/api/me/votes.ts b/routes/api/me/votes.ts
@@ -5,7 +5,7 @@ import { SignedInState } from "@/plugins/session.ts";
 
 export const handler: Handlers<undefined, SignedInState> = {
   async GET(_req, ctx) {
-    const iter = listItemsVotedByUser(ctx.state.sessionUser.login);
+    const iter = listItemsVotedByUser(ctx.state.sessionUser.id);
     const items = await collectValues(iter);
     return Response.json(items);
   },

diff --git a/routes/api/users/[login]/index.ts b/routes/api/users/[login]/index.ts
@@ -1,10 +1,10 @@
 // Copyright 2023-2024 the Deno authors. All rights reserved. MIT license.
 import type { Handlers } from "$fresh/server.ts";
-import { getUser } from "@/utils/db.ts";
+import { getUserByLogin } from "@/utils/db.ts";
 
 export const handler: Handlers = {
   async GET(_req, ctx) {
-    const user = await getUser(ctx.params.login);
+    const user = await getUserByLogin(ctx.params.login);
     if (user === null) throw new Deno.errors.NotFound("User not found");
     return Response.json(user);
   },

diff --git a/routes/api/users/[login]/items.ts b/routes/api/users/[login]/items.ts
@@ -1,15 +1,15 @@
 // Copyright 2023-2024 the Deno authors. All rights reserved. MIT license.
 import type { Handlers } from "$fresh/server.ts";
-import { collectValues, getUser, listItemsByUser } from "@/utils/db.ts";
+import { collectValues, getUserByLogin, listItemsByUser } from "@/utils/db.ts";
 import { getCursor } from "@/utils/http.ts";
 
 export const handler: Handlers = {
   async GET(req, ctx) {
-    const user = await getUser(ctx.params.login);
+    const user = await getUserByLogin(ctx.params.login);
     if (user === null) throw new Deno.errors.NotFound("User not found");
 
     const url = new URL(req.url);
-    const iter = listItemsByUser(ctx.params.login, {
+    const iter = listItemsByUser(user.id, {
       cursor: getCursor(url),
       limit: 10,
     });

diff --git a/routes/api/vote.ts b/routes/api/vote.ts
@@ -14,7 +14,7 @@ export const handler: Handlers<undefined, SignedInState> = {
 
     await createVote({
       itemId,
-      userLogin: ctx.state.sessionUser.login,
+      userId: ctx.state.sessionUser.id,
     });
 
     return new Response(null, { status: STATUS_CODE.Created });

diff --git a/routes/submit.tsx b/routes/submit.tsx
@@ -33,7 +33,7 @@ export const handler: Handlers<undefined, SignedInState> = {
 
     await createItem({
       id: ulid(),
-      userLogin: ctx.state.sessionUser.login,
+      userId: ctx.state.sessionUser.id,
       title,
       url,
       score: 0,