feat: auth rework

.gitignore

@@ -43,3 +43,5 @@ bun.lockb
 /playwright/.cache/
 /playwright/.auth/
 /playwright/results
+
+certificates

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "prepare": "husky",
-    "dev": "next dev --turbo",
+    "dev": "next dev --turbo --experimental-https",
     "build": "next build",
     "start": "next start",
     "type-check": "tsc --pretty --noEmit --incremental false",
@@ -41,7 +41,6 @@
     "event-source-plus": "^0.1.8",
     "foxact": "^0.2.43",
     "jotai": "^2.10.3",
-    "jwt-decode": "^4.0.0",
     "mini-svg-data-uri": "^1.4.4",
     "next": "15.0.3",
     "next-themes": "^0.4.4",

src/app/(dashboard)/[guildUrlName]/components/JoinButton.tsx

@@ -6,10 +6,8 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from "@/components/ui/Tooltip";
-import { GUILD_AUTH_COOKIE_NAME } from "@/config/constants";
 import { env } from "@/lib/env";
 import { fetchGuildLeave } from "@/lib/fetchers";
-import { getCookieClientSide } from "@/lib/getCookieClientSide";
 import { guildOptions, userOptions } from "@/lib/options";
 import type { Schemas } from "@guildxyz/types";
 import { CheckCircle, SignOut } from "@phosphor-icons/react/dist/ssr";
