Skip to content

Commit 5a8fcfe

Browse files
authored
Merge pull request #9 from supabase-community/chore/rename-cookies-store
chore: rename cookieStore.
2 parents 7edfbea + e315fd9 commit 5a8fcfe

File tree

8 files changed

+30
-30
lines changed

8 files changed

+30
-30
lines changed

app/actions.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ export async function getChats(userId?: string | null) {
1313
return []
1414
}
1515
try {
16-
const readOnlyRequestCookies = cookies()
16+
const cookieStore = cookies()
1717
const supabase = createServerActionClient<Database>({
18-
cookies: () => readOnlyRequestCookies
18+
cookies: () => cookieStore
1919
})
2020
const { data } = await supabase
2121
.from('chats')
@@ -31,9 +31,9 @@ export async function getChats(userId?: string | null) {
3131
}
3232

3333
export async function getChat(id: string) {
34-
const readOnlyRequestCookies = cookies()
34+
const cookieStore = cookies()
3535
const supabase = createServerActionClient<Database>({
36-
cookies: () => readOnlyRequestCookies
36+
cookies: () => cookieStore
3737
})
3838
const { data } = await supabase
3939
.from('chats')
@@ -46,9 +46,9 @@ export async function getChat(id: string) {
4646

4747
export async function removeChat({ id, path }: { id: string; path: string }) {
4848
try {
49-
const readOnlyRequestCookies = cookies()
49+
const cookieStore = cookies()
5050
const supabase = createServerActionClient<Database>({
51-
cookies: () => readOnlyRequestCookies
51+
cookies: () => cookieStore
5252
})
5353
await supabase.from('chats').delete().eq('id', id).throwOnError()
5454

@@ -63,9 +63,9 @@ export async function removeChat({ id, path }: { id: string; path: string }) {
6363

6464
export async function clearChats() {
6565
try {
66-
const readOnlyRequestCookies = cookies()
66+
const cookieStore = cookies()
6767
const supabase = createServerActionClient<Database>({
68-
cookies: () => readOnlyRequestCookies
68+
cookies: () => cookieStore
6969
})
7070
await supabase.from('chats').delete().throwOnError()
7171
revalidatePath('/')
@@ -79,9 +79,9 @@ export async function clearChats() {
7979
}
8080

8181
export async function getSharedChat(id: string) {
82-
const readOnlyRequestCookies = cookies()
82+
const cookieStore = cookies()
8383
const supabase = createServerActionClient<Database>({
84-
cookies: () => readOnlyRequestCookies
84+
cookies: () => cookieStore
8585
})
8686
const { data } = await supabase
8787
.from('chats')
@@ -99,9 +99,9 @@ export async function shareChat(chat: Chat) {
9999
sharePath: `/share/${chat.id}`
100100
}
101101

102-
const readOnlyRequestCookies = cookies()
102+
const cookieStore = cookies()
103103
const supabase = createServerActionClient<Database>({
104-
cookies: () => readOnlyRequestCookies
104+
cookies: () => cookieStore
105105
})
106106
await supabase
107107
.from('chats')

app/api/auth/callback/route.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export async function GET(request: Request) {
1111
const code = requestUrl.searchParams.get('code')
1212

1313
if (code) {
14-
const readOnlyRequestCookies = cookies()
14+
const cookieStore = cookies()
1515
const supabase = createRouteHandlerClient({
16-
cookies: () => readOnlyRequestCookies
16+
cookies: () => cookieStore
1717
})
1818
await supabase.auth.exchangeCodeForSession(code)
1919
}

app/api/chat/route.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ const configuration = new Configuration({
1717
const openai = new OpenAIApi(configuration)
1818

1919
export async function POST(req: Request) {
20-
const readOnlyRequestCookies = cookies()
20+
const cookieStore = cookies()
2121
const supabase = createRouteHandlerClient<Database>({
22-
cookies: () => readOnlyRequestCookies
22+
cookies: () => cookieStore
2323
})
2424
const json = await req.json()
2525
const { messages, previewToken } = json
26-
const userId = (await auth({ readOnlyRequestCookies }))?.user.id
26+
const userId = (await auth({ cookieStore }))?.user.id
2727

2828
if (!userId) {
2929
return new Response('Unauthorized', {

app/chat/[id]/page.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export interface ChatPageProps {
1818
export async function generateMetadata({
1919
params
2020
}: ChatPageProps): Promise<Metadata> {
21-
const readOnlyRequestCookies = cookies()
22-
const session = await auth({ readOnlyRequestCookies })
21+
const cookieStore = cookies()
22+
const session = await auth({ cookieStore })
2323

2424
if (!session?.user) {
2525
return {}
@@ -32,8 +32,8 @@ export async function generateMetadata({
3232
}
3333

3434
export default async function ChatPage({ params }: ChatPageProps) {
35-
const readOnlyRequestCookies = cookies()
36-
const session = await auth({ readOnlyRequestCookies })
35+
const cookieStore = cookies()
36+
const session = await auth({ cookieStore })
3737

3838
if (!session?.user) {
3939
redirect(`/sign-in?next=/chat/${params.id}`)

app/sign-in/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { cookies } from 'next/headers'
66
import { redirect } from 'next/navigation'
77

88
export default async function SignInPage() {
9-
const readOnlyRequestCookies = cookies()
10-
const session = await auth({ readOnlyRequestCookies })
9+
const cookieStore = cookies()
10+
const session = await auth({ cookieStore })
1111
// redirect to home if user is already logged in
1212
if (session?.user) {
1313
redirect('/')

app/sign-up/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { cookies } from 'next/headers'
66
import { redirect } from 'next/navigation'
77

88
export default async function SignInPage() {
9-
const readOnlyRequestCookies = cookies()
10-
const session = await auth({ readOnlyRequestCookies })
9+
const cookieStore = cookies()
10+
const session = await auth({ cookieStore })
1111
// redirect to home if user is already logged in
1212
if (session?.user) {
1313
redirect('/')

auth.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { createServerComponentClient } from '@supabase/auth-helpers-nextjs'
33
import { cookies } from 'next/headers'
44

55
export const auth = async ({
6-
readOnlyRequestCookies
6+
cookieStore
77
}: {
8-
readOnlyRequestCookies: ReturnType<typeof cookies>
8+
cookieStore: ReturnType<typeof cookies>
99
}) => {
1010
// Create a Supabase client configured to use cookies
1111
const supabase = createServerComponentClient({
12-
cookies: () => readOnlyRequestCookies
12+
cookies: () => cookieStore
1313
})
1414
const { data, error } = await supabase.auth.getSession()
1515
if (error) throw error

components/header.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import { UserMenu } from '@/components/user-menu'
2020
import { cookies } from 'next/headers'
2121

2222
export async function Header() {
23-
const readOnlyRequestCookies = cookies()
24-
const session = await auth({ readOnlyRequestCookies })
23+
const cookieStore = cookies()
24+
const session = await auth({ cookieStore })
2525
return (
2626
<header className="sticky top-0 z-50 flex h-16 w-full shrink-0 items-center justify-between border-b bg-gradient-to-b from-background/10 via-background/50 to-background/80 px-4 backdrop-blur-xl">
2727
<div className="flex items-center">

0 commit comments

Comments
 (0)