Consolidate API token environment variables (#204)

Author: jacebrowning

.env.development

@@ -2,5 +2,4 @@
 
 VITE_API_BASE_URL=https://api.dev.zoo.dev
 VITE_SITE_BASE_URL=https://dev.zoo.dev
-#PLAYWRIGHT_SESSION_COOKIE="your-token-from-dev.zoo.dev"
-#VITE_TOKEN="your-token-from-dev.zoo.dev"
+#VITE_API_TOKEN="your API token"

.github/workflows/ci.yml

@@ -71,8 +71,7 @@ jobs:
 
       - run: yarn test:e2e
         env:
-          PLAYWRIGHT_SESSION_COOKIE: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-          VITE_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+          VITE_API_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
           TAB_API_URL: ${{ secrets.TAB_API_URL }}
           TAB_API_KEY: ${{ secrets.TAB_API_KEY }}
           CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}

playwright.config.ts

@@ -17,7 +17,7 @@ const config: PlaywrightTestConfig = {
 			cookies: [
 				{
 					name: AUTH_COOKIE_NAME,
-					value: process.env.PLAYWRIGHT_SESSION_COOKIE ?? '',
+					value: process.env.VITE_API_TOKEN ?? '',
 					domain: 'localhost',
 					path: '/',
 					expires: expiration.getTime() / 1000,

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

@@ -11,7 +11,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_TOKEN
+	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
 
 	if (!token) {
 		signOut()

src/routes/+layout.server.ts

@@ -3,7 +3,7 @@ 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_TOKEN
+	const token = env.MODE === 'production' ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
 
 	return {
 		user: !locals.user || 'error_code' in locals.user ? undefined : locals.user,

src/routes/+page.server.ts

@@ -3,7 +3,7 @@ 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_TOKEN
+	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
 
 	if (token) {
 		throw redirect(302, '/dashboard' + (url.search || ''))

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

@@ -10,7 +10,7 @@ export type ConvertResponse = Models['FileConversion_type'] & {
 }
 
 export const POST: RequestHandler = async ({ cookies, fetch, request, params }) => {
-	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_TOKEN
+	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : 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

@@ -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_TOKEN
+	const token = env.MODE === 'production' ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
 
 	const body = await request.json()
 

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

@@ -9,7 +9,7 @@ export type LoadResponse = {
 }
 
 export const POST: RequestHandler = async ({ cookies, fetch, request }) => {
-	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_TOKEN
+	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
 	const body = await request.json()
 
 	if (!(body?.id && body?.feedback))

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

@@ -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_TOKEN
+	const token = env.PROD ? cookies.get(AUTH_COOKIE_NAME) : env.VITE_API_TOKEN
 	if (!token) throw error(401, 'You must be logged in to use this API.')
 
 	const body = await request.json()