From 40ab2d8450f8a78877f09502e9740544854994c7 Mon Sep 17 00:00:00 2001 From: Gib Date: Thu, 15 May 2025 16:53:21 -0500 Subject: [PATCH] Cleaning up --- .../reset-password/page.tsx | 0 src/app/auth/callback/route.ts | 2 +- src/app/page.tsx | 44 +++- src/app/protected/page.tsx | 40 ---- src/app/test/page.tsx | 28 --- src/components/navigation/auth/avatar.tsx | 18 +- src/lib/actions/auth.ts | 18 +- src/utils/supabase/middleware.ts | 8 +- src/utils/supabase/utils.ts | 1 + utils/supabase/types.ts | 188 ------------------ 10 files changed, 61 insertions(+), 286 deletions(-) rename src/app/{protected => (auth-pages)}/reset-password/page.tsx (100%) delete mode 100644 src/app/protected/page.tsx delete mode 100644 src/app/test/page.tsx delete mode 100644 utils/supabase/types.ts diff --git a/src/app/protected/reset-password/page.tsx b/src/app/(auth-pages)/reset-password/page.tsx similarity index 100% rename from src/app/protected/reset-password/page.tsx rename to src/app/(auth-pages)/reset-password/page.tsx diff --git a/src/app/auth/callback/route.ts b/src/app/auth/callback/route.ts index 177c675..0e334d8 100644 --- a/src/app/auth/callback/route.ts +++ b/src/app/auth/callback/route.ts @@ -20,5 +20,5 @@ export async function GET(request: Request) { } // URL to redirect to after sign up process completes - return NextResponse.redirect(`${origin}/protected`); + return NextResponse.redirect(origin); } diff --git a/src/app/page.tsx b/src/app/page.tsx index b62cabc..7b10b97 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,10 +1,44 @@ -const HomePage = () => { +'use server'; + +import { FetchDataSteps } from '@/components/tutorial'; +import { InfoIcon } from 'lucide-react'; +import { getUser } from '@/lib/actions'; +import type { User } from '@/utils/supabase'; + +const HomePage = async () => { + const response = await getUser(); + if (!response.success || !response.data) { + return ( +
+
+

Make sure you can sign in!

