diff --git a/functions/api/user.js b/functions/api/user.js index c0c7189..3220974 100644 --- a/functions/api/user.js +++ b/functions/api/user.js @@ -1,16 +1,18 @@ const json = (d, o) => new Response(JSON.stringify(d), { ...o, headers: { 'Content-Type': 'application/json', ...(o?.headers || {}) } }); +const cookie = c => (c.match(/auth_user=([^;]+)/)?.[1] || null); +const hash = c => (c.match(/auth_hash=([^;]+)/)?.[1] || null); +const tsEq=(a,b)=>{if(!a||!b)return!1;let d=a.length^b.length;for(let i=0;i{const o=`Domain=.speech.capital; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT`;return {'Set-Cookie':`auth_user=; ${o}`,'Set-Cookie':`auth_hash=; ${o}`}}; export async function onRequest({ request, env }) { - const sid = (request.headers.get('Cookie') || '').match(/session_id=([^;]+)/)?.[1]; - if (!sid) return json({ user: null }); + const c = request.headers.get('Cookie') || ''; + const u = cookie(c), h = hash(c); + if (!u || !h) return json({ user: null }); + try { - const user = await env.D1_SPCHCAP.prepare( - `SELECT u.id,u.username,u.role FROM users u JOIN sessions s ON u.id=s.user_id - WHERE s.id=? AND s.expires_at>CURRENT_TIMESTAMP` - ).bind(sid).first(); - if(user) return json({ user }); - const cookie=`session_id=; Domain=.speech.capital; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT`; - return json({ user: null }, { headers: { 'Set-Cookie': cookie } }); + const user = await env.D1_SPCHCAP.prepare('SELECT id, username, role, pass_hash FROM users WHERE username = ?').bind(u).first(); + if (user && tsEq(user.pass_hash, h)) return json({ user: { id: user.id, username: user.username, role: user.role } }); + return json({ user: null }, { headers: clear() }); } catch (e) { return json({ error: { message: e.message } }, { status: 500 }); }