Merge pull request 'dev' (#43) from dev into main

Reviewed-on: #43

android-app/app/src/main/java/de/harheimertc/ui/navigation/NavGraph.kt

@@ -2,7 +2,9 @@ package de.harheimertc.ui.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Button
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.foundation.layout.BoxWithConstraints
@@ -10,6 +12,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
@@ -327,44 +330,139 @@ fun NavGraph(
                     )
                 }
                 composable(Destinations.CmsStartseite.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessFullCms,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsStartseiteScreen(navController, !persistentNavigation)
                     }
+                }
                 composable(Destinations.CmsInhalte.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessFullCms,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsInhalteScreen(navController, !persistentNavigation)
                     }
+                }
                 composable(Destinations.CmsVereinsmeisterschaften.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessFullCms,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsVereinsmeisterschaftenScreen(navController, !persistentNavigation)
                     }
+                }
                 composable(Destinations.CmsNews.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessFullCms,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsNewsScreen(navController, !persistentNavigation)
                     }
+                }
                 composable(Destinations.CmsSportbetrieb.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessFullCms,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsSportbetriebScreen(navController, !persistentNavigation)
                     }
+                }
                 composable(Destinations.CmsMitgliederverwaltung.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessFullCms,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsMitgliederverwaltungScreen(navController, !persistentNavigation)
                     }
+                }
                 composable(Destinations.CmsNewsletter.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessNewsletter,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsNewsletterScreen(navController, !persistentNavigation)
                     }
+                }
                 composable(Destinations.CmsContactRequests.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessContactRequests,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsContactRequestsScreen(navController, !persistentNavigation)
                     }
+                }
                 composable(Destinations.CmsEinstellungen.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessFullCms,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsEinstellungenScreen(navController, !persistentNavigation)
                     }
+                }
                 composable(Destinations.CmsBenutzer.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessFullCms,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsBenutzerScreen(navController, !persistentNavigation)
                     }
+                }
                 composable(Destinations.CmsPasswordResetDiagnostics.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessFullCms,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsPasswordResetDiagnosticsScreen(navController, !persistentNavigation)
                     }
+                }
                 composable(Destinations.Cms.route) {
+                    RequireCmsAccess(
+                        allowed = navigationState.canAccessCms,
+                        navController = navController,
+                    ) {
                         de.harheimertc.ui.screens.cms.CmsDashboardScreen(navController, !persistentNavigation)
                     }
                 }
             }
         }
