updates

walnikster · Dec 1, 2024 · 1cf3a2a · 1cf3a2a
1 parent 59e8447
commit 1cf3a2a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,13 +10,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.5</version>
+        <version>3.4.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>net.bull.javamelody</groupId>
             <artifactId>javamelody-spring-boot-starter</artifactId>
-            <version>2.1.0</version>
+            <version>2.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>

diff --git a/src/main/java/com/nikirocks/CustomLogoutHandler.java b/src/main/java/com/nikirocks/CustomLogoutHandler.java
@@ -28,7 +28,7 @@ protected String determineTargetUrl(HttpServletRequest request, HttpServletRespo
             return UriComponentsBuilder
                     .fromUri(URI.create(logoutUrl))
                     .queryParam("client_id", clientId)
-                    .queryParam("logout_uri", logoutRedirectUrl)
+                    //.queryParam("logout_uri", logoutRedirectUrl)
                     .encode(StandardCharsets.UTF_8)
                     .build()
                     .toUriString();

diff --git a/src/main/java/com/nikirocks/CustomSuccessLoginHandler.java b/src/main/java/com/nikirocks/CustomSuccessLoginHandler.java
@@ -10,7 +10,6 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
-import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;

diff --git a/src/main/java/com/nikirocks/MainController.java b/src/main/java/com/nikirocks/MainController.java
@@ -11,11 +11,15 @@
 @Controller
 public class MainController {
 
-    @Autowired
     private UserDao userDao;
-    @Autowired
     private Menu menu;
 
+    @Autowired
+    public MainController(UserDao userDao, Menu menu) {
+        this.userDao = userDao;
+        this.menu = menu;
+    }
+
     @RequestMapping(value = "/", method = RequestMethod.GET)
     public String index() {
         menu.setHome(true);

diff --git a/src/main/java/com/nikirocks/SecurityConfiguration.java b/src/main/java/com/nikirocks/SecurityConfiguration.java
@@ -21,8 +21,6 @@
 @EnableWebSecurity
 public class SecurityConfiguration {
 
-    @Value("${aws.cognito.logoutUrl}")
-    private String logoutUrl;
 
     @Value("${aws.cognito.logout.success.redirectUrl}")
     private String logoutRedirectUrl;
@@ -41,13 +39,12 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         .requestMatchers("/css/**").permitAll()
                         .requestMatchers("/js/**").permitAll()
                         .requestMatchers("/images/**").permitAll()
-                        .requestMatchers("/monitoring").hasRole("admins")
+                        .requestMatchers("/monitoring").hasRole("user")
                         .requestMatchers("/secured").authenticated()
                         .anyRequest()
                         .authenticated())
                 .oauth2Login((oath2Login) -> oath2Login.successHandler(customSuccessLoginHandler).userInfoEndpoint(userInfoEndpointConfig -> userInfoEndpointConfig.userAuthoritiesMapper(userAuthoritiesMapper())))
-                .logout(x -> x.logoutSuccessHandler(
-                        new CustomLogoutHandler(logoutUrl, logoutRedirectUrl, clientId)));
+                .logout(Customizer.withDefaults());
 
         return http.build();
     }

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -10,7 +10,7 @@ spring:
     resources:
       cache:
         cachecontrol:
-          max-age: 8h
+          max-age: 3h
       chain:
         enabled: true
         strategy:
@@ -24,8 +24,9 @@ spring:
           cognito:
             client-id: ${client-id}
             client-secret: ${client-secret}
-            scope: openid,email,profile
-
+            scope: openid
+            redirect-uri: http://localhost:8080/login/oauth2/code/cognito
+            clientName: springnogito
         provider:
           cognito:
             issuer-uri: ${issuer-url}