fix account save
This commit is contained in:
@@ -4,21 +4,22 @@ import type { User, UserSettings } from '$lib/types/user';
|
||||
import { type Actions, error, fail } from '@sveltejs/kit';
|
||||
import { getFormString, getRequiredFormString } from '$lib/shared';
|
||||
import bcrypt from 'bcrypt';
|
||||
import { setJWTCookie } from '$lib/auth/index.server';
|
||||
|
||||
export const load: PageServerLoad = async ({ locals }) => {
|
||||
if (!locals || !locals.user) {
|
||||
throw Error('Need to be logged in!');
|
||||
}
|
||||
|
||||
const [userData]: User[] = await sql`
|
||||
const [userData] = await sql`
|
||||
SELECT * FROM users WHERE id = ${locals.user.id}
|
||||
`;
|
||||
|
||||
userData.settings = JSON.parse(userData.settings);
|
||||
return { userData };
|
||||
};
|
||||
|
||||
export const actions: Actions = {
|
||||
default: async ({ request, url, locals, params }) => {
|
||||
default: async ({ request, url, locals, params, cookies }) => {
|
||||
if (!locals || !locals.user) {
|
||||
throw error(403, 'Need to be logged in!');
|
||||
}
|
||||
@@ -53,18 +54,17 @@ export const actions: Actions = {
|
||||
notifyAllTurnedInInquiries
|
||||
};
|
||||
|
||||
return await sql`
|
||||
const [res] = await sql`
|
||||
UPDATE users SET name = ${name},
|
||||
email = ${email},
|
||||
${passwordHash ? sql`password_hash = ${passwordHash},` : sql``}
|
||||
settings = ${settings.toString()}
|
||||
settings = ${JSON.stringify(settings)}
|
||||
WHERE id = ${locals.user.id}
|
||||
RETURNING *;
|
||||
`;
|
||||
res.settings = JSON.parse(res.settings);
|
||||
setJWTCookie(cookies, res as User);
|
||||
} catch (e) {
|
||||
console.log('fails');
|
||||
console.log(e);
|
||||
|
||||
return fail(400, {
|
||||
message: e instanceof Error ? e.message : 'Unknown error occurred',
|
||||
success: false
|
||||
|
||||
Reference in New Issue
Block a user