diff --git a/src/main/java/org/cmh/backend/Config/SecurityConfig.java b/src/main/java/org/cmh/backend/Config/SecurityConfig.java index 78f169e..c5a4336 100644 --- a/src/main/java/org/cmh/backend/Config/SecurityConfig.java +++ b/src/main/java/org/cmh/backend/Config/SecurityConfig.java @@ -13,24 +13,16 @@ public class SecurityConfig { @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { - // Use the new API to disable CSRF + // Disable CSRF http.csrf(AbstractHttpConfigurer::disable) - // Permit all requests to specific endpoints + // Permit all requests to all endpoints .authorizeHttpRequests(authorize -> authorize - .requestMatchers("/users/register", "/users/login","/meetings/getMeetingById","/meetings/updateMeeting","/meetings/deleteMeeting","/meetings/addMeeting","/meetings/listAll","/meetings/export","/meetings/searchMeetings").permitAll() // Allow these endpoints without authentication - .anyRequest().authenticated() // All other endpoints require authentication + .anyRequest().permitAll() // Allow all requests without authentication ) - // Configure form login - .formLogin(form -> form - .loginPage("/login") // Custom login page (you need to create this endpoint) - .permitAll() - ) - // Configure logout - .logout(logout -> logout - .logoutUrl("/logout") - .logoutSuccessUrl("/login?logout") - .permitAll() - ); + // Disable form login + .formLogin(AbstractHttpConfigurer::disable) + // Disable logout + .logout(AbstractHttpConfigurer::disable); return http.build(); } diff --git a/src/main/java/org/cmh/backend/MeetingManagement/controller/MeetingController.java b/src/main/java/org/cmh/backend/MeetingManagement/controller/MeetingController.java index 568937d..9da414a 100644 --- a/src/main/java/org/cmh/backend/MeetingManagement/controller/MeetingController.java +++ b/src/main/java/org/cmh/backend/MeetingManagement/controller/MeetingController.java @@ -152,10 +152,11 @@ public class MeetingController { public ResponseEntity> searchMeetings(@RequestBody Map params) { String name = params.get("name"); String organizer = params.get("organizer"); - String startTimeStr = params.get("startTime"); - LocalDateTime startTime = startTimeStr != null ? LocalDateTime.parse(startTimeStr) : null; + OffsetDateTime startTimeStr = OffsetDateTime.parse(params.get("startTime"),formatter); + LocalDateTime startTime1 = (startTimeStr.toLocalDateTime()); + //LocalDateTime startTime = startTimeStr != null ? LocalDateTime.parse(startTimeStr) : null; - List meetings = meetingService.searchMeetings(name, organizer, startTime); + List meetings = meetingService.searchMeetings(name, organizer, startTime1); return new ResponseEntity<>(meetings, HttpStatus.OK); }