torsten/yourpart3
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Robustere Fehlerbehandlung für Falukant-Account-Check im Menü-Filtering

Browse Source 
- Füge try-catch zu hasFalukantAccount() hinzu um DB-Fehler abzufangen
- Füge try-catch zu filterMenu() hinzu für zusätzliche Sicherheit
- Verhindert Crash wenn Falukant-User-Tabelle nicht verfügbar ist
- Fallback: return false wenn Fehler auftritt
This commit is contained in:
Torsten Schulz (local)
2025-10-20 21:04:20 +02:00
parent c81e61433c
commit 5be3855bcd
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
backend/controllers/navigationController.js
View File

@@ -307,21 +307,27 @@ class NavigationController {
async filterMenu(menu, rights, age, userId) { async filterMenu(menu, rights, age, userId) {
const filteredMenu = {}; const filteredMenu = {};
const hasFalukantAccount = await this.hasFalukantAccount(userId); try {
for (const [key, value] of Object.entries(menu)) { const hasFalukantAccount = await this.hasFalukantAccount(userId);
if (value.visible.includes("all") for (const [key, value] of Object.entries(menu)) {
|| value.visible.some(v => rights.includes(v)) || (value.visible.includes("anyadmin") && rights.length > 0) if (value.visible.includes("all")
|| (value.visible.includes("over14") && age >= 14) || value.visible.some(v => rights.includes(v)) || (value.visible.includes("anyadmin") && rights.length > 0)
|| (value.visible.includes("over12") && age >= 12) || (value.visible.includes("over14") && age >= 14)
|| (value.visible.includes("over18") && age >= 18) || (value.visible.includes("over12") && age >= 12)
|| (value.visible.includes('nofalukantaccount') && !hasFalukantAccount) || (value.visible.includes("over18") && age >= 18)
|| (value.visible.includes('hasfalukantaccount') && hasFalukantAccount)) { || (value.visible.includes('nofalukantaccount') && !hasFalukantAccount)
const { visible, ...itemWithoutVisible } = value; || (value.visible.includes('hasfalukantaccount') && hasFalukantAccount)) {
filteredMenu[key] = { ...itemWithoutVisible }; const { visible, ...itemWithoutVisible } = value;
if (value.children) { filteredMenu[key] = { ...itemWithoutVisible };
filteredMenu[key].children = await this.filterMenu(value.children, rights, age, userId); if (value.children) {
filteredMenu[key].children = await this.filterMenu(value.children, rights, age, userId);
}
} }
} }
} catch (error) {
console.error('Error filtering menu:', error);
// Return empty menu if filtering fails
return {};
} }
return filteredMenu; return filteredMenu;
} }
@@ -363,8 +369,13 @@ class NavigationController {
} }
async hasFalukantAccount(userId) { async hasFalukantAccount(userId) {
const falukantUser = await FalukantUser.findOne({ where: { userId: userId } }); try {
return falukantUser !== null; const falukantUser = await FalukantUser.findOne({ where: { userId: userId } });
return falukantUser !== null;
} catch (error) {
console.error('Error checking falukant account:', error);
return false; // Fallback: assume no falukant account if error occurs
}
} }
} }