Füge Sichtbarkeitspräferenzen für Mitgliederprofile hinzu: Ermögliche Benutzern, ihre E-Mail, Telefonnummer und Adresse für andere eingeloggte Mitglieder sichtbar zu machen. Aktualisiere die API, um diese Einstellungen zu respektieren und bei der Profildatenrückgabe zu berücksichtigen.
Some checks failed
Code Analysis (JS/Vue) / analyze (push) Failing after 47s
Some checks failed
Code Analysis (JS/Vue) / analyze (push) Failing after 47s
This commit is contained in:
@@ -149,11 +149,39 @@ export default defineEventHandler(async (event) => {
|
||||
// Sort by name
|
||||
mergedMembers.sort((a, b) => a.name.localeCompare(b.name))
|
||||
// Die Mitgliederliste ist nur für authentifizierte Nutzer sichtbar (siehe oben).
|
||||
// Entsprechend zeigen wir allen eingeloggten Nutzer*innen die vollständigen Kontaktdaten
|
||||
// (inkl. Telefon und E-Mail) für alle aktiven Mitglieder.
|
||||
// Respektiere individuelle Sichtbarkeitspräferenzen (user.visibility)
|
||||
const currentUserToken = token
|
||||
const isViewerAuthenticated = !!currentUser
|
||||
|
||||
const sanitizedMembers = mergedMembers.map(member => {
|
||||
// Default: show email/phone/address to other logged-in members unless member.visibility explicitly hides them
|
||||
const visibility = member.visibility || {}
|
||||
|
||||
const showEmail = visibility.showEmail === undefined ? true : Boolean(visibility.showEmail)
|
||||
const showPhone = visibility.showPhone === undefined ? true : Boolean(visibility.showPhone)
|
||||
const showAddress = visibility.showAddress === undefined ? false : Boolean(visibility.showAddress)
|
||||
|
||||
return {
|
||||
id: member.id,
|
||||
name: member.name,
|
||||
source: member.source,
|
||||
editable: member.editable,
|
||||
hasLogin: member.hasLogin,
|
||||
loginRoles: member.loginRoles,
|
||||
loginRole: member.loginRole,
|
||||
lastLogin: member.lastLogin,
|
||||
isMannschaftsspieler: member.isMannschaftsspieler,
|
||||
notes: member.notes || '',
|
||||
// Only include contact fields when viewer is authenticated and the member allows it
|
||||
email: (isViewerAuthenticated && showEmail) ? member.email : undefined,
|
||||
phone: (isViewerAuthenticated && showPhone) ? member.phone : undefined,
|
||||
address: (isViewerAuthenticated && showAddress) ? member.address : undefined
|
||||
}
|
||||
})
|
||||
|
||||
return {
|
||||
success: true,
|
||||
members: mergedMembers
|
||||
members: sanitizedMembers
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Fehler beim Abrufen der Mitgliederliste:', error)
|
||||
|
||||
@@ -1,51 +1,36 @@
|
||||
import { verifyToken, getUserById, migrateUserRoles } from '../utils/auth.js'
|
||||
import { verifyToken, getUserFromToken } from '../utils/auth.js'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
try {
|
||||
const token = getCookie(event, 'auth_token')
|
||||
|
||||
if (!token) {
|
||||
throw createError({
|
||||
statusCode: 401,
|
||||
message: 'Nicht authentifiziert.'
|
||||
})
|
||||
throw createError({ statusCode: 401, message: 'Nicht authentifiziert.' })
|
||||
}
|
||||
|
||||
const decoded = verifyToken(token)
|
||||
|
||||
if (!decoded) {
|
||||
throw createError({
|
||||
statusCode: 401,
|
||||
message: 'Ungültiges Token.'
|
||||
})
|
||||
throw createError({ statusCode: 401, message: 'Ungültiges Token.' })
|
||||
}
|
||||
|
||||
const user = await getUserById(decoded.id)
|
||||
|
||||
if (!user || user.active === false) {
|
||||
throw createError({
|
||||
statusCode: 403,
|
||||
message: 'Benutzer nicht gefunden oder inaktiv.'
|
||||
})
|
||||
const user = await getUserFromToken(token)
|
||||
if (!user) {
|
||||
throw createError({ statusCode: 404, message: 'Benutzer nicht gefunden.' })
|
||||
}
|
||||
|
||||
const migratedUser = migrateUserRoles({ ...user })
|
||||
const roles = Array.isArray(migratedUser.roles) ? migratedUser.roles : (migratedUser.role ? [migratedUser.role] : ['mitglied'])
|
||||
|
||||
// Return user data (without password)
|
||||
// Rückgabe des eigenen Profils inkl. Sichtbarkeitspräferenzen
|
||||
return {
|
||||
success: true,
|
||||
user: {
|
||||
id: user.id,
|
||||
email: user.email,
|
||||
name: user.name,
|
||||
email: user.email,
|
||||
phone: user.phone || '',
|
||||
roles: roles,
|
||||
role: roles[0] || 'mitglied' // Rückwärtskompatibilität
|
||||
visibility: user.visibility || {}
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Profil-Abruf-Fehler:', error)
|
||||
console.error('Fehler beim Laden des Profil:', error)
|
||||
throw error
|
||||
}
|
||||
})
|
||||
|
||||
@@ -31,7 +31,7 @@ export default defineEventHandler(async (event) => {
|
||||
})
|
||||
}
|
||||
|
||||
const users = await readUsers()
|
||||
const users = await readUsers()
|
||||
const userIndex = users.findIndex(u => u.id === decoded.id)
|
||||
|
||||
if (userIndex === -1) {
|
||||
@@ -59,6 +59,16 @@ export default defineEventHandler(async (event) => {
|
||||
user.email = email
|
||||
user.phone = phone || ''
|
||||
|
||||
// Optional visibility preferences (what to show to other logged-in members)
|
||||
// Expected shape: { showEmail: boolean, showPhone: boolean, showAddress: boolean }
|
||||
const visibility = body.visibility || body.visibilityPreferences || null
|
||||
if (visibility && typeof visibility === 'object') {
|
||||
user.visibility = user.visibility || {}
|
||||
if (typeof visibility.showEmail === 'boolean') user.visibility.showEmail = visibility.showEmail
|
||||
if (typeof visibility.showPhone === 'boolean') user.visibility.showPhone = visibility.showPhone
|
||||
if (typeof visibility.showAddress === 'boolean') user.visibility.showAddress = visibility.showAddress
|
||||
}
|
||||
|
||||
// Handle password change
|
||||
if (currentPassword && newPassword) {
|
||||
const isValid = await verifyPassword(currentPassword, user.password)
|
||||
@@ -93,6 +103,7 @@ export default defineEventHandler(async (event) => {
|
||||
email: user.email,
|
||||
name: user.name,
|
||||
phone: user.phone,
|
||||
visibility: user.visibility || {},
|
||||
roles: roles,
|
||||
role: roles[0] || 'mitglied' // Rückwärtskompatibilität
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user