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:
@@ -77,6 +77,25 @@
|
|||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Sichtbarkeits-Einstellungen -->
|
||||||
|
<div class="mt-4 border-t border-gray-100 pt-4">
|
||||||
|
<h3 class="text-sm font-medium text-gray-900 mb-2">Sichtbarkeit für andere Mitglieder</h3>
|
||||||
|
<div class="flex flex-col gap-2 text-sm text-gray-700">
|
||||||
|
<label class="inline-flex items-center">
|
||||||
|
<input type="checkbox" class="mr-2" v-model="visibility.showEmail" :disabled="isSaving" />
|
||||||
|
E-Mail für alle eingeloggten Mitglieder sichtbar
|
||||||
|
</label>
|
||||||
|
<label class="inline-flex items-center">
|
||||||
|
<input type="checkbox" class="mr-2" v-model="visibility.showPhone" :disabled="isSaving" />
|
||||||
|
Telefonnummer für alle eingeloggten Mitglieder sichtbar
|
||||||
|
</label>
|
||||||
|
<label class="inline-flex items-center">
|
||||||
|
<input type="checkbox" class="mr-2" v-model="visibility.showAddress" :disabled="isSaving" />
|
||||||
|
Adresse für alle eingeloggten Mitglieder sichtbar
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Passwort ändern -->
|
<!-- Passwort ändern -->
|
||||||
<div class="border-t border-gray-200 pt-6 mt-6">
|
<div class="border-t border-gray-200 pt-6 mt-6">
|
||||||
<h3 class="text-lg font-semibold text-gray-900 mb-4">
|
<h3 class="text-lg font-semibold text-gray-900 mb-4">
|
||||||
@@ -279,6 +298,13 @@ const formData = ref({
|
|||||||
phone: ''
|
phone: ''
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Visibility preferences for other logged-in members
|
||||||
|
const visibility = ref({
|
||||||
|
showEmail: true,
|
||||||
|
showPhone: true,
|
||||||
|
showAddress: false
|
||||||
|
})
|
||||||
|
|
||||||
const passwordData = ref({
|
const passwordData = ref({
|
||||||
current: '',
|
current: '',
|
||||||
new: '',
|
new: '',
|
||||||
@@ -297,6 +323,7 @@ const loadProfile = async () => {
|
|||||||
email: response.user.email,
|
email: response.user.email,
|
||||||
phone: response.user.phone || ''
|
phone: response.user.phone || ''
|
||||||
}
|
}
|
||||||
|
visibility.value = response.user.visibility || visibility.value
|
||||||
} catch {
|
} catch {
|
||||||
errorMessage.value = 'Fehler beim Laden des Profils.'
|
errorMessage.value = 'Fehler beim Laden des Profils.'
|
||||||
} finally {
|
} finally {
|
||||||
@@ -398,6 +425,7 @@ const handleSave = async () => {
|
|||||||
name: formData.value.name,
|
name: formData.value.name,
|
||||||
email: formData.value.email,
|
email: formData.value.email,
|
||||||
phone: formData.value.phone,
|
phone: formData.value.phone,
|
||||||
|
visibility: visibility.value,
|
||||||
currentPassword: passwordData.value.current || undefined,
|
currentPassword: passwordData.value.current || undefined,
|
||||||
newPassword: passwordData.value.new || undefined
|
newPassword: passwordData.value.new || undefined
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -149,11 +149,39 @@ export default defineEventHandler(async (event) => {
|
|||||||
// Sort by name
|
// Sort by name
|
||||||
mergedMembers.sort((a, b) => a.name.localeCompare(b.name))
|
mergedMembers.sort((a, b) => a.name.localeCompare(b.name))
|
||||||
// Die Mitgliederliste ist nur für authentifizierte Nutzer sichtbar (siehe oben).
|
// Die Mitgliederliste ist nur für authentifizierte Nutzer sichtbar (siehe oben).
|
||||||
// Entsprechend zeigen wir allen eingeloggten Nutzer*innen die vollständigen Kontaktdaten
|
// Respektiere individuelle Sichtbarkeitspräferenzen (user.visibility)
|
||||||
// (inkl. Telefon und E-Mail) für alle aktiven Mitglieder.
|
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 {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
members: mergedMembers
|
members: sanitizedMembers
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Fehler beim Abrufen der Mitgliederliste:', 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) => {
|
export default defineEventHandler(async (event) => {
|
||||||
try {
|
try {
|
||||||
const token = getCookie(event, 'auth_token')
|
const token = getCookie(event, 'auth_token')
|
||||||
|
|
||||||
if (!token) {
|
if (!token) {
|
||||||
throw createError({
|
throw createError({ statusCode: 401, message: 'Nicht authentifiziert.' })
|
||||||
statusCode: 401,
|
|
||||||
message: 'Nicht authentifiziert.'
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const decoded = verifyToken(token)
|
const decoded = verifyToken(token)
|
||||||
|
|
||||||
if (!decoded) {
|
if (!decoded) {
|
||||||
throw createError({
|
throw createError({ statusCode: 401, message: 'Ungültiges Token.' })
|
||||||
statusCode: 401,
|
|
||||||
message: 'Ungültiges Token.'
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const user = await getUserById(decoded.id)
|
const user = await getUserFromToken(token)
|
||||||
|
if (!user) {
|
||||||
if (!user || user.active === false) {
|
throw createError({ statusCode: 404, message: 'Benutzer nicht gefunden.' })
|
||||||
throw createError({
|
|
||||||
statusCode: 403,
|
|
||||||
message: 'Benutzer nicht gefunden oder inaktiv.'
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const migratedUser = migrateUserRoles({ ...user })
|
// Rückgabe des eigenen Profils inkl. Sichtbarkeitspräferenzen
|
||||||
const roles = Array.isArray(migratedUser.roles) ? migratedUser.roles : (migratedUser.role ? [migratedUser.role] : ['mitglied'])
|
|
||||||
|
|
||||||
// Return user data (without password)
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
user: {
|
user: {
|
||||||
id: user.id,
|
id: user.id,
|
||||||
email: user.email,
|
|
||||||
name: user.name,
|
name: user.name,
|
||||||
|
email: user.email,
|
||||||
phone: user.phone || '',
|
phone: user.phone || '',
|
||||||
roles: roles,
|
visibility: user.visibility || {}
|
||||||
role: roles[0] || 'mitglied' // Rückwärtskompatibilität
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Profil-Abruf-Fehler:', error)
|
console.error('Fehler beim Laden des Profil:', error)
|
||||||
throw 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)
|
const userIndex = users.findIndex(u => u.id === decoded.id)
|
||||||
|
|
||||||
if (userIndex === -1) {
|
if (userIndex === -1) {
|
||||||
@@ -59,6 +59,16 @@ export default defineEventHandler(async (event) => {
|
|||||||
user.email = email
|
user.email = email
|
||||||
user.phone = phone || ''
|
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
|
// Handle password change
|
||||||
if (currentPassword && newPassword) {
|
if (currentPassword && newPassword) {
|
||||||
const isValid = await verifyPassword(currentPassword, user.password)
|
const isValid = await verifyPassword(currentPassword, user.password)
|
||||||
@@ -93,6 +103,7 @@ export default defineEventHandler(async (event) => {
|
|||||||
email: user.email,
|
email: user.email,
|
||||||
name: user.name,
|
name: user.name,
|
||||||
phone: user.phone,
|
phone: user.phone,
|
||||||
|
visibility: user.visibility || {},
|
||||||
roles: roles,
|
roles: roles,
|
||||||
role: roles[0] || 'mitglied' // Rückwärtskompatibilität
|
role: roles[0] || 'mitglied' // Rückwärtskompatibilität
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user