adapt to new cookie names (#238)

* adapt to new cookie names

* fix pw

Author: maxammann

.prettierignore

@@ -13,3 +13,6 @@ package-lock.json
 
 # Ignore generated files
 dependabot.yml
+
+.vercel
+

playwright.config.ts

@@ -1,5 +1,4 @@
 import type { PlaywrightTestConfig } from '@playwright/test'
-import { AUTH_COOKIE_NAME } from './src/lib/cookies'
 import dotenv from 'dotenv'
 import path from 'path'
 
@@ -16,7 +15,7 @@ const config: PlaywrightTestConfig = {
 		storageState: {
 			cookies: [
 				{
-					name: AUTH_COOKIE_NAME,
+					name: '__Secure-session-token-dev.zoo.dev',
 					value: process.env.VITE_API_TOKEN ?? '',
 					domain: 'localhost',
 					path: '/',

src/lib/cookies.ts

@@ -1 +1,11 @@
-export const AUTH_COOKIE_NAME = '__Secure-next-auth.session-token'
+export function getCookieName() {
+	const baseUrl = process.env.VITE_SITE_BASE_URL
+	if (baseUrl === 'https://zoo.dev') {
+		return '__Secure-next-auth.session-token'
+	} else if (baseUrl) {
+		const url = new URL(baseUrl)
+		return '__Secure-session-token-' + url.hostname
+	}
+
+	throw new Error('VITE_SITE_BASE_URL is not set or invalid')
+}

src/routes/(sidebarLayout)/+layout.server.ts

@@ -1,5 +1,5 @@
 import { DOMAIN, PLAYWRIGHT_MOCKING_HEADER } from '$lib/consts.js'
-import { AUTH_COOKIE_NAME } from '$lib/cookies.js'
+import { getCookieName } from '$lib/cookies.js'
 import { hooksUserMocks, isUserMock } from '$lib/mocks.js'
 import { SIGN_OUT_PARAM } from '$lib/paths.js'
 import { redirect } from '@sveltejs/kit'
@@ -12,7 +12,7 @@ export const load = async ({ cookies, request, url, fetch }) => {
 	}
 
 	const mockRequestHeader = request.headers.get(PLAYWRIGHT_MOCKING_HEADER)
-	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
+	const token = env.PROD ? cookies.get(getCookieName()) : env.VITE_API_TOKEN
 
 	if (!token) {
 		signOut()
@@ -69,7 +69,7 @@ export const load = async ({ cookies, request, url, fetch }) => {
 	 * Shared sign out function
 	 */
 	function signOut() {
-		cookies.delete(AUTH_COOKIE_NAME, { domain: DOMAIN, path: '/' })
+		cookies.delete(getCookieName(), { domain: DOMAIN, path: '/' })
 		throw redirect(303, '/')
 	}
 }

src/routes/+layout.server.ts

@@ -1,9 +1,9 @@
-import { AUTH_COOKIE_NAME } from '$lib/cookies.js'
+import { getCookieName } from '$lib/cookies.js'
 import { env } from '$lib/env'
 
 /** @type {import('./$types').LayoutData} */
 export const load = async ({ locals, cookies }) => {
-	const token = env.MODE === 'production' ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
+	const token = env.MODE === 'production' ? cookies.get(getCookieName()) : env.VITE_API_TOKEN
 
 	return {
 		user: !locals.user || 'error_code' in locals.user ? undefined : locals.user,

src/routes/+page.server.ts

@@ -1,9 +1,9 @@
-import { AUTH_COOKIE_NAME } from '$lib/cookies.js'
+import { getCookieName } from '$lib/cookies.js'
 import { redirect } from '@sveltejs/kit'
 import { env } from '$lib/env'
 
 export const load = async ({ cookies, url }) => {
-	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
+	const token = env.PROD ? cookies.get(getCookieName()) : env.VITE_API_TOKEN
 
 	if (token) {
 		throw redirect(302, '/dashboard' + (url.search || ''))

src/routes/api/convert/[output_format]/+server.ts

@@ -2,15 +2,15 @@ import { CADMIMETypes, endpoints } from '$lib/endpoints'
 import { error, json } from '@sveltejs/kit'
 import type { RequestHandler } from './$types'
 import type { Models } from '@kittycad/lib/types'
-import { AUTH_COOKIE_NAME } from '$lib/cookies'
+import { getCookieName } from '$lib/cookies'
 import { env } from '$lib/env'
 
 export type ConvertResponse = Models['FileConversion_type'] & {
 	statusCode: number
 }
 
 export const POST: RequestHandler = async ({ cookies, fetch, request, params }) => {
-	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
+	const token = env.PROD ? cookies.get(getCookieName()) : env.VITE_API_TOKEN
 	if (!token) throw error(401, 'You must be logged in to use this API.')
 
 	const body = await request.text()

src/routes/api/get-generation/+server.ts

@@ -1,4 +1,4 @@
-import { AUTH_COOKIE_NAME } from '$lib/cookies'
+import { getCookieName } from '$lib/cookies'
 import { endpoints, type PromptResponse } from '$lib/endpoints'
 import { error, json, type RequestHandler } from '@sveltejs/kit'
 import { env } from '$lib/env'
@@ -9,7 +9,7 @@ export type LoadResponse = {
 }
 
 export const POST: RequestHandler = async ({ cookies, fetch, request }) => {
-	const token = env.MODE === 'production' ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
+	const token = env.MODE === 'production' ? cookies.get(getCookieName()) : env.VITE_API_TOKEN
 
 	const body = await request.json()
 

src/routes/api/submit-feedback/+server.ts

@@ -1,4 +1,4 @@
-import { AUTH_COOKIE_NAME } from '$lib/cookies'
+import { getCookieName } from '$lib/cookies'
 import { endpoints } from '$lib/endpoints'
 import { error, json, type RequestHandler } from '@sveltejs/kit'
 import { env } from '$lib/env'
@@ -8,7 +8,7 @@ export type LoadResponse = {
 }
 
 export const POST: RequestHandler = async ({ cookies, fetch, request }) => {
-	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
+	const token = env.PROD ? cookies.get(getCookieName()) : env.VITE_API_TOKEN
 	const body = await request.json()
 
 	if (!(body?.id && body?.feedback))

src/routes/api/submit-prompt/+server.ts

@@ -1,7 +1,7 @@
 import { endpoints, type PromptResponse } from '$lib/endpoints'
 import { error, json } from '@sveltejs/kit'
 import type { RequestHandler } from './$types'
-import { AUTH_COOKIE_NAME } from '$lib/cookies'
+import { getCookieName } from '$lib/cookies'
 import { env } from '$lib/env'
 
 export type PromptLoadResponse = {
@@ -10,7 +10,7 @@ export type PromptLoadResponse = {
 }
 
 export const POST: RequestHandler = async ({ cookies, fetch, request }) => {
-	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
+	const token = env.PROD ? cookies.get(getCookieName()) : env.VITE_API_TOKEN
 	if (!token) throw error(401, 'You must be logged in to use this API.')
 
 	const body = await request.json()