From 4a229ecfe577e97edf56674e9c5717b797a1feaa Mon Sep 17 00:00:00 2001
From: timis1 <12120641+timis1@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:56:43 +0200
Subject: [PATCH] JAVA-29288 Upgrade spring-security-cognito (#15839)

Co-authored-by: timis1 <noreplay@yahoo.com>
---
 .../spring-security-cognito/pom.xml                  |  5 +++--
 .../com/baeldung/cognito/SecurityConfiguration.java  | 12 +++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/spring-security-modules/spring-security-cognito/pom.xml b/spring-security-modules/spring-security-cognito/pom.xml
index 2e359382a7..130c482c82 100644
--- a/spring-security-modules/spring-security-cognito/pom.xml
+++ b/spring-security-modules/spring-security-cognito/pom.xml
@@ -11,7 +11,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>spring-security-modules</artifactId>
+        <artifactId>parent-boot-3</artifactId>
+        <relativePath>../../parent-boot-3</relativePath>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
@@ -30,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+            <artifactId>thymeleaf-extras-springsecurity6</artifactId>
         </dependency>
         <!-- oauth2 -->
         <dependency>
diff --git a/spring-security-modules/spring-security-cognito/src/main/java/com/baeldung/cognito/SecurityConfiguration.java b/spring-security-modules/spring-security-cognito/src/main/java/com/baeldung/cognito/SecurityConfiguration.java
index 62cdd7c73c..7385aef78b 100644
--- a/spring-security-modules/spring-security-cognito/src/main/java/com/baeldung/cognito/SecurityConfiguration.java
+++ b/spring-security-modules/spring-security-cognito/src/main/java/com/baeldung/cognito/SecurityConfiguration.java
@@ -2,6 +2,7 @@ package com.baeldung.cognito;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.web.SecurityFilterChain;
 
@@ -10,16 +11,13 @@ public class SecurityConfiguration {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.csrf()
-            .and()
-            .authorizeRequests(authz -> authz.mvcMatchers("/")
+        http.csrf(Customizer.withDefaults())
+            .authorizeHttpRequests(authz -> authz.requestMatchers("/")
                 .permitAll()
                 .anyRequest()
                 .authenticated())
-            .oauth2Login()
-            .and()
-            .logout()
-            .logoutSuccessUrl("/");
+            .oauth2Login(Customizer.withDefaults())
+            .logout(httpSecurityLogoutConfigurer -> httpSecurityLogoutConfigurer.logoutSuccessUrl("/"));
         return http.build();
     }
 }
\ No newline at end of file