From 2349cb59d3bf13d5bb0ff560b6a7e296eb1909ca Mon Sep 17 00:00:00 2001 From: lzw-723 Date: Thu, 9 Apr 2026 22:13:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=89=8D=E7=AB=AF=E6=97=A0?= =?UTF-8?q?=E6=95=88=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/hooks.server.js | 17 +----- web/src/lib/server/auth.js | 12 ---- web/src/lib/server/db/auth.schema.js | 1 - web/src/lib/server/db/index.js | 10 ---- web/src/lib/server/db/schema.js | 11 ---- web/src/routes/demo/+page.svelte | 6 -- .../routes/demo/better-auth/+page.server.js | 19 ------ web/src/routes/demo/better-auth/+page.svelte | 11 ---- .../demo/better-auth/login/+page.server.js | 60 ------------------- .../demo/better-auth/login/+page.svelte | 24 -------- web/src/routes/demo/paraglide/+page.svelte | 22 ------- 11 files changed, 1 insertion(+), 192 deletions(-) delete mode 100644 web/src/lib/server/auth.js delete mode 100644 web/src/lib/server/db/auth.schema.js delete mode 100644 web/src/lib/server/db/index.js delete mode 100644 web/src/lib/server/db/schema.js delete mode 100644 web/src/routes/demo/+page.svelte delete mode 100644 web/src/routes/demo/better-auth/+page.server.js delete mode 100644 web/src/routes/demo/better-auth/+page.svelte delete mode 100644 web/src/routes/demo/better-auth/login/+page.server.js delete mode 100644 web/src/routes/demo/better-auth/login/+page.svelte delete mode 100644 web/src/routes/demo/paraglide/+page.svelte diff --git a/web/src/hooks.server.js b/web/src/hooks.server.js index 11f5976..61c5096 100644 --- a/web/src/hooks.server.js +++ b/web/src/hooks.server.js @@ -1,6 +1,5 @@ import { sequence } from '@sveltejs/kit/hooks'; import { building } from '$app/environment'; -import { auth } from '$lib/server/auth'; import { svelteKitHandler } from 'better-auth/svelte-kit'; import { getTextDirection } from '$lib/paraglide/runtime'; import { paraglideMiddleware } from '$lib/paraglide/server'; @@ -19,20 +18,6 @@ const handleParaglide = ({ event, resolve }) => }); }); -/** @type {import('@sveltejs/kit').Handle} */ -const handleBetterAuth = async ({ event, resolve }) => { - const session = await auth.api.getSession({ - /** @type {import('@sveltejs/kit').Handle} */ headers: event.request.headers - }); - - if (session) { - event.locals.session = session.session; - event.locals.user = session.user; - } - - return svelteKitHandler({ event, resolve, auth, building }); -}; - /** * API 代理处理 - 将 /api/v1 请求代理到 Dart 后端 * 仅在生产环境生效，开发环境由 Vite proxy 处理 @@ -99,4 +84,4 @@ const handleCache = async ({ event, resolve }) => { return newResponse; }; -export const handle = sequence(handleApiProxy, handleParaglide, handleBetterAuth, handleCache); +export const handle = sequence(handleApiProxy, handleParaglide, handleCache); diff --git a/web/src/lib/server/auth.js b/web/src/lib/server/auth.js deleted file mode 100644 index a3a3df0..0000000 --- a/web/src/lib/server/auth.js +++ /dev/null @@ -1,12 +0,0 @@ -import { betterAuth } from 'better-auth/minimal'; -import { sveltekitCookies } from 'better-auth/svelte-kit'; -import { env } from '$env/dynamic/private'; -import { getRequestEvent } from '$app/server'; - -export const auth = betterAuth({ - baseURL: env.ORIGIN, - secret: env.BETTER_AUTH_SECRET, - // database: drizzleAdapter(db, { provider: 'sqlite' }), - emailAndPassword: { enabled: true }, - plugins: [sveltekitCookies(getRequestEvent)] // make sure this is the last plugin in the array -}); diff --git a/web/src/lib/server/db/auth.schema.js b/web/src/lib/server/db/auth.schema.js deleted file mode 100644 index 952b9b3..0000000 --- a/web/src/lib/server/db/auth.schema.js +++ /dev/null @@ -1 +0,0 @@ -// If you see this file, you have not run the auth:schema script yet, but you should! diff --git a/web/src/lib/server/db/index.js b/web/src/lib/server/db/index.js deleted file mode 100644 index b3c877b..0000000 --- a/web/src/lib/server/db/index.js +++ /dev/null @@ -1,10 +0,0 @@ -import { drizzle } from 'drizzle-orm/better-sqlite3'; -import Database from 'better-sqlite3'; -import * as schema from './schema'; -import { env } from '$env/dynamic/private'; - -if (!env.DATABASE_URL) throw new Error('DATABASE_URL is not set'); - -const client = new Database(env.DATABASE_URL); - -export const db = drizzle(client, { schema }); diff --git a/web/src/lib/server/db/schema.js b/web/src/lib/server/db/schema.js deleted file mode 100644 index dbc27a7..0000000 --- a/web/src/lib/server/db/schema.js +++ /dev/null @@ -1,11 +0,0 @@ -import { integer, sqliteTable, text } from 'drizzle-orm/sqlite-core'; - -export const task = sqliteTable('task', { - id: text('id') - .primaryKey() - .$defaultFn(() => crypto.randomUUID()), - title: text('title').notNull(), - priority: integer('priority').notNull().default(1) -}); - -export * from './auth.schema'; diff --git a/web/src/routes/demo/+page.svelte b/web/src/routes/demo/+page.svelte deleted file mode 100644 index 0a5dc22..0000000 --- a/web/src/routes/demo/+page.svelte +++ /dev/null @@ -1,6 +0,0 @@ - - -better-auth -paraglide diff --git a/web/src/routes/demo/better-auth/+page.server.js b/web/src/routes/demo/better-auth/+page.server.js deleted file mode 100644 index ecb4ea9..0000000 --- a/web/src/routes/demo/better-auth/+page.server.js +++ /dev/null @@ -1,19 +0,0 @@ -import { redirect } from '@sveltejs/kit'; - -import { auth } from '$lib/server/auth'; - -export const load = async (event) => { - if (!event.locals.user) { - return redirect(302, '/demo/better-auth/login'); - } - return { user: event.locals.user }; -}; - -export const actions = { - signOut: async (event) => { - await auth.api.signOut({ - headers: event.request.headers - }); - return redirect(302, '/demo/better-auth/login'); - } -}; diff --git a/web/src/routes/demo/better-auth/+page.svelte b/web/src/routes/demo/better-auth/+page.svelte deleted file mode 100644 index ebfa7f2..0000000 --- a/web/src/routes/demo/better-auth/+page.svelte +++ /dev/null @@ -1,11 +0,0 @@ - - -

Hi, {data.user.name}!

-

Your user ID is {data.user.id}.

-
- -
diff --git a/web/src/routes/demo/better-auth/login/+page.server.js b/web/src/routes/demo/better-auth/login/+page.server.js deleted file mode 100644 index 4b0b2b7..0000000 --- a/web/src/routes/demo/better-auth/login/+page.server.js +++ /dev/null @@ -1,60 +0,0 @@ -import { fail, redirect } from '@sveltejs/kit'; - -import { auth } from '$lib/server/auth'; -import { APIError } from 'better-auth/api'; - -export const load = async (event) => { - if (event.locals.user) { - return redirect(302, '/demo/better-auth'); - } - return {}; -}; - -export const actions = { - signInEmail: async (event) => { - const formData = await event.request.formData(); - const email = formData.get('email')?.toString() ?? ''; - const password = formData.get('password')?.toString() ?? ''; - - try { - await auth.api.signInEmail({ - body: { - email, - password, - callbackURL: '/auth/verification-success' - } - }); - } catch (error) { - if (error instanceof APIError) { - return fail(400, { message: error.message || 'Signin failed' }); - } - return fail(500, { message: 'Unexpected error' }); - } - - return redirect(302, '/demo/better-auth'); - }, - signUpEmail: async (event) => { - const formData = await event.request.formData(); - const email = formData.get('email')?.toString() ?? ''; - const password = formData.get('password')?.toString() ?? ''; - const name = formData.get('name')?.toString() ?? ''; - - try { - await auth.api.signUpEmail({ - body: { - email, - password, - name, - callbackURL: '/auth/verification-success' - } - }); - } catch (error) { - if (error instanceof APIError) { - return fail(400, { message: error.message || 'Registration failed' }); - } - return fail(500, { message: 'Unexpected error' }); - } - - return redirect(302, '/demo/better-auth'); - } -}; diff --git a/web/src/routes/demo/better-auth/login/+page.svelte b/web/src/routes/demo/better-auth/login/+page.svelte deleted file mode 100644 index dd06671..0000000 --- a/web/src/routes/demo/better-auth/login/+page.svelte +++ /dev/null @@ -1,24 +0,0 @@ - - -

Login

-
- - - - - -
-

{form?.message ?? ''}

diff --git a/web/src/routes/demo/paraglide/+page.svelte b/web/src/routes/demo/paraglide/+page.svelte deleted file mode 100644 index 259d27d..0000000 --- a/web/src/routes/demo/paraglide/+page.svelte +++ /dev/null @@ -1,22 +0,0 @@ - - -

{m.hello_world({ name: 'SvelteKit User' })}

- -
- - -
- -

- If you use VSCode, install the - - Sherlock i18n extension - - for a better i18n experience. -