+    }
+}
+
+@Composable
+private fun RequireCmsAccess(
+    allowed: Boolean,
+    navController: NavHostController,
+    content: @Composable () -> Unit,
+) {
+    if (allowed) {
+        content()
+        return
+    }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(24.dp),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Text(
+            text = "Kein Zugriff auf diesen Bereich.",
+            style = MaterialTheme.typography.headlineSmall,
+            color = Color(0xFF7F1D1D),
+        )
+        Text(
+            text = "Bitte mit einem berechtigten Konto anmelden.",
+            style = MaterialTheme.typography.bodyMedium,
+            color = Color(0xFF7C2D12),
+            modifier = Modifier.padding(top = 8.dp, bottom = 16.dp),
+        )
+        Button(onClick = { navController.navigateTopLevel(Destinations.Login.route) }) {
+            Text("Zum Login")
+        }
+    }
 }
 
 private fun NavHostController.navigateTopLevel(route: String) {

android-app/app/src/main/java/de/harheimertc/ui/screens/cms/CmsNewsScreens.kt

@@ -132,15 +132,22 @@ fun CmsNewsScreen(navController: NavController, showBackNavigation: Boolean, vie
 
         items(state.news) { news ->
             val selected = news.id?.let { selection.contains(it) } ?: false
-            NewsListItem(news = news, selected = selected, onSelect = { id, sel ->
+            NewsListItem(
+                news = news,
+                canWrite = canWrite,
+                selected = selected,
+                onSelect = { id, sel ->
                     id?.let {
                         selection = if (sel) selection + it else selection - it
                     }
-            }, onEdit = { openEdit(news) }, onDelete = { news.id?.let { id -> deletingIds = listOf(id) } })
+                },
+                onEdit = { openEdit(news) },
+                onDelete = { news.id?.let { id -> deletingIds = listOf(id) } },
+            )
         }
 
         // bulk action bar
-        if (selection.isNotEmpty()) {
+        if (canWrite && selection.isNotEmpty()) {
             item {
                 Row(modifier = Modifier.fillMaxWidth().padding(8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                     Button(onClick = { viewModel.bulkSetPublic(selection.toList(), true) }) { Text("Als öffentlich markieren") }
@@ -255,6 +262,7 @@ fun CmsNewsScreen(navController: NavController, showBackNavigation: Boolean, vie
 @Composable
 private fun NewsListItem(
     news: NewsDto,
+    canWrite: Boolean,
     selected: Boolean = false,
     onSelect: (String?, Boolean) -> Unit = { _, _ -> },
     onEdit: (NewsDto) -> Unit,
@@ -264,7 +272,11 @@ private fun NewsListItem(
         Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
             Column(modifier = Modifier.weight(1f)) {
                 Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically) {
-                    Checkbox(checked = selected, onCheckedChange = { onSelect(news.id, it) })
+                    Checkbox(
+                        checked = selected,
+                        onCheckedChange = { onSelect(news.id, it) },
+                        enabled = canWrite,
+                    )
                     Text(news.title.ifBlank { "(Ohne Titel)" }, modifier = Modifier.padding(start = 8.dp))
                     if (news.isPublic) {
                         Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically, modifier = Modifier.padding(start = 8.dp)) {
@@ -297,10 +309,12 @@ private fun NewsListItem(
                     Text("Aktualisiert: ${news.updated}")
                 }
             }
+            if (canWrite) {
                 Row {
                     TextButton(onClick = { onEdit(news) }) { Text("Bearbeiten") }
                     TextButton(onClick = { news.id?.let { onDelete(it) } }) { Text("Löschen") }
                 }
             }
         }
+    }
 }

android-app/app/src/main/java/de/harheimertc/ui/screens/cms/CmsScreens.kt

@@ -872,7 +872,9 @@ fun CmsNewsletterScreen(
         if (!state.loading && state.newsletters.isEmpty()) item { EmptyCard("Keine Newsletter gefunden.") }
         items(state.newsletters.size) { index ->
             val item = state.newsletters[index]
-            NewsletterCard(item,
+            NewsletterCard(
+                item,
+                canWrite = canWrite,
                 onEdit = { nl ->
                     editingNewsletter = nl
                         nlTitle = nl.title
@@ -890,7 +892,9 @@ fun CmsNewsletterScreen(
         if (!state.loading && state.newsletterGroups.isEmpty()) item { EmptyCard("Keine Gruppen gefunden.") }
         items(state.newsletterGroups.size) { index ->
             val group = state.newsletterGroups[index]
-            NewsletterGroupCard(group,
+            NewsletterGroupCard(
+                group,
+                canWrite = canWrite,
                 onEdit = { g ->
                     editingGroup = g
                     grpName = g.name
@@ -1564,11 +1568,18 @@ private fun ContactRequestCard(request: ContactRequestDto, viewModel: CmsViewMod
 }
 
 @Composable
-private fun NewsletterCard(newsletter: NewsletterDto, onEdit: (NewsletterDto) -> Unit = {}, onDelete: (String) -> Unit = {}, onSend: (String) -> Unit = {}) {
+private fun NewsletterCard(
+    newsletter: NewsletterDto,
+    canWrite: Boolean,
+    onEdit: (NewsletterDto) -> Unit = {},
+    onDelete: (String) -> Unit = {},
+    onSend: (String) -> Unit = {},
+) {
     DataCard(newsletter.subject.ifBlank { newsletter.title.ifBlank { newsletter.id } }) {
         InfoRow("Status", newsletter.status ?: if (newsletter.sentAt != null) "versendet" else "Entwurf")
         InfoRow("Erstellt", newsletter.createdAt ?: "-")
         InfoRow("Versendet", newsletter.sentAt ?: "-")
+        if (canWrite) {
             Row {
                 TextButton(onClick = { onEdit(newsletter) }) { Text("Bearbeiten") }
                 TextButton(onClick = { newsletter.id.takeIf { it.isNotBlank() }?.let { onDelete(it) } }) { Text("Löschen") }
@@ -1577,18 +1588,26 @@ private fun NewsletterCard(newsletter: NewsletterDto, onEdit: (NewsletterDto) ->
                 }
             }
         }
+    }
 }
 
 @Composable
-private fun NewsletterGroupCard(group: NewsletterGroupDto, onEdit: (NewsletterGroupDto) -> Unit = {}, onDelete: (String) -> Unit = {}) {
+private fun NewsletterGroupCard(
+    group: NewsletterGroupDto,
+    canWrite: Boolean,
+    onEdit: (NewsletterGroupDto) -> Unit = {},
+    onDelete: (String) -> Unit = {},
+) {
     DataCard(group.name.ifBlank { group.id }) {
         InfoRow("Beschreibung", group.description.ifBlank { "-" })
         InfoRow("Abonnenten", group.subscribers.size.toString())
+        if (canWrite) {
             Row {
                 TextButton(onClick = { onEdit(group) }) { Text("Bearbeiten") }
                 TextButton(onClick = { group.id.takeIf { it.isNotBlank() }?.let { onDelete(it) } }) { Text("Löschen") }
             }
         }
+    }
 }
 
 @Composable

android-app/app/src/main/java/de/harheimertc/ui/screens/home/HomeScreen.kt

@@ -117,6 +117,7 @@ fun HomeScreen(
                 )
             }
         }
+        if (navigationState.canAccessFullCms) {
             item {
                 HomeCustomizationSection(
                     sections = state.homepageSections,
@@ -132,6 +133,7 @@ fun HomeScreen(
                     onReset = viewModel::resetSections,
                 )
             }
+        }
         if (state.error) {
             item {
                 Column(

android-app/gradle.properties

@@ -8,8 +8,8 @@ LOCAL_API_BASE_URL=https://harheimertc.tsschulz.de/
 PRODUCTION_API_BASE_URL=https://harheimertc.de/
 
 # Android app versioning for Play Store uploads
-ANDROID_VERSION_CODE=26
-ANDROID_VERSION_NAME=0.9.21
+ANDROID_VERSION_CODE=28
+ANDROID_VERSION_NAME=0.9.23
 
 # Temporary hotfix: disable R8 minification for release to avoid Retrofit generic signature stripping.
 RELEASE_MINIFY_ENABLED=false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "harheimertc-website",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "Moderne Webseite für den Harheimer Tischtennis Club",
   "private": true,
   "type": "module",
@@ -39,7 +39,7 @@
     "dompurify": "^3.3.1",
     "jsonwebtoken": "^9.0.2",
     "multer": "^2.0.2",
-    "nodemailer": "^8.0.5",
+    "nodemailer": "^9.0.1",
     "nuxt": "^4.1.3",
     "pdf-lib": "^1.17.1",
     "pdf-parse": "^2.4.5",

server/api/membership/applications.get.js

@@ -1,15 +1,11 @@
 import fs from 'fs/promises'
 import path from 'path'
+import { requireUserWithAnyRole } from '../../utils/auth.js'
 import { decryptObject } from '../../utils/encryption.js'
 
 export default defineEventHandler(async (event) => {
   try {
-    // Nur Vorstand oder Admin darf Mitgliedschaftsantraege lesen
-    const token = getCookie(event, 'auth_token')
-    const currentUser = token ? await getUserFromToken(token) : null
-    if (!currentUser || !hasAnyRole(currentUser, 'admin', 'vorstand')) {
-      throw createError({ statusCode: 403, statusMessage: 'Zugriff verweigert' })
-    }
+    await requireUserWithAnyRole(event, 'admin', 'vorstand')
 
     const config = useRuntimeConfig()
     const encryptionKey = config.encryptionKey || 'local_development_encryption_key_change_in_production'

server/api/membership/update-status.put.js

@@ -1,10 +1,13 @@
 import fs from 'fs/promises'
 import path from 'path'
+import { requireUserWithAnyRole } from '../../utils/auth.js'
 import { decryptObject } from '../../utils/encryption.js'
 import { saveMember } from '../../utils/members.js'
 
 export default defineEventHandler(async (event) => {
   try {
+    await requireUserWithAnyRole(event, 'admin', 'vorstand')
+
     const { id, status, notes } = await readBody(event)
     
     if (!id || !status) {

server/utils/auth.js

@@ -399,6 +399,42 @@ export async function getUserFromToken(token) {
   return user
 }
 
+export function getTokenFromEvent(event) {
+  return getCookie(event, 'auth_token') || getHeader(event, 'authorization')?.replace(/^Bearer\s+/i, '')
+}
+
+export async function requireAuthenticatedUser(event) {
+  const token = getTokenFromEvent(event)
+  if (!token) {
+    throw createError({
+      statusCode: 401,
+      statusMessage: 'Nicht authentifiziert'
+    })
+  }
+
+  const user = await getUserFromToken(token)
+  if (!user) {
+    throw createError({
+      statusCode: 401,
+      statusMessage: 'Ungültige Sitzung'
+    })
+  }
+
+  return user
+}
+
+export async function requireUserWithAnyRole(event, ...roles) {
+  const user = await requireAuthenticatedUser(event)
+  if (!hasAnyRole(user, ...roles)) {
+    throw createError({
+      statusCode: 403,
+      statusMessage: 'Zugriff verweigert'
+    })
+  }
+
+  return user
+}
+
 // Create session
 export async function createSession(userId, token) {
   const sessions = await readSessions()