+
+
+ ); + } + const user: User = response.data; return ( -
-
-

Make sure you can sign in!

+
+
+
+ + This is a protected component that you can only see as an authenticated + user +
-
+
+

Your user details

+ 
+          {JSON.stringify(user, null, 2)}
+
+
+
+

Next steps

+ +
+ ); }; export default HomePage; diff --git a/src/app/protected/page.tsx b/src/app/protected/page.tsx deleted file mode 100644 index a79c733..0000000 --- a/src/app/protected/page.tsx +++ /dev/null @@ -1,40 +0,0 @@ -'use server'; - -import { FetchDataSteps } from '@/components/tutorial'; -import { createServerClient } from '@/utils/supabase'; -import { InfoIcon } from 'lucide-react'; -import { redirect } from 'next/navigation'; - -const ProtectedPage = async () => { - const supabase = await createServerClient(); - const { - data: { user }, - } = await supabase.auth.getUser(); - - if (!user) { - return redirect('sign-in'); - } - - return ( -
-
-
- - This is a protected page that you can only see as an authenticated - user -
-
-
-

Your user details

- 
-          {JSON.stringify(user, null, 2)}
-
-
-
-

Next steps

- -
-
- ); -}; -export default ProtectedPage; diff --git a/src/app/test/page.tsx b/src/app/test/page.tsx deleted file mode 100644 index 9220f9a..0000000 --- a/src/app/test/page.tsx +++ /dev/null @@ -1,28 +0,0 @@ -'use server'; -import { getSignedUrl, getProfile } from '@/lib/actions'; -import Image from 'next/image'; - -const Page = async () => { - const user = await getProfile(); - if (!user.success) throw new Error(user.error); - - const imageUrl = await getSignedUrl({ - bucket: 'avatars', - url: user.data.avatar_url ?? '', - }); - if (!imageUrl.success) throw new Error(imageUrl.error); - - return ( -
- User avatar -
- ); -}; -export default Page; diff --git a/src/components/navigation/auth/avatar.tsx b/src/components/navigation/auth/avatar.tsx index 9d79710..43b693b 100644 --- a/src/components/navigation/auth/avatar.tsx +++ b/src/components/navigation/auth/avatar.tsx @@ -6,7 +6,6 @@ import { Avatar, AvatarFallback, AvatarImage, - Button, DropdownMenu, DropdownMenuContent, DropdownMenuItem, @@ -17,16 +16,12 @@ import { import { getSignedUrl, getProfile, signOut } from '@/lib/actions'; import type { Profile } from '@/utils/supabase'; +import Link from 'next/link'; const AvatarDropdown = () => { - const router = useRouter(); const [profile, setProfile] = useState(undefined); const [signedUrl, setSignedUrl] = useState(undefined); - const handleEditProfile = async () => { - router.push('/profile'); - }; - const handleSignOut = async () => { await signOut(); }; @@ -78,14 +73,15 @@ const AvatarDropdown = () => { {profile?.full_name} - + + - + diff --git a/src/lib/actions/auth.ts b/src/lib/actions/auth.ts index 39bf6e7..1fd94f3 100644 --- a/src/lib/actions/auth.ts +++ b/src/lib/actions/auth.ts @@ -32,7 +32,7 @@ export const signUp = async (formData: FormData) => { }); if (error) { - return redirect('/protected'); + return redirect('/'); //return encodedRedirect('error', '/sign-up', //'Thanks for signing up! Please check your email for a verification link.'); } else { @@ -49,8 +49,8 @@ export const signUp = async (formData: FormData) => { } catch (error) { console.error('Error updating profile: ', error); } finally { - return redirect('/protected'); - //return encodedRedirect('success', '/protected', + return redirect('/'); + //return encodedRedirect('success', '/', //'Thanks for signing up! Please check your email for a verification link.); } } @@ -69,7 +69,7 @@ export const signIn = async (formData: FormData) => { if (error) { return encodedRedirect('error', '/sign-in', error.message); } - return redirect('/protected'); + return redirect('/'); }; export const forgotPassword = async (formData: FormData) => { @@ -83,7 +83,7 @@ export const forgotPassword = async (formData: FormData) => { } const { error } = await supabase.auth.resetPasswordForEmail(email, { - redirectTo: `${origin}/auth/callback?redirect_to=/protected/reset-password`, + redirectTo: `${origin}/auth/callback?redirect_to=/reset-password`, }); if (error) { @@ -113,7 +113,7 @@ export const resetPassword = async (formData: FormData) => { if (!password || !confirmPassword) { encodedRedirect( 'error', - '/protected/reset-password', + '/reset-password', 'Password and confirm password are required', ); } @@ -121,7 +121,7 @@ export const resetPassword = async (formData: FormData) => { if (password !== confirmPassword) { encodedRedirect( 'error', - '/protected/reset-password', + '/reset-password', 'Passwords do not match', ); } @@ -133,12 +133,12 @@ export const resetPassword = async (formData: FormData) => { if (error) { encodedRedirect( 'error', - '/protected/reset-password', + '/reset-password', 'Password update failed', ); } - encodedRedirect('success', '/protected/reset-password', 'Password updated'); + encodedRedirect('success', '/reset-password', 'Password updated'); }; export const signOut = async () => { diff --git a/src/utils/supabase/middleware.ts b/src/utils/supabase/middleware.ts index ec7c0bb..648114b 100644 --- a/src/utils/supabase/middleware.ts +++ b/src/utils/supabase/middleware.ts @@ -41,13 +41,13 @@ export const updateSession = async (request: NextRequest) => { const user = await supabase.auth.getUser(); // protected routes - if (request.nextUrl.pathname.startsWith('/protected') && user.error) { + if (request.nextUrl.pathname.startsWith('/reset-password') && user.error) { return NextResponse.redirect(new URL('/sign-in', request.url)); } - if (request.nextUrl.pathname === '/' && !user.error) { - return NextResponse.redirect(new URL('/protected', request.url)); - } + //if (request.nextUrl.pathname === '/' && !user.error) { + //return NextResponse.redirect(new URL('/protected', request.url)); + //} return response; } catch (e) { diff --git a/src/utils/supabase/utils.ts b/src/utils/supabase/utils.ts index bf2fb8f..150ad65 100644 --- a/src/utils/supabase/utils.ts +++ b/src/utils/supabase/utils.ts @@ -1,4 +1,5 @@ import type { Database } from '@/utils/supabase/types'; +export type { User } from '@supabase/supabase-js'; // Table row types export type Profile = Database['public']['Tables']['profiles']['Row']; diff --git a/utils/supabase/types.ts b/utils/supabase/types.ts deleted file mode 100644 index 3d2165a..0000000 --- a/utils/supabase/types.ts +++ /dev/null @@ -1,188 +0,0 @@ -export type Json = - | string - | number - | boolean - | null - | { [key: string]: Json | undefined } - | Json[]; - -export type Database = { - public: { - Tables: { - profiles: { - Row: { - avatar_url: string | null; - email: string | null; - full_name: string | null; - id: string; - provider: string | null; - updated_at: string | null; - }; - Insert: { - avatar_url?: string | null; - email?: string | null; - full_name?: string | null; - id: string; - provider?: string | null; - updated_at?: string | null; - }; - Update: { - avatar_url?: string | null; - email?: string | null; - full_name?: string | null; - id?: string; - provider?: string | null; - updated_at?: string | null; - }; - Relationships: []; - }; - statuses: { - Row: { - created_at: string; - id: string; - status: string; - updated_by_id: string | null; - user_id: string; - }; - Insert: { - created_at?: string; - id?: string; - status: string; - updated_by_id?: string | null; - user_id: string; - }; - Update: { - created_at?: string; - id?: string; - status?: string; - updated_by_id?: string | null; - user_id?: string; - }; - Relationships: []; - }; - }; - Views: { - [_ in never]: never; - }; - Functions: { - [_ in never]: never; - }; - Enums: { - [_ in never]: never; - }; - CompositeTypes: { - [_ in never]: never; - }; - }; -}; - -type DefaultSchema = Database[Extract]; - -export type Tables< - DefaultSchemaTableNameOrOptions extends - | keyof (DefaultSchema['Tables'] & DefaultSchema['Views']) - | { schema: keyof Database }, - TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof Database; - } - ? keyof (Database[DefaultSchemaTableNameOrOptions['schema']]['Tables'] & - Database[DefaultSchemaTableNameOrOptions['schema']]['Views']) - : never = never, -> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database } - ? (Database[DefaultSchemaTableNameOrOptions['schema']]['Tables'] & - Database[DefaultSchemaTableNameOrOptions['schema']]['Views'])[TableName] extends { - Row: infer R; - } - ? R - : never - : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema['Tables'] & - DefaultSchema['Views']) - ? (DefaultSchema['Tables'] & - DefaultSchema['Views'])[DefaultSchemaTableNameOrOptions] extends { - Row: infer R; - } - ? R - : never - : never; - -export type TablesInsert< - DefaultSchemaTableNameOrOptions extends - | keyof DefaultSchema['Tables'] - | { schema: keyof Database }, - TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof Database; - } - ? keyof Database[DefaultSchemaTableNameOrOptions['schema']]['Tables'] - : never = never, -> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database } - ? Database[DefaultSchemaTableNameOrOptions['schema']]['Tables'][TableName] extends { - Insert: infer I; - } - ? I - : never - : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema['Tables'] - ? DefaultSchema['Tables'][DefaultSchemaTableNameOrOptions] extends { - Insert: infer I; - } - ? I - : never - : never; - -export type TablesUpdate< - DefaultSchemaTableNameOrOptions extends - | keyof DefaultSchema['Tables'] - | { schema: keyof Database }, - TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof Database; - } - ? keyof Database[DefaultSchemaTableNameOrOptions['schema']]['Tables'] - : never = never, -> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database } - ? Database[DefaultSchemaTableNameOrOptions['schema']]['Tables'][TableName] extends { - Update: infer U; - } - ? U - : never - : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema['Tables'] - ? DefaultSchema['Tables'][DefaultSchemaTableNameOrOptions] extends { - Update: infer U; - } - ? U - : never - : never; - -export type Enums< - DefaultSchemaEnumNameOrOptions extends - | keyof DefaultSchema['Enums'] - | { schema: keyof Database }, - EnumName extends DefaultSchemaEnumNameOrOptions extends { - schema: keyof Database; - } - ? keyof Database[DefaultSchemaEnumNameOrOptions['schema']]['Enums'] - : never = never, -> = DefaultSchemaEnumNameOrOptions extends { schema: keyof Database } - ? Database[DefaultSchemaEnumNameOrOptions['schema']]['Enums'][EnumName] - : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema['Enums'] - ? DefaultSchema['Enums'][DefaultSchemaEnumNameOrOptions] - : never; - -export type CompositeTypes< - PublicCompositeTypeNameOrOptions extends - | keyof DefaultSchema['CompositeTypes'] - | { schema: keyof Database }, - CompositeTypeName extends PublicCompositeTypeNameOrOptions extends { - schema: keyof Database; - } - ? keyof Database[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes'] - : never = never, -> = PublicCompositeTypeNameOrOptions extends { schema: keyof Database } - ? Database[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes'][CompositeTypeName] - : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema['CompositeTypes'] - ? DefaultSchema['CompositeTypes'][PublicCompositeTypeNameOrOptions] - : never; - -export const Constants = { - public: { - Enums: {}, - }, -} as const;