From c9f597b54c2f2d106affe3fc487ebb4edcc20fee Mon Sep 17 00:00:00 2001 From: suricata Date: Thu, 15 Jan 2026 12:08:11 +0000 Subject: [PATCH] cool changes --- app/components/main_header.vue | 2 +- server/fastapi_server/fastapi_server.py | 12 +----------- server/routes/convert.post.ts | 6 ++++-- server/routes/login.post.ts | 5 +++-- server/routes/logout.ts | 4 +++- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/app/components/main_header.vue b/app/components/main_header.vue index 13c1da4..5572efb 100644 --- a/app/components/main_header.vue +++ b/app/components/main_header.vue @@ -30,7 +30,7 @@ const props = defineProps({ return fetch("/logout").then( (response) => { if (response.ok) { - window.location.reload; + window.location.reload(); } } ) diff --git a/server/fastapi_server/fastapi_server.py b/server/fastapi_server/fastapi_server.py index 3840394..c8aeab7 100644 --- a/server/fastapi_server/fastapi_server.py +++ b/server/fastapi_server/fastapi_server.py @@ -53,23 +53,15 @@ class register_model(BaseModel): async def create_user(req: Request): body = await req.json() - #body = register_model(**body) # Auto exceptions give more verbose to Nuxt. - #try: - # body = register_model(**body) - #except ValidationError: - # raise HTTPException(status_code=400, detail="Missing / invalid arguments") - body["password"] = bcrypt.hashpw(body["password"].encode(), bcrypt.gensalt()).decode() async with db.pool.acquire() as conn: async with conn.cursor() as cur: await cur.execute("INSERT INTO users (`first_name`,`last_name`,`email`,`password`) VALUES (%s,%s,%s,%s)", (body.first_name, body.last_name, body.email, body.password)) await conn.commit() -class login_data(BaseModel): - email: str - password: str + @app.post("/login") async def login_endpoint(req: Request): @@ -77,8 +69,6 @@ async def login_endpoint(req: Request): body = await req.json() #print(body) try: - #login = login_data(**body) - # ensure it's only email and password user_data = await fetch_user_info(body["email"]) if (user_data is None): raise HTTPException(status_code=401, detail="User doesn't exist") diff --git a/server/routes/convert.post.ts b/server/routes/convert.post.ts index 0aa38e7..dd2afcf 100644 --- a/server/routes/convert.post.ts +++ b/server/routes/convert.post.ts @@ -1,7 +1,9 @@ -export default defineEventHandler((event) => { +export default defineEventHandler(async (event) => { // this one requires auth //const login = fetch("http://127.0.0.1:81/login"); - throw createError({ statusCode: 401 }); + const session = await getUserSession(event) + if (session.secure!.user_id == undefined) + throw createError({ statusCode: 401 }); }) \ No newline at end of file diff --git a/server/routes/login.post.ts b/server/routes/login.post.ts index 0b1c3fc..6b9ee83 100644 --- a/server/routes/login.post.ts +++ b/server/routes/login.post.ts @@ -5,7 +5,7 @@ export default defineEventHandler(async (event) => { if ( !body.email || !body.password ) throw createError({ statusCode: 400, message: "Bad form. Use e-mail and password" }) - console.log(body) + //console.log(body) const req = await fetch(conf.fastapi_url + "/login", { method: "POST", @@ -29,10 +29,11 @@ export default defineEventHandler(async (event) => { surname: body.last_name, email: body.email }, - private: { + secure: { user_id: body.id } }) + console.log(await getUserSession(event)) return; } diff --git a/server/routes/logout.ts b/server/routes/logout.ts index f82d0e7..a989d66 100644 --- a/server/routes/logout.ts +++ b/server/routes/logout.ts @@ -1,4 +1,6 @@ export default defineEventHandler(async (event) => { // log them out - await clearUserSession(event); + console.log(await clearUserSession(event)) + + return; }) \ No newline at end of file