chore: migrate to v7 safe-action

apps/nextjs/src/components/auth/card-wrapper.tsx

@@ -1,4 +1,4 @@
-import { Card, CardContent, CardFooter, CardHeader } from "@wellchart/ui/card";
+import { Card, CardContent, CardFooter, CardHeader } from "@hyper/ui/card";
 
 import { BackButton } from "~/components/auth/back-button";
 import { Header } from "~/components/auth/header";

apps/nextjs/src/components/auth/sign-in-form.tsx

@@ -2,8 +2,8 @@
 
 import { useAction } from "next-safe-action/hooks";
 
-import type { SignInSchemaType } from "@wellchart/validators";
-import { Button } from "@wellchart/ui/button";
+import type { SignInSchemaType } from "@hyper/validators";
+import { Button } from "@hyper/ui/button";
 import {
   Form,
   FormControl,
@@ -12,9 +12,9 @@ import {
   FormLabel,
   FormMessage,
   useForm,
-} from "@wellchart/ui/form";
-import { Input } from "@wellchart/ui/input";
-import { SignInSchema } from "@wellchart/validators";
+} from "@hyper/ui/form";
+import { Input } from "@hyper/ui/input";
+import { SignInSchema } from "@hyper/validators";
 
 import { FormError } from "~/components/auth/form-error";
 import { signInWithPassword } from "~/lib/actions/auth";

apps/nextjs/src/components/auth/sign-out-button.tsx

@@ -1,4 +1,4 @@
-import { Button } from "@wellchart/ui/button";
+import { Button } from "@hyper/ui/button";
 
 import { signOut } from "~/lib/actions/auth";
 

apps/nextjs/src/components/auth/sign-up-form.tsx

@@ -2,8 +2,8 @@
 
 import { useAction } from "next-safe-action/hooks";
 
-import type { SignUpSchemaType } from "@wellchart/validators";
-import { Button } from "@wellchart/ui/button";
+import type { SignUpSchemaType } from "@hyper/validators";
+import { Button } from "@hyper/ui/button";
 import {
   Form,
   FormControl,
@@ -12,9 +12,9 @@ import {
   FormLabel,
   FormMessage,
   useForm,
-} from "@wellchart/ui/form";
-import { Input } from "@wellchart/ui/input";
-import { SignUpSchema } from "@wellchart/validators";
+} from "@hyper/ui/form";
+import { Input } from "@hyper/ui/input";
+import { SignUpSchema } from "@hyper/validators";
 
 import { FormError } from "~/components/auth/form-error";
 import { FormSuccess } from "~/components/auth/form-success";

apps/nextjs/src/components/auth/social.tsx

@@ -1,6 +1,6 @@
 import { FcGoogle } from "react-icons/fc";
 
-import { Button } from "@wellchart/ui/button";
+import { Button } from "@hyper/ui/button";
 
 import { signInWithGoogle } from "~/lib/actions/auth";
 

apps/nextjs/src/lib/actions/auth.ts

@@ -0,0 +1,99 @@
+"use server";
+
+import { revalidatePath } from "next/cache";
+import { headers } from "next/headers";
+import { redirect } from "next/navigation";
+
+import { SignInSchema, SignUpSchema } from "@hyper/validators";
+
+import { DEFAULT_LOGIN_REDIRECT } from "~/config/routes";
+import { actionClient } from "~/lib/safe-action";
+import { createClient } from "~/utils/supabase/server";
+
+export const signInWithPassword = actionClient
+  .schema(SignInSchema)
+  .action(async ({ parsedInput: { email, password } }) => {
+    const supabase = createClient();
+
+    const { error } = await supabase.auth.signInWithPassword({
+      email,
+      password,
+    });
+
+    if (error) {
+      throw error;
+    }
+
+    revalidatePath("/", "layout");
+    redirect(DEFAULT_LOGIN_REDIRECT);
+  });
+
+export const signUp = actionClient
+  .schema(SignUpSchema)
+  .action(async ({ parsedInput: { email, password } }) => {
+    const origin = headers().get("origin");
+    const supabase = createClient();
+
+    const redirectUrl = `${origin}/auth/confirm?next=${encodeURIComponent(DEFAULT_LOGIN_REDIRECT)}`;
+
+    const { error, data } = await supabase.auth.signUp({
+      email,
+      password,
+      options: {
+        emailRedirectTo: redirectUrl,
+      },
+    });
+
+    // User already exists, so fake data is returned. See https://supabase.com/docs/reference/javascript/auth-signup
+    if (data.user?.identities && data.user.identities.length === 0) {
+      throw new Error("An error occurred. Please try again.");
+    }
+
+    if (error) {
+      throw error;
+    }
+
+    return data.user;
+  });
+
+export const signInWithGithub = async () => {
+  const origin = headers().get("origin");
+  const supabase = createClient();
+
+  const res = await supabase.auth.signInWithOAuth({
+    provider: "github",
+    options: { redirectTo: `${origin}/auth/callback` },
+  });
+
+  if (res.data.url) {
+    redirect(res.data.url);
+  }
+  if (res.error) {
+    throw new Error(res.error.message);
+  }
+};
+
+export const signInWithGoogle = async () => {
+  const origin = headers().get("origin");
+  const supabase = createClient();
+
+  const redirectUrl = `${origin}/auth/callback?next=${encodeURIComponent(DEFAULT_LOGIN_REDIRECT)}`;
+
+  const res = await supabase.auth.signInWithOAuth({
+    provider: "google",
+    options: { redirectTo: redirectUrl },
+  });
+
+  if (res.data.url) {
+    redirect(res.data.url);
+  }
+  if (res.error) {
+    throw new Error(res.error.message);
+  }
+};
+
+export const signOut = async () => {
+  const supabase = createClient();
+  await supabase.auth.signOut();
+  redirect("/");
+};

apps/nextjs/src/lib/safe-action.ts

@@ -2,17 +2,18 @@ import { createSafeActionClient } from "next-safe-action";
 
 import { createClient } from "~/utils/supabase/server";
 
-export const action = createSafeActionClient();
+// Base client
+export const actionClient = createSafeActionClient();
 
-export const authAction = createSafeActionClient({
-  async middleware() {
-    const supabase = createClient();
-    const { data, error } = await supabase.auth.getUser();
+// Auth client
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const authActionClient = actionClient.use(async ({ next, ctx }) => {
+  const supabase = createClient();
+  const { data, error } = await supabase.auth.getUser();
 
-    if (error ?? !data.user) {
-      throw new Error("Unauthorized");
-    }
+  if (error ?? !data.user) {
+    throw new Error("Unauthorized");
+  }
 
-    return { user: data.user };
-  },
+  return next({ ctx: { user: data.user } });
 });