BAEL-1915: Upgraded from Boot1 to Boot2
This commit is contained in:
		
							parent
							
								
									3afae4a689
								
							
						
					
					
						commit
						648e66d9e3
					
				| @ -8,10 +8,10 @@ | |||||||
|     <description>Spring Boot Security Auto-Configuration</description> |     <description>Spring Boot Security Auto-Configuration</description> | ||||||
| 
 | 
 | ||||||
|     <parent> |     <parent> | ||||||
|         <artifactId>parent-boot-1</artifactId> |         <artifactId>parent-boot-2</artifactId> | ||||||
|         <groupId>com.baeldung</groupId> |         <groupId>com.baeldung</groupId> | ||||||
|         <version>0.0.1-SNAPSHOT</version> |         <version>0.0.1-SNAPSHOT</version> | ||||||
|         <relativePath>../parent-boot-1</relativePath> |         <relativePath>../parent-boot-2</relativePath> | ||||||
|     </parent> |     </parent> | ||||||
| 
 | 
 | ||||||
|     <dependencies> |     <dependencies> | ||||||
| @ -22,6 +22,12 @@ | |||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>org.springframework.security.oauth</groupId> |             <groupId>org.springframework.security.oauth</groupId> | ||||||
|             <artifactId>spring-security-oauth2</artifactId> |             <artifactId>spring-security-oauth2</artifactId> | ||||||
|  |             <version>2.3.3.RELEASE</version> | ||||||
|  |         </dependency> | ||||||
|  |         <dependency> | ||||||
|  |     	  <groupId>org.springframework.security.oauth.boot</groupId> | ||||||
|  |     	  <artifactId>spring-security-oauth2-autoconfigure</artifactId> | ||||||
|  |     	  <version>2.1.2.RELEASE</version> | ||||||
|         </dependency> |         </dependency> | ||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>org.springframework.boot</groupId> |             <groupId>org.springframework.boot</groupId> | ||||||
|  | |||||||
| @ -2,7 +2,7 @@ package com.baeldung.springbootsecurity.basic_auth; | |||||||
| 
 | 
 | ||||||
| import org.springframework.boot.SpringApplication; | import org.springframework.boot.SpringApplication; | ||||||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | import org.springframework.boot.autoconfigure.SpringBootApplication; | ||||||
| import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration; | import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; | ||||||
| 
 | 
 | ||||||
| @SpringBootApplication(exclude = { | @SpringBootApplication(exclude = { | ||||||
|   SecurityAutoConfiguration.class |   SecurityAutoConfiguration.class | ||||||
|  | |||||||
| @ -5,6 +5,8 @@ import org.springframework.security.config.annotation.authentication.builders.Au | |||||||
| import org.springframework.security.config.annotation.web.builders.HttpSecurity; | import org.springframework.security.config.annotation.web.builders.HttpSecurity; | ||||||
| import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; | import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; | ||||||
| import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; | import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; | ||||||
|  | import org.springframework.security.crypto.factory.PasswordEncoderFactories; | ||||||
|  | import org.springframework.security.crypto.password.PasswordEncoder; | ||||||
| 
 | 
 | ||||||
| @Configuration | @Configuration | ||||||
| @EnableWebSecurity | @EnableWebSecurity | ||||||
| @ -12,14 +14,15 @@ public class BasicAuthConfiguration extends WebSecurityConfigurerAdapter { | |||||||
| 
 | 
 | ||||||
|     @Override |     @Override | ||||||
|     protected void configure(AuthenticationManagerBuilder auth) throws Exception { |     protected void configure(AuthenticationManagerBuilder auth) throws Exception { | ||||||
|         auth |     	PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder(); | ||||||
|  |     	auth | ||||||
|           .inMemoryAuthentication() |           .inMemoryAuthentication() | ||||||
|           .withUser("user") |           .withUser("user") | ||||||
|           .password("password") |           .password(encoder.encode("password")) | ||||||
|           .roles("USER") |           .roles("USER") | ||||||
|           .and() |           .and() | ||||||
|           .withUser("admin") |           .withUser("admin") | ||||||
|           .password("admin") |           .password(encoder.encode("admin")) | ||||||
|           .roles("USER", "ADMIN"); |           .roles("USER", "ADMIN"); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,12 +1,11 @@ | |||||||
| package com.baeldung.springbootsecurity.basic_auth; | package com.baeldung.springbootsecurity.basic_auth; | ||||||
| 
 | 
 | ||||||
| import com.baeldung.springbootsecurity.basic_auth.SpringBootSecurityApplication; |  | ||||||
| import org.junit.Before; | import org.junit.Before; | ||||||
| import org.junit.Test; | import org.junit.Test; | ||||||
| import org.junit.runner.RunWith; | import org.junit.runner.RunWith; | ||||||
| import org.springframework.boot.context.embedded.LocalServerPort; |  | ||||||
| import org.springframework.boot.test.context.SpringBootTest; | import org.springframework.boot.test.context.SpringBootTest; | ||||||
| import org.springframework.boot.test.web.client.TestRestTemplate; | import org.springframework.boot.test.web.client.TestRestTemplate; | ||||||
|  | import org.springframework.boot.web.server.LocalServerPort; | ||||||
| import org.springframework.http.HttpStatus; | import org.springframework.http.HttpStatus; | ||||||
| import org.springframework.http.ResponseEntity; | import org.springframework.http.ResponseEntity; | ||||||
| import org.springframework.test.context.junit4.SpringRunner; | import org.springframework.test.context.junit4.SpringRunner; | ||||||
| @ -18,7 +17,6 @@ import java.net.URL; | |||||||
| import static org.junit.Assert.assertEquals; | import static org.junit.Assert.assertEquals; | ||||||
| import static org.junit.Assert.assertTrue; | import static org.junit.Assert.assertTrue; | ||||||
| import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; | import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; | ||||||
| 
 |  | ||||||
| @RunWith(SpringRunner.class) | @RunWith(SpringRunner.class) | ||||||
| @SpringBootTest(webEnvironment = RANDOM_PORT, classes = SpringBootSecurityApplication.class) | @SpringBootTest(webEnvironment = RANDOM_PORT, classes = SpringBootSecurityApplication.class) | ||||||
| public class BasicAuthConfigurationIntegrationTest { | public class BasicAuthConfigurationIntegrationTest { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user