admin has to confirm current password as well on self password change

frontend/src/services/authService.ts

@@ -1,5 +1,7 @@
-// frontend/src/services/authService.ts
+// frontend/src/services/authService.ts - UPDATED
 import { Employee } from '../models/Employee';
+import { ErrorService } from './errorService';
+
 const API_BASE_URL = import.meta.env.VITE_API_URL || '/api';
 
 export interface LoginRequest {
@@ -23,6 +25,23 @@ export interface AuthResponse {
 class AuthService {
   private token: string | null = null;
 
+  private async handleApiResponse<T>(response: Response): Promise<T> {
+    if (!response.ok) {
+      const errorData = await response.json().catch(() => ({}));
+      const validationErrors = ErrorService.extractValidationErrors(errorData);
+
+      if (validationErrors.length > 0) {
+        const error = new Error('Validation failed');
+        (error as any).validationErrors = validationErrors;
+        throw error;
+      }
+
+      throw new Error(errorData.error || errorData.message || 'Authentication failed');
+    }
+
+    return response.json();
+  }
+
   async login(credentials: LoginRequest): Promise<AuthResponse> {
     const response = await fetch(`${API_BASE_URL}/auth/login`, {
       method: 'POST',
@@ -30,12 +49,7 @@ class AuthService {
       body: JSON.stringify(credentials)
     });
 
-    if (!response.ok) {
-      const errorData = await response.json();
-      throw new Error(errorData.error || 'Login fehlgeschlagen');
-    }
-
-    const data: AuthResponse = await response.json();
+    const data = await this.handleApiResponse<AuthResponse>(response);
     this.token = data.token;
     localStorage.setItem('token', data.token);
     localStorage.setItem('employee', JSON.stringify(data.employee));
@@ -49,11 +63,7 @@ class AuthService {
       body: JSON.stringify(userData)
     });
 
-    if (!response.ok) {
-      const errorData = await response.json();
-      throw new Error(errorData.error || 'Registrierung fehlgeschlagen');
-    }
-
+    const data = await this.handleApiResponse<AuthResponse>(response);
     return this.login({
       email: userData.email,
       password: userData.password
@@ -95,6 +105,7 @@ class AuthService {
     this.token = null;
     localStorage.removeItem('token');
     localStorage.removeItem('user');
+    localStorage.removeItem('employee');
   }
 
   getToken(): string | null {

frontend/src/services/employeeService.ts

@@ -17,40 +17,40 @@ export class EmployeeService {
     if (!response.ok) {
       const errorData = await response.json().catch(() => ({}));
       const validationErrors = ErrorService.extractValidationErrors(errorData);
-      
+
       if (validationErrors.length > 0) {
         const error = new Error('Validation failed');
         (error as any).validationErrors = validationErrors;
         throw error;
       }
-      
-      throw new Error(errorData.error || `HTTP error! status: ${response.status}`);
+
+      throw new Error(errorData.error || errorData.message || `HTTP error! status: ${response.status}`);
     }
-    
+
     return response.json();
   }
 
   async getEmployees(includeInactive: boolean = false): Promise<Employee[]> {
     console.log('🔄 Fetching employees from API...');
-    
+
     const token = localStorage.getItem('token');
     console.log('🔑 Token exists:', !!token);
-    
+
     const response = await fetch(`${API_BASE_URL}/employees?includeInactive=${includeInactive}`, {
       headers: getAuthHeaders(),
     });
-    
+
     console.log('📡 Response status:', response.status);
-    
+
     if (!response.ok) {
       const errorText = await response.text();
       console.error('❌ API Error:', errorText);
       throw new Error('Failed to fetch employees');
     }
-    
+
     const employees = await response.json();
     console.log('✅ Employees received:', employees.length);
-    
+
     return employees;
   }
 
@@ -58,12 +58,8 @@ export class EmployeeService {
     const response = await fetch(`${API_BASE_URL}/employees/${id}`, {
       headers: getAuthHeaders(),
     });
-    
-    if (!response.ok) {
-      throw new Error('Failed to fetch employee');
-    }
-    
-    return response.json();
+
+    return this.handleApiResponse<Employee>(response);
   }
 
   async createEmployee(employee: CreateEmployeeRequest): Promise<Employee> {
@@ -72,7 +68,7 @@ export class EmployeeService {
       headers: getAuthHeaders(),
       body: JSON.stringify(employee),
     });
-    
+
     return this.handleApiResponse<Employee>(response);
   }
 
@@ -82,7 +78,7 @@ export class EmployeeService {
       headers: getAuthHeaders(),
       body: JSON.stringify(employee),
     });
-    
+
     return this.handleApiResponse<Employee>(response);
   }
 
@@ -91,7 +87,7 @@ export class EmployeeService {
       method: 'DELETE',
       headers: getAuthHeaders(),
     });
-    
+
     if (!response.ok) {
       const error = await response.json();
       throw new Error(error.error || 'Failed to delete employee');
@@ -102,12 +98,8 @@ export class EmployeeService {
     const response = await fetch(`${API_BASE_URL}/employees/${employeeId}/availabilities`, {
       headers: getAuthHeaders(),
     });
-    
-    if (!response.ok) {
-      throw new Error('Failed to fetch availabilities');
-    }
-    
-    return response.json();
+
+    return this.handleApiResponse<EmployeeAvailability[]>(response);
   }
 
   async updateAvailabilities(employeeId: string, data: { planId: string, availabilities: Omit<EmployeeAvailability, 'id' | 'employeeId'>[] }): Promise<EmployeeAvailability[]> {
@@ -117,26 +109,18 @@ export class EmployeeService {
       headers: getAuthHeaders(),
       body: JSON.stringify(data),
     });
-    
-    if (!response.ok) {
-      const error = await response.json();
-      throw new Error(error.error || 'Failed to update availabilities');
-    }
-    
-    return response.json();
+
+    return this.handleApiResponse<EmployeeAvailability[]>(response);
   }
 
-  async changePassword(id: string, data: { currentPassword: string, newPassword: string }): Promise<void> {
+  async changePassword(id: string, data: { currentPassword: string, newPassword: string, confirmPassword: string }): Promise<void> {
     const response = await fetch(`${API_BASE_URL}/employees/${id}/password`, {
       method: 'PUT',
       headers: getAuthHeaders(),
       body: JSON.stringify(data),
     });
-    
-    if (!response.ok) {
-      const error = await response.json();
-      throw new Error(error.error || 'Failed to change password');
-    }
+
+    return this.handleApiResponse<void>(response);
   }
 
   async updateLastLogin(employeeId: string): Promise<void> {