cleanup: auth in query

Author: izadoesdev

apps/api/src/routes/query.ts

@@ -1,5 +1,7 @@
+import { auth } from '@databuddy/auth';
 import { filterOptions } from '@databuddy/shared';
 import { Elysia, t } from 'elysia';
+import { getApiKeyFromHeader, isApiKeyPresent } from '../lib/api-key';
 import { getCachedWebsiteDomain, getWebsiteDomain } from '../lib/website-utils';
 // import { createRateLimitMiddleware } from '../middleware/rate-limit';
 import { websiteAuth } from '../middleware/website-auth';
@@ -22,36 +24,75 @@ interface QueryParams {
 	timezone?: string;
 }
 
+async function checkAuth(request: Request): Promise<Response | null> {
+	const apiKeyPresent = isApiKeyPresent(request.headers);
+	const apiKey = apiKeyPresent
+		? await getApiKeyFromHeader(request.headers)
+		: null;
+	const session = await auth.api.getSession({ headers: request.headers });
+	const sessionUser = session?.user ?? null;
+
+	if (sessionUser || apiKey) {
+		return null; // Auth passed
+	}
+
+	return new Response(
+		JSON.stringify({
+			success: false,
+			error: 'Authentication required',
+			code: 'AUTH_REQUIRED',
+		}),
+		{
+			status: 401,
+			headers: { 'Content-Type': 'application/json' },
+		}
+	);
+}
+
 export const query = new Elysia({ prefix: '/v1/query' })
 	// .use(createRateLimitMiddleware({ type: 'api' }))
 	.use(websiteAuth())
-	.get('/types', ({ query: params }: { query: { include_meta?: string } }) => {
-		const includeMeta = params.include_meta === 'true';
+	.get(
+		'/types',
+		async ({
+			query: params,
+			request,
+		}: {
+			query: { include_meta?: string };
+			request: Request;
+		}) => {
+			const authResult = await checkAuth(request);
+			if (authResult) {
+				return authResult;
+			}
 
-		const configs = Object.fromEntries(
-			Object.entries(QueryBuilders).map(([key, config]) => {
-				const baseConfig = {
-					allowedFilters:
-						config.allowedFilters ??
-						filterOptions.map((filter) => filter.value),
-					customizable: config.customizable,
-					defaultLimit: config.limit,
-				};
+			const includeMeta = params.include_meta === 'true';
 
-				if (includeMeta) {
-					return [key, { ...baseConfig, meta: config.meta }];
-				}
+			const configs = Object.fromEntries(
+				Object.entries(QueryBuilders).map(([key, config]) => {
+					const baseConfig = {
+						allowedFilters:
+							config.allowedFilters ??
+							filterOptions.map((filter) => filter.value),
+						customizable: config.customizable,
+						defaultLimit: config.limit,
+					};
 
-				return [key, baseConfig];
-			})
-		);
+					if (includeMeta) {
+						return [key, { ...baseConfig, meta: config.meta }];
+					}
+
+					return [key, baseConfig];
+				})
+			);
 
-		return {
-			success: true,
-			types: Object.keys(QueryBuilders),
-			configs,
-		};
-	})
+			return {
+				success: true,
+				types: Object.keys(QueryBuilders),
+				configs,
+			};
+		}
+	)
 
 	.post(
 		'/compile',

apps/dashboard/app/(main)/settings/integrations/vercel/_components/create-website-dialog.tsx

@@ -20,7 +20,11 @@ import {
 	SheetTitle,
 } from '@/components/ui/sheet';
 import type { Domain, Project } from './types';
-import { generateWebsiteName, inferTargetFromDomain } from './utils';
+import {
+	generateWebsiteName,
+	generateWebsitePlaceholder,
+	inferTargetFromDomain,
+} from './utils';
 
 interface WebsiteConfig {
 	domain: Domain;
@@ -52,7 +56,7 @@ export function CreateWebsiteDialog({
 		if (selectedDomains.length > 0) {
 			const configs = selectedDomains.map((domain) => ({
 				domain,
-				name: generateWebsiteName(domain.name),
+				name: '', // Start with empty name, will use placeholder
 				target: isMultipleMode
 					? inferTargetFromDomain(domain)
 					: (['production', 'preview', 'development'] as string[]),
@@ -65,7 +69,14 @@ export function CreateWebsiteDialog({
 		if (websiteConfigs.length === 0) {
 			return;
 		}
-		await onSave(websiteConfigs);
+
+		// Use domain name as default if name is empty
+		const configsWithDefaults = websiteConfigs.map((config) => ({
+			...config,
+			name: config.name.trim() || generateWebsiteName(config.domain.name),
+		}));
+
+		await onSave(configsWithDefaults);
 	};
 
 	const updateWebsiteConfig = useCallback(
@@ -87,7 +98,6 @@ export function CreateWebsiteDialog({
 	const isFormValid = useMemo(() => {
 		return (
 			websiteConfigs.length > 0 &&
-			websiteConfigs.every((config) => config.name.trim() !== '') &&
 			websiteConfigs.every((config) => config.target.length > 0)
 		);
 	}, [websiteConfigs]);
@@ -110,13 +120,13 @@ export function CreateWebsiteDialog({
 						<div>
 							<SheetTitle className="font-semibold text-foreground text-xl">
 								{isMultipleMode
-									? `Create ${websiteConfigs.length} Websites`
-									: 'Create Website'}
+									? `Integrate ${websiteConfigs.length} Websites`
+									: 'Integrate Website'}
 							</SheetTitle>
 							<SheetDescription className="mt-1 text-muted-foreground">
 								{isMultipleMode
-									? `Create websites for ${selectedProject?.name} and configure environment variables`
-									: `Create website for ${websiteConfigs[0]?.domain.name} and configure environment variables`}
+									? `Integrate websites for ${selectedProject?.name} and configure environment variables`
+									: `Integrate website for ${websiteConfigs[0]?.domain.name} and configure environment variables`}
 							</SheetDescription>
 						</div>
 					</div>
@@ -178,7 +188,7 @@ export function CreateWebsiteDialog({
 									onChange={(e) =>
 										updateWebsiteConfig(index, { name: e.target.value })
 									}
-									placeholder="Enter website name"
+									placeholder={generateWebsitePlaceholder(config.domain.name)}
 									value={config.name}
 								/>
 							</div>
@@ -268,7 +278,7 @@ export function CreateWebsiteDialog({
 							<li className="flex items-center gap-2">
 								<div className="h-1.5 w-1.5 rounded-full bg-primary/60" />
 								<span>
-									Create {websiteConfigs.length} website
+									Integrate {websiteConfigs.length} website
 									{websiteConfigs.length !== 1 ? 's' : ''} in Databuddy
 								</span>
 							</li>
@@ -306,11 +316,11 @@ export function CreateWebsiteDialog({
 							)}
 							<span className={isSaving ? 'ml-6' : ''}>
 								{isSaving ? (
-									'Creating...'
+									'Integrating...'
 								) : (
 									<>
 										<PlusIcon className="mr-2 h-4 w-4" />
-										Create {websiteConfigs.length} Website
+										Integrate {websiteConfigs.length} Website
 										{websiteConfigs.length !== 1 ? 's' : ''}
 									</>
 								)}