@@ -34,8 +32,6 @@ export const JoinButton = () => {
 
   const joinMutation = useMutation({
     mutationFn: async () => {
-      //TODO: Handle error here, throw error in funciton if needed
-      const token = getCookieClientSide(GUILD_AUTH_COOKIE_NAME)!;
       const url = new URL(
         `api/guild/${guild.data.id}/join`,
         env.NEXT_PUBLIC_API,
@@ -45,7 +41,6 @@ export const JoinButton = () => {
         method: "post",
         maxRetryCount: 0,
         headers: {
-          "x-auth-token": token,
           "content-type": "application/json",
         },
       });

src/app/(dashboard)/[guildUrlName]/components/JoinGuild.tsx

@@ -1,9 +1,7 @@
 "use client";
 
 import { Button } from "@/components/ui/Button";
-import { GUILD_AUTH_COOKIE_NAME } from "@/config/constants";
 import { env } from "@/lib/env";
-import { getCookieClientSide } from "@/lib/getCookieClientSide";
 import { guildOptions, userOptions } from "@/lib/options";
 import type { Schemas } from "@guildxyz/types";
 import { CheckCircle } from "@phosphor-icons/react/dist/ssr";
@@ -23,8 +21,6 @@ export const JoinGuild = () => {
 
   const { mutate, isPending } = useMutation({
     mutationFn: async () => {
-      //TODO: Handle error here, throw error in funciton if needed
-      const token = getCookieClientSide(GUILD_AUTH_COOKIE_NAME)!;
       const url = new URL(
         `api/guild/${guild.data.id}/join`,
         env.NEXT_PUBLIC_API,
@@ -34,7 +30,6 @@ export const JoinGuild = () => {
         method: "post",
         maxRetryCount: 0,
         headers: {
-          "x-auth-token": token,
           "content-type": "application/json",
         },
       });

src/app/(dashboard)/create-guild/components/CreateGuildButton.tsx

@@ -2,9 +2,7 @@
 
 import { useConfetti } from "@/components/ConfettiProvider";
 import { Button } from "@/components/ui/Button";
-import { GUILD_AUTH_COOKIE_NAME } from "@/config/constants";
 import { fetchGuildApiData } from "@/lib/fetchGuildApi";
-import { getCookieClientSide } from "@/lib/getCookieClientSide";
 import type { CreateGuildForm, Guild } from "@/lib/schemas/guild";
 import { CheckCircle, XCircle } from "@phosphor-icons/react/dist/ssr";
 import { useMutation } from "@tanstack/react-query";
@@ -21,10 +19,6 @@ const CreateGuildButton = () => {
 
   const { mutate: onSubmit, isPending } = useMutation({
     mutationFn: async (data: CreateGuildForm) => {
-      const token = getCookieClientSide(GUILD_AUTH_COOKIE_NAME);
-
-      if (!token) throw new Error("Unauthorized"); // TODO: custom errors?
-
       const guild = {
         ...data,
         contact: undefined,

src/app/(dashboard)/explorer/fetchers.ts

@@ -1,14 +1,15 @@
 import { fetchGuildApiData } from "@/lib/fetchGuildApi";
+import { userOptions } from "@/lib/options";
 import type { Leaderboard } from "@/lib/schemas/leaderboard";
-import { tryGetParsedToken } from "@/lib/token";
 import type { PaginatedResponse } from "@/lib/types";
 import type { Schemas } from "@guildxyz/types";
+import { useQuery } from "@tanstack/react-query";
 import { PAGE_SIZE } from "./constants";
 
 export const fetchAssociatedGuilds = async () => {
-  const { userId } = await tryGetParsedToken();
+  const { data: user } = useQuery(userOptions());
   return fetchGuildApiData<PaginatedResponse<Schemas["Guild"]>>(
-    `guild/search?page=1&pageSize=${Number.MAX_SAFE_INTEGER}&sortBy=name&reverse=false&customQuery=@owner:{${userId}}`,
+    `guild/search?page=1&pageSize=${Number.MAX_SAFE_INTEGER}&sortBy=name&reverse=false&customQuery=@owner:{${user?.id}}`,
   );
 };
 
@@ -23,7 +24,7 @@
 
 export const fetchLeaderboard = async ({
   rewardId,
   offset = 0,
 }: { rewardId: string; offset?: number }) => {
   console.log("fetching leaderboard", `reward/${rewardId}/leaderboard`);
   return fetchGuildApiData<

src/app/(dashboard)/explorer/layout.tsx

@@ -1,12 +1,12 @@
 import { getQueryClient } from "@/lib/getQueryClient";
 import { HydrationBoundary, dehydrate } from "@tanstack/react-query";
 import type { PropsWithChildren } from "react";
-import { guildSearchOptions } from "./options";
+import { associatedGuildsOption, guildSearchOptions } from "./options";
 
 const ExplorerLayout = async ({ children }: PropsWithChildren) => {
   const queryClient = getQueryClient();
   await queryClient.prefetchInfiniteQuery(guildSearchOptions({}));
-  // await queryClient.prefetchQuery(associatedGuildsOption());
+  await queryClient.prefetchQuery(associatedGuildsOption());
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>

src/app/layout.tsx

@@ -1,5 +1,6 @@
 import type { Metadata } from "next";
 import "@/styles/globals.css";
+import { PrefetchUserBoundary } from "@/components/PrefetchUserBoundary";
 import { PreloadResources } from "@/components/PreloadResources";
 import { Providers } from "@/components/Providers";
 import { SignInDialog } from "@/components/SignInDialog";
@@ -27,7 +28,7 @@ const RootLayout = ({
       <body className={cn(dystopian.variable)}>
         <PreloadResources />
         <Providers>
-          {children}
+          <PrefetchUserBoundary>{children}</PrefetchUserBoundary>
 
           <SignInDialog />
           <Toaster />

src/components/AuthBoundary.tsx

@@ -1,16 +1,18 @@
-import { tryGetToken } from "@/lib/token";
+"use client";
 
-export const AuthBoundary = async ({
+import { userOptions } from "@/lib/options";
+import { useQuery } from "@tanstack/react-query";
+
+export const AuthBoundary = ({
   fallback,
   children,
 }: Readonly<{
   fallback: React.ReactNode;
   children: React.ReactNode;
 }>) => {
-  try {
-    await tryGetToken();
-    return <>{children}</>;
-  } catch {
-    return <>{fallback}</>;
-  }
+  const { data: user } = useQuery(userOptions());
+
+  if (user?.id) return children;
+
+  return fallback;
 };

src/components/PrefetchUserBoundary.tsx

@@ -0,0 +1,15 @@
+import { getQueryClient } from "@/lib/getQueryClient";
+import { userOptions } from "@/lib/options";
+import { HydrationBoundary, dehydrate } from "@tanstack/react-query";
+import type { PropsWithChildren } from "react";
+
+export const PrefetchUserBoundary = async ({ children }: PropsWithChildren) => {
+  const queryClient = getQueryClient();
+  await queryClient.prefetchQuery(userOptions());
+
+  return (
+    <HydrationBoundary state={dehydrate(queryClient)}>
+      {children}
+    </HydrationBoundary>
+  );
+};

src/components/SignInDialog.tsx

@@ -1,8 +1,8 @@
 "use client";
 
-import { signIn } from "@/actions/auth";
 import { signInDialogOpenAtom } from "@/config/atoms";
 import { fetchGuildApi } from "@/lib/fetchGuildApi";
+import { authSchema } from "@/lib/schemas/user";
 import { SignIn, User, Wallet, XCircle } from "@phosphor-icons/react/dist/ssr";
 import { DialogDescription } from "@radix-ui/react-dialog";
 import { useMutation } from "@tanstack/react-query";
@@ -21,7 +21,6 @@ import {
   ResponsiveDialogHeader,
   ResponsiveDialogTitle,
 } from "./ui/ResponsiveDialog";
-
 const CUSTOM_CONNECTOR_ICONS = {
   "com.brave.wallet": "/walletLogos/brave.svg",
   walletConnect: "/walletLogos/walletconnect.svg",
@@ -155,7 +154,26 @@ const SignInWithEthereum = () => {
 
       const signature = await signMessageAsync({ message });
 
-      return signIn({ message, signature });
+      const requestInit = {
+        method: "POST",
+        body: JSON.stringify({
+          message,
+          signature,
+        }),
+      } satisfies RequestInit;
+
+      const signInRes = await fetchGuildApi("auth/siwe/login", requestInit);
+      let json = signInRes.data;
+      if (signInRes.response.status === 401) {
+        const registerRes = await fetchGuildApi(
+          "auth/siwe/register",
+          requestInit,
+        );
+        json = registerRes.data;
+      }
+      const authData = authSchema.parse(json);
+
+      return authData;
     },
     onSuccess: () => setSignInDialogOpen(false),
     onError: (error) => {

src/components/SignOutButton.tsx

@@ -1,17 +1,36 @@
 "use client";
 
-import { signOut } from "@/actions/auth";
+import { associatedGuildsOption } from "@/app/(dashboard)/explorer/options";
+import { fetchGuildApi } from "@/lib/fetchGuildApi";
+import { userOptions } from "@/lib/options";
 import { SignOut } from "@phosphor-icons/react/dist/ssr";
-import { usePathname } from "next/navigation";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { Button } from "./ui/Button";
 
 export const SignOutButton = () => {
-  const pathname = usePathname();
+  const queryClient = useQueryClient();
+
+  const { mutate: signOut, isPending } = useMutation({
+    mutationFn: () =>
+      fetchGuildApi("auth/logout", {
+        method: "POST",
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({
+        queryKey: [userOptions().queryKey],
+      });
+      queryClient.invalidateQueries({
+        queryKey: associatedGuildsOption().queryKey,
+      });
+    },
+  });
+
   return (
     <Button
       variant="ghost"
       leftIcon={<SignOut weight="bold" />}
-      onClick={() => signOut(pathname)}
+      onClick={() => signOut()}
+      isLoading={isPending}
     >
       Sign out
     </Button>

src/lib/fetchGuildApi.ts

@@ -1,5 +1,4 @@
-import { signOut } from "@/actions/auth";
-import { tryGetToken } from "@/lib/token";
+import { isServer } from "@tanstack/react-query";
 import { env } from "./env";
 import type { ErrorLike } from "./types";
 
@@ -71,30 +70,27 @@ export const fetchGuildApi = async <Data = object, Error = ErrorLike>(
   }
   const url = new URL(`api/${pathname}`, env.NEXT_PUBLIC_API);
 
-  let token: string | undefined;
-  try {
-    token = await tryGetToken();
-  } catch (_) {}
-
   const headers = new Headers(requestInit?.headers);
-  if (token) {
-    headers.set("X-Auth-Token", token);
-  }
+
   if (requestInit?.body instanceof FormData) {
     headers.set("Content-Type", "multipart/form-data");
   } else if (requestInit?.body) {
     headers.set("Content-Type", "application/json");
   }
 
+  // Next.js won't include cookies automatically, so we include them manually on the server
+  if (isServer) {
+    const { cookies } = await import("next/headers");
+    const cookiesHeader = (await cookies()).toString();
+    headers.set("cookie", cookiesHeader);
+  }
+
   const response = await fetch(url, {
     ...requestInit,
     headers,
+    credentials: "include",
   });
 
-  if (response.status === 401) {
-    signOut();
-  }
-
   const contentType = response.headers.get("content-type");
   if (!contentType?.includes("application/json")) {
     throw new Error("Guild API failed to respond with json");

src/lib/fetchers.ts

@@ -1,6 +1,5 @@
 import { fetchGuildApiData } from "@/lib/fetchGuildApi";
 import { resolveIdLikeRequest } from "@/lib/resolveIdLikeRequest";
-import { tryGetParsedToken } from "@/lib/token";
 import type {
   Entity,
   EntitySchema,
@@ -26,11 +25,7 @@
 };
 
 export const fetchUser = async () => {
-  const { userId } = await tryGetParsedToken();
-  return fetchEntity({
-    entity: "user",
-    idLike: userId,
-  });
+  return fetchGuildApiData<Schemas["User"]>("auth/me");
 };
 
 export const fetchGuildLeave = async ({ guildId }: { guildId: string }) => {
@@ -43,7 +38,7 @@
   const guild = await fetchEntity({ entity: "guild", idLike: guildIdLike });
   return fetchGuildApiData<Schemas["Page"][]>("page/batch", {
     method: "POST",
     body: JSON.stringify({ ids: guild.pages?.map((p) => p.pageId!) ?? [] }),
   });
 };
 
@@ -58,16 +53,16 @@
       entity: "guild",
       idLike: guildIdLike,
     });
     pageIdLikeWithHome = homePageId!;
   }
   const page = await fetchEntity({
     entity: "page",
     idLike: pageIdLikeWithHome!,
   });
 
   return fetchGuildApiData<Role[]>("role/batch", {
     method: "POST",
     body: JSON.stringify({ ids: page.roles?.map((p) => p.roleId!) ?? [] }),
   });
 };
 
@@ -77,7 +72,7 @@
   return fetchGuildApiData<Schemas["Reward"][]>("reward/batch", {
     method: "POST",
     body: JSON.stringify({
       ids: role.rewards?.map((r) => r.rewardId!) ?? [],
     }),
   });
 };