From ed028d5168b58910294cc2e87a7413959d4c717a Mon Sep 17 00:00:00 2001 From: Ismail Ali Date: Thu, 17 Apr 2025 19:02:27 +0200 Subject: [PATCH] fix: Admin-Login setzt jetzt korrekt isAdminLoggedIn im Redux-Store MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Redux-Dispatch `setAdminLoggedIn(true)` in handleAdminLogin integriert - Login-Funktion in GeneralSettings.tsx angepasst, um Dispatch weiterzugeben - Sichtbarkeit von Admin-Funktionen wie Firmware-Update-Button funktioniert jetzt zuverlässig --- .../main/settingsPageComponents/GeneralSettings.tsx | 4 +++- .../settingsPageComponents/handlers/handleAdminLogin.ts | 8 +++++++- config/webVersion.ts | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/components/main/settingsPageComponents/GeneralSettings.tsx b/components/main/settingsPageComponents/GeneralSettings.tsx index f1c8746..ed80409 100644 --- a/components/main/settingsPageComponents/GeneralSettings.tsx +++ b/components/main/settingsPageComponents/GeneralSettings.tsx @@ -51,9 +51,11 @@ const GeneralSettings: React.FC = () => { (errorMsg) => { setLoginSuccess(false); setError(errorMsg); - } + }, + dispatch // ✅ hier übergeben ); }; + //------------------------------- useEffect(() => { if (!systemSettings.deviceName) { diff --git a/components/main/settingsPageComponents/handlers/handleAdminLogin.ts b/components/main/settingsPageComponents/handlers/handleAdminLogin.ts index 1b1e983..64a6e5e 100644 --- a/components/main/settingsPageComponents/handlers/handleAdminLogin.ts +++ b/components/main/settingsPageComponents/handlers/handleAdminLogin.ts @@ -2,12 +2,14 @@ import bcrypt from "bcryptjs"; import { generateToken } from "../utils/cryptoUtils"; import USERS from "../config/users"; +import { setAdminLoggedIn } from "../../../../redux/slices/authSlice"; // ✅ Wichtig const handleAdminLogin = ( username: string, password: string, onSuccess: () => void, - onError: (errorMsg: string) => void + onError: (errorMsg: string) => void, + dispatch: any // ✅ neu ) => { const user = USERS.Admin; bcrypt.compare(password, user.password, (err, isMatch) => { @@ -15,8 +17,12 @@ const handleAdminLogin = ( const token = generateToken(user); sessionStorage.setItem("token", token); localStorage.setItem("isAdminLoggedIn", "true"); + + dispatch(setAdminLoggedIn(true)); // ✅ Redux-Status setzen + onSuccess(); } else { + dispatch(setAdminLoggedIn(false)); // optional onError( "Login fehlgeschlagen. Bitte überprüfen Sie Benutzername und Passwort." ); diff --git a/config/webVersion.ts b/config/webVersion.ts index 5f754cf..5a84373 100644 --- a/config/webVersion.ts +++ b/config/webVersion.ts @@ -6,5 +6,5 @@ 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen). */ -const webVersion = "1.6.239"; +const webVersion = "1.6.240"; export default webVersion;