Merge pull request #43 from osusach/staging

chore: release updates from staging to master

Author: ignaciodiazb

actions/auth.ts

@@ -5,10 +5,20 @@ import { redirect } from "next/navigation";
 
 import { createClient } from "@/utils/supabase/server";
 
-export async function signInWithGoogle() {
+export async function signInWithGoogle({ nextUrl }: { nextUrl?: string } = {}) {
   const supabase = await createClient();
   const origin = (await headers()).get("origin");
-  const redirectTo = `${origin}/auth/callback`;
+
+  // Redirect config
+  const baseUrl = `${origin}/auth/callback`;
+  const searchParams = new URLSearchParams();
+
+  if (nextUrl) {
+    searchParams.append("next_url", nextUrl);
+  }
+
+  const queryString = searchParams.toString();
+  const redirectTo = queryString ? `${baseUrl}?${queryString}` : baseUrl;
 
   const { data, error } = await supabase.auth.signInWithOAuth({
     options: {

app/(auth-pages)/sign-in/page.tsx

@@ -1,13 +1,19 @@
 "use client";
 
 import Image from "next/image";
+import { use } from "react";
 
 import { Button } from "@/components/ui/button";
 import { signInWithGoogle } from "@/actions/auth";
 
-export default function Login() {
+type SearchParams = Promise<{ [key: string]: string | string[] | undefined }>;
+
+export default function SignInPage(props: { searchParams: SearchParams }) {
+  const searchParams = use(props.searchParams);
+  const redirect = searchParams.redirect as string | undefined;
+
   const handleSignIn = async () => {
-    await signInWithGoogle();
+    await signInWithGoogle({ nextUrl: redirect });
   };
 
   return (

app/auth/callback/route.ts

@@ -5,7 +5,7 @@ import { createClient } from "@/utils/supabase/server";
 export async function GET(request: Request) {
   const { searchParams, origin } = new URL(request.url);
   const code = searchParams.get("code");
-  const next = searchParams.get("next") ?? "/dashboard";
+  const next = searchParams.get("next_url") ?? "/get-started";
 
   if (code) {
     const supabase = await createClient();

package.json

@@ -6,6 +6,7 @@
     "dev": "next dev --turbo",
     "format": "prettier . --write",
     "format:check": "prettier . --check",
+    "generate:types": "supabase gen types typescript --local > ./types/database.ts",
     "build": "next build",
     "start": "next start",
     "lint": "next lint"

utils/supabase/middleware.ts

@@ -40,7 +40,9 @@ export const updateSession = async (request: NextRequest) => {
     );
 
     if (isProtectedRoute && user.error) {
-      return NextResponse.redirect(new URL("/sign-in", request.url));
+      const redirectUrl = new URL("/sign-in", request.url);
+      redirectUrl.searchParams.set("redirect", request.nextUrl.pathname);
+      return NextResponse.redirect(redirectUrl);
     }
 
     if (request.nextUrl.pathname === "/" && !user.error) {