Merge pull request #4672 from Doha2012/master

upgrade to spring boot 2

spring-security-sso/pom.xml

@@ -9,10 +9,10 @@
     <packaging>pom</packaging>
 
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-1</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <modules>
@@ -22,7 +22,9 @@
     </modules>
 
     <properties>
-        <rest-assured.version>3.0.1</rest-assured.version>
+        <rest-assured.version>3.1.0</rest-assured.version>
+        <oauth.version>2.3.3.RELEASE</oauth.version>        
+        <oauth-auto.version>2.0.1.RELEASE</oauth-auto.version>        
     </properties>  
         
 </project>

spring-security-sso/spring-security-sso-auth-server/pom.xml

@@ -21,6 +21,7 @@
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth2</artifactId>
+            <version>${oauth.version}</version>
         </dependency>
 
     </dependencies>

spring-security-sso/spring-security-sso-auth-server/src/main/java/org/baeldung/config/AuthServerConfig.java

@@ -2,18 +2,19 @@ package org.baeldung.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
-import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
 
+
 @Configuration
 @EnableAuthorizationServer
 public class AuthServerConfig extends AuthorizationServerConfigurerAdapter {
+    
     @Autowired    
-    private AuthenticationManager authenticationManager;
+    private BCryptPasswordEncoder passwordEncoder;
     
     @Override
     public void configure(final AuthorizationServerSecurityConfigurer oauthServer) throws Exception {
@@ -25,17 +26,14 @@ public class AuthServerConfig extends AuthorizationServerConfigurerAdapter {
     public void configure(final ClientDetailsServiceConfigurer clients) throws Exception {
         clients.inMemory()
             .withClient("SampleClientId")
-            .secret("secret")
+            .secret(passwordEncoder.encode("secret"))
             .authorizedGrantTypes("authorization_code")
             .scopes("user_info")
             .autoApprove(true)
+            .redirectUris("http://localhost:8082/ui/login","http://localhost:8083/ui2/login")
         // .accessTokenValiditySeconds(3600)
         ; // 1 hour
     }
 
-    @Override
-    public void configure(final AuthorizationServerEndpointsConfigurer endpoints) throws Exception {
-        endpoints.authenticationManager(authenticationManager);
-    }
 
 }

spring-security-sso/spring-security-sso-auth-server/src/main/java/org/baeldung/config/AuthorizationServerApplication.java

@@ -2,7 +2,7 @@ package org.baeldung.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
 
 @SpringBootApplication

spring-security-sso/spring-security-sso-auth-server/src/main/java/org/baeldung/config/SecurityConfig.java

@@ -1,18 +1,17 @@
 package org.baeldung.config;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 @Configuration
+@Order(1)
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
     
-    @Autowired
-    private AuthenticationManager authenticationManager;
-
     @Override
     protected void configure(HttpSecurity http) throws Exception { // @formatter:off
         http.requestMatchers()
@@ -28,11 +27,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off
-        auth.parentAuthenticationManager(authenticationManager)
+        auth.inMemoryAuthentication()
-            .inMemoryAuthentication()
             .withUser("john")
-            .password("123")
+            .password(passwordEncoder().encode("123"))
             .roles("USER");
     } // @formatter:on
 
+    @Bean
+    public BCryptPasswordEncoder passwordEncoder(){
+        return new BCryptPasswordEncoder();
+    }
 }

spring-security-sso/spring-security-sso-auth-server/src/main/resources/application.properties

@@ -1,4 +1,3 @@
 server.port=8081
-server.context-path=/auth
+server.servlet.context-path=/auth
-security.basic.enabled=false
 #logging.level.org.springframework=DEBUG

spring-security-sso/spring-security-sso-ui-2/pom.xml

@@ -25,8 +25,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.security.oauth</groupId>
+            <groupId>org.springframework.security.oauth.boot</groupId>
-            <artifactId>spring-security-oauth2</artifactId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+            <version>${oauth-auto.version}</version>
         </dependency>
 
         <dependency>

spring-security-sso/spring-security-sso-ui-2/src/main/java/org/baeldung/config/UiApplication.java

@@ -2,7 +2,7 @@ package org.baeldung.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.context.request.RequestContextListener;
 

spring-security-sso/spring-security-sso-ui-2/src/main/java/org/baeldung/config/UiSecurityConfig.java

@@ -5,6 +5,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
+
 @EnableOAuth2Sso
 @Configuration
 public class UiSecurityConfig extends WebSecurityConfigurerAdapter {

spring-security-sso/spring-security-sso-ui-2/src/main/resources/application.yml

@@ -1,6 +1,7 @@
 server:
     port: 8083
-    context-path: /ui2
+    servlet:
+      context-path: /ui2
     session:
       cookie:
         name: UI2SESSION

spring-security-sso/spring-security-sso-ui/pom.xml

@@ -25,10 +25,12 @@
         </dependency>
         
         <dependency>
-            <groupId>org.springframework.security.oauth</groupId>
+            <groupId>org.springframework.security.oauth.boot</groupId>
-            <artifactId>spring-security-oauth2</artifactId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+            <version>${oauth-auto.version}</version>
         </dependency>
         
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>

spring-security-sso/spring-security-sso-ui/src/main/java/org/baeldung/config/UiApplication.java

@@ -2,7 +2,7 @@ package org.baeldung.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.context.request.RequestContextListener;
 

spring-security-sso/spring-security-sso-ui/src/main/java/org/baeldung/config/UiSecurityConfig.java

@@ -5,6 +5,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
+
 @EnableOAuth2Sso
 @Configuration
 public class UiSecurityConfig extends WebSecurityConfigurerAdapter {

spring-security-sso/spring-security-sso-ui/src/main/resources/application.yml

@@ -1,6 +1,7 @@
 server:
     port: 8082
-    context-path: /ui
+    servlet:
+      context-path: /ui
     session:
       cookie:
         name: UISESSION