source: Klonkt/src/routes/account.js@ dfc5379

main
Last change on this file since dfc5379 was 6d882b1, checked in by roboburr <roboburr@…>, 3 months ago

feat(account): email address editable

Profile form gets an email field; POST /account/profile validates format +
uniqueness (no other account with that address) and updates email + session.

Co-Authored-By: Claude <noreply@…>

  • Property mode set to 100644
File size: 9.7 KB
RevLine 
[7bc636b]1/**
2 * Account routes — profile, password, avatar.
3 *
4 * Sections:
5 * GET / -> render full account page (profile + password + avatar + danger)
6 * POST /profile -> update bio
7 * POST /password -> change password (verify current, hash new)
8 * POST /avatar -> upload avatar image (multer)
9 * POST /avatar/remove -> clear avatar_url
10 *
11 * Each form has its own POST handler. After success, redirects back to
12 * /account?success=... so the page picks it up via query string.
13 */
14
15import express from 'express';
16import path from 'path';
17import fs from 'fs';
18import { fileURLToPath } from 'url';
[9e27d64]19import bcrypt from 'bcryptjs';
[7bc636b]20import multer from 'multer';
21import { v4 as uuid } from 'uuid';
22import db from '../config/database.js';
[7881080]23import { getPrimarySite } from '../middleware/site.js';
[7bc636b]24import { renderPage } from '../middleware/render.js';
25import { requireAuth } from '../middleware/auth.js';
[247988e]26import { googleConfigured } from '../config/google.js';
[7bc636b]27
28const __dirname = path.dirname(fileURLToPath(import.meta.url));
29const AVATAR_DIR = path.resolve(
30 process.env.AVATAR_PATH || path.join(__dirname, '..', '..', 'storage', 'media', 'avatars')
31);
32fs.mkdirSync(AVATAR_DIR, { recursive: true });
33
34const ALLOWED_AVATAR_EXT = new Set(['.jpg', '.jpeg', '.png', '.webp', '.gif']);
35const MAX_AVATAR_BYTES = 5 * 1024 * 1024;
36
37const avatarStorage = multer.diskStorage({
38 destination: (req, file, cb) => cb(null, AVATAR_DIR),
39 filename: (req, file, cb) => {
40 const ext = path.extname(file.originalname).toLowerCase();
41 cb(null, `${uuid()}${ext}`);
42 },
43});
44const avatarUpload = multer({
45 storage: avatarStorage,
46 limits: { fileSize: MAX_AVATAR_BYTES },
47 fileFilter: (req, file, cb) => {
48 const ext = path.extname(file.originalname).toLowerCase();
49 if (!ALLOWED_AVATAR_EXT.has(ext)) {
50 return cb(new Error('Avatar must be jpg/png/webp/gif'));
51 }
52 cb(null, true);
53 },
54});
55
56const router = express.Router();
57
58// ==================== GET account page ====================
59router.get('/', requireAuth, (req, res) => {
60 const account = db.prepare(`
[247988e]61 SELECT id, username, email, role, bio, avatar_url, created_at, password_hash, google_sub
[7bc636b]62 FROM users WHERE id = ?
63 `).get(req.session.user.id);
[9e27d64]64 const hasPassword = !!(account && account.password_hash && account.password_hash !== '!google-oauth');
[247988e]65 const googleLinked = !!(account && account.google_sub);
66 if (account) { delete account.password_hash; delete account.google_sub; } // niet naar de view lekken
[7bc636b]67
68 renderPage(req, res, 'pages/account', {
69 pageTitle: 'Account',
70 bodyClass: 'on-special',
71 account,
[9e27d64]72 hasPassword,
[247988e]73 googleLinked,
74 googleAvailable: googleConfigured(),
[1be21ba]75 editableSite: ownedSite(req.session.user),
[7bc636b]76 success: req.query.success || null,
77 error: req.query.error || null,
78 });
79});
80
[1be21ba]81// De site die deze gebruiker mag bewerken vanuit z'n account: z'n eigen site
82// (owner_id), of voor een god de primaire site. Null als er niets is.
83function ownedSite(user) {
84 if (!user) return null;
85 let site = db.prepare('SELECT id, title, tagline, slug, owner_id FROM sites WHERE owner_id = ? ORDER BY created_at LIMIT 1').get(user.id);
86 if (!site && user.role === 'god') {
[7881080]87 site = getPrimarySite(); // primaire/hoofd-site als fallback
[1be21ba]88 }
89 return site || null;
90}
91
92// ==================== UPDATE SITE-NAAM (eigenaar) ====================
93router.post('/site', requireAuth, (req, res) => {
94 const site = ownedSite(req.session.user);
95 if (!site) return res.redirect('/account?error=' + encodeURIComponent('Geen site om te bewerken.'));
96 if (site.owner_id !== req.session.user.id && req.session.user.role !== 'god') {
97 return res.redirect('/account?error=' + encodeURIComponent('Geen rechten om deze site te bewerken.'));
98 }
99 const title = (req.body.site_title || '').toString().slice(0, 200).trim();
100 if (!title) return res.redirect('/account?error=' + encodeURIComponent('Site-naam mag niet leeg zijn.'));
101 const tagline = (req.body.site_tagline || '').toString().slice(0, 200).trim();
102 db.prepare('UPDATE sites SET title = ?, tagline = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?')
103 .run(title, tagline || null, site.id);
104 res.redirect('/account?success=' + encodeURIComponent('Site-naam bijgewerkt'));
105});
106
[7bc636b]107// ==================== UPDATE BIO ====================
108router.post('/profile', requireAuth, (req, res) => {
109 const bio = (req.body.bio || '').toString().slice(0, 500).trim();
[6d882b1]110
111 // E-mail (optioneel mee te wijzigen). Validatie: geldig formaat + niet al door
112 // een ander account in gebruik. E-mail is het login-/reset-anker, dus uniek.
113 const email = (req.body.email || '').toString().trim();
114 if (email) {
115 if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email) || email.length > 254) {
116 return res.redirect('/account?error=' + encodeURIComponent('Voer een geldig e-mailadres in.'));
117 }
118 const taken = db.prepare('SELECT 1 FROM users WHERE LOWER(email) = LOWER(?) AND id != ?')
119 .get(email, req.session.user.id);
120 if (taken) {
121 return res.redirect('/account?error=' + encodeURIComponent('Dit e-mailadres is al in gebruik.'));
122 }
123 db.prepare('UPDATE users SET email = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?')
124 .run(email, req.session.user.id);
125 req.session.user.email = email; // sessie bijwerken zodat de UI klopt
126 }
127
[7bc636b]128 db.prepare('UPDATE users SET bio = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?')
129 .run(bio || null, req.session.user.id);
[6d882b1]130 res.redirect('/account?success=' + encodeURIComponent('Profiel bijgewerkt'));
[7bc636b]131});
132
133// P57 — /preferences route removed. Per-user theme/palette was a multi-tenant
134// holdover that conflicts with the site-default model: visitors should see
135// the site's appearance, not whatever a user once picked. The users.theme and
136// users.palette columns stay in the schema (no migration needed) but are no
137// longer read or written.
138
[9e27d64]139// ==================== CHANGE PASSWORD ====================
140router.post('/password', requireAuth, (req, res) => {
141 const { current, new_password, confirm } = req.body;
142 if (!current || !new_password || !confirm) {
143 return res.redirect('/account?error=' + encodeURIComponent('Alle wachtwoordvelden zijn verplicht'));
144 }
145 if (new_password.length < 8) {
146 return res.redirect('/account?error=' + encodeURIComponent('Nieuw wachtwoord moet minstens 8 tekens zijn'));
147 }
148 if (new_password !== confirm) {
149 return res.redirect('/account?error=' + encodeURIComponent('Nieuwe wachtwoorden komen niet overeen'));
150 }
151
152 const row = db.prepare('SELECT password_hash FROM users WHERE id = ?').get(req.session.user.id);
153 // Google-only accounts (luisteraars) hebben geen echt wachtwoord.
154 if (!row || !row.password_hash || row.password_hash === '!google-oauth') {
155 return res.redirect('/account?error=' + encodeURIComponent('Dit account heeft geen wachtwoord (Google-login)'));
156 }
157 if (!bcrypt.compareSync(current, row.password_hash)) {
158 return res.redirect('/account?error=' + encodeURIComponent('Huidig wachtwoord is onjuist'));
159 }
160
161 const newHash = bcrypt.hashSync(new_password, 10);
162 db.prepare('UPDATE users SET password_hash = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?')
163 .run(newHash, req.session.user.id);
164
165 res.redirect('/account?success=' + encodeURIComponent('Wachtwoord gewijzigd'));
166});
[7bc636b]167
[247988e]168// Google-account ontkoppelen. Alleen toegestaan als er nog een wachtwoord is,
169// anders zou je jezelf buitensluiten (geen login-methode meer over).
170router.post('/google/unlink', requireAuth, (req, res) => {
171 const row = db.prepare('SELECT password_hash, google_sub FROM users WHERE id = ?').get(req.session.user.id);
172 if (!row || !row.google_sub) {
173 return res.redirect('/account?error=' + encodeURIComponent('Er is geen Google-account gekoppeld'));
174 }
175 if (!row.password_hash || row.password_hash === '!google-oauth') {
176 return res.redirect('/account?error=' + encodeURIComponent('Stel eerst een wachtwoord in — anders kun je niet meer inloggen.'));
177 }
178 db.prepare('UPDATE users SET google_sub = NULL, updated_at = CURRENT_TIMESTAMP WHERE id = ?').run(req.session.user.id);
179 res.redirect('/account?success=' + encodeURIComponent('Google-account ontkoppeld'));
180});
181
[7bc636b]182// ==================== UPLOAD AVATAR ====================
183router.post('/avatar', requireAuth, (req, res) => {
184 avatarUpload.single('avatar')(req, res, (err) => {
185 if (err) {
186 return res.redirect('/account?error=' + encodeURIComponent(err.message));
187 }
188 if (!req.file) {
189 return res.redirect('/account?error=' + encodeURIComponent('No file uploaded'));
190 }
191
192 const url = `/media/avatars/${req.file.filename}`;
193
194 // Remove the old avatar file (if it lives in our avatar dir)
195 const old = db.prepare('SELECT avatar_url FROM users WHERE id = ?').get(req.session.user.id)?.avatar_url;
196 if (old && old.startsWith('/media/avatars/')) {
197 const oldPath = path.join(AVATAR_DIR, path.basename(old));
198 try { fs.unlinkSync(oldPath); } catch {}
199 }
200
201 db.prepare('UPDATE users SET avatar_url = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?')
202 .run(url, req.session.user.id);
203 req.session.user.avatar_url = url;
204
205 res.redirect('/account?success=' + encodeURIComponent('Avatar updated'));
206 });
207});
208
209// ==================== REMOVE AVATAR ====================
210router.post('/avatar/remove', requireAuth, (req, res) => {
211 const old = db.prepare('SELECT avatar_url FROM users WHERE id = ?').get(req.session.user.id)?.avatar_url;
212 if (old && old.startsWith('/media/avatars/')) {
213 const oldPath = path.join(AVATAR_DIR, path.basename(old));
214 try { fs.unlinkSync(oldPath); } catch {}
215 }
216 db.prepare('UPDATE users SET avatar_url = NULL, updated_at = CURRENT_TIMESTAMP WHERE id = ?')
217 .run(req.session.user.id);
218 req.session.user.avatar_url = null;
219 res.redirect('/account?success=' + encodeURIComponent('Avatar removed'));
220});
221
222export default router;
Note: See TracBrowser for help on using the repository browser.