From c59f1d271c48c709c7586301e924687105115405 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 20 Sep 2025 23:19:51 +0200 Subject: [PATCH] smoll cleanup --- .env | 2 +- api/src/main.rs | 2 ++ web/bun.lock | 3 +++ web/src/routes/api/persons/+server.ts | 2 +- web/src/routes/api/persons/[id]/[action]/+server.ts | 2 +- web/src/routes/api/persons/search/+server.ts | 3 ++- 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 39c0d65..7102b82 100644 --- a/.env +++ b/.env @@ -5,4 +5,4 @@ ADMIN_PASSWORD=AdminPass!234 JWT_COOKIE_SECURE=false ENABLE_HTTPS_REDIRECT=false WEB_PORT=3000 -CSRF_ALLOWED_ORIGINS=http://192.168.68.61:3000 +CSRF_ALLOWED_ORIGINS=http://192.168.68.64:3000 diff --git a/api/src/main.rs b/api/src/main.rs index ef92106..874e26e 100644 --- a/api/src/main.rs +++ b/api/src/main.rs @@ -11,6 +11,7 @@ use models::{ LoginRequest, LoginResponse, NewPersonRequest, Person, PersonActionResponse, PersonResponse, PersonsResponse, User, }; + use rocket::http::{Cookie, CookieJar, SameSite, Status}; use rocket::response::stream::{Event, EventStream}; use rocket::serde::json::Json; @@ -47,6 +48,7 @@ async fn main() -> Result<(), rocket::Error> { .await .expect("Misslyckades att köra migrationer"); + // Seed för testning seed::run(&pool, &config.admin_username, &config.admin_password) .await .expect("Misslyckades att seed:a databasen"); diff --git a/web/bun.lock b/web/bun.lock index 5264d16..3beb7ca 100644 --- a/web/bun.lock +++ b/web/bun.lock @@ -8,6 +8,7 @@ "@sveltejs/kit": "^2.22.0", "@sveltejs/vite-plugin-svelte": "^6.0.0", "@tailwindcss/vite": "^4.0.0", + "dotenv": "^16.4.5", "prettier": "^3.4.2", "prettier-plugin-svelte": "^3.3.3", "prettier-plugin-tailwindcss": "^0.6.11", @@ -210,6 +211,8 @@ "devalue": ["devalue@5.3.2", "", {}, "sha512-UDsjUbpQn9kvm68slnrs+mfxwFkIflOhkanmyabZ8zOYk8SMEIbJ3TK+88g70hSIeytu4y18f0z/hYHMTrXIWw=="], + "dotenv": ["dotenv@16.6.1", "", {}, "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow=="], + "enhanced-resolve": ["enhanced-resolve@5.18.3", "", { "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" } }, "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww=="], "esbuild": ["esbuild@0.25.10", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.10", "@esbuild/android-arm": "0.25.10", "@esbuild/android-arm64": "0.25.10", "@esbuild/android-x64": "0.25.10", "@esbuild/darwin-arm64": "0.25.10", "@esbuild/darwin-x64": "0.25.10", "@esbuild/freebsd-arm64": "0.25.10", "@esbuild/freebsd-x64": "0.25.10", "@esbuild/linux-arm": "0.25.10", "@esbuild/linux-arm64": "0.25.10", "@esbuild/linux-ia32": "0.25.10", "@esbuild/linux-loong64": "0.25.10", "@esbuild/linux-mips64el": "0.25.10", "@esbuild/linux-ppc64": "0.25.10", "@esbuild/linux-riscv64": "0.25.10", "@esbuild/linux-s390x": "0.25.10", "@esbuild/linux-x64": "0.25.10", "@esbuild/netbsd-arm64": "0.25.10", "@esbuild/netbsd-x64": "0.25.10", "@esbuild/openbsd-arm64": "0.25.10", "@esbuild/openbsd-x64": "0.25.10", "@esbuild/openharmony-arm64": "0.25.10", "@esbuild/sunos-x64": "0.25.10", "@esbuild/win32-arm64": "0.25.10", "@esbuild/win32-ia32": "0.25.10", "@esbuild/win32-x64": "0.25.10" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ=="], diff --git a/web/src/routes/api/persons/+server.ts b/web/src/routes/api/persons/+server.ts index 3f84bdf..36d8806 100644 --- a/web/src/routes/api/persons/+server.ts +++ b/web/src/routes/api/persons/+server.ts @@ -1,4 +1,4 @@ -import { json, error } from '@sveltejs/kit'; +import { error } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { proxyRequest } from '$lib/server/backend'; diff --git a/web/src/routes/api/persons/[id]/[action]/+server.ts b/web/src/routes/api/persons/[id]/[action]/+server.ts index 42f38df..0b963e6 100644 --- a/web/src/routes/api/persons/[id]/[action]/+server.ts +++ b/web/src/routes/api/persons/[id]/[action]/+server.ts @@ -1,4 +1,4 @@ -import { json, error } from '@sveltejs/kit'; +import { error } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { proxyRequest } from '$lib/server/backend'; diff --git a/web/src/routes/api/persons/search/+server.ts b/web/src/routes/api/persons/search/+server.ts index b979209..c66a38b 100644 --- a/web/src/routes/api/persons/search/+server.ts +++ b/web/src/routes/api/persons/search/+server.ts @@ -1,4 +1,4 @@ -import { json, error } from '@sveltejs/kit'; +import { error } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { proxyRequest } from '$lib/server/backend'; @@ -20,6 +20,7 @@ export const GET: RequestHandler = async (event) => { for (const cookie of setCookies) { headers.append('set-cookie', cookie); } + const contentType = response.headers.get('content-type'); if (contentType) { headers.set('content-type', contentType);