diff --git a/samples/boot/oauth2-integration/README.adoc b/samples/boot/oauth2-integration/README.adoc index 3e28abb..86e5d2f 100644 --- a/samples/boot/oauth2-integration/README.adoc +++ b/samples/boot/oauth2-integration/README.adoc @@ -8,4 +8,4 @@ This sample integrates `spring-security-oauth2-client` and `spring-security-oaut ** *IMPORTANT:* Make sure to modify your `/etc/hosts` file to avoid problems with session cookie overwrites between `client` and `authorizationserver`. Simply add the entry `127.0.0.1 auth-server` * Run Resource Server -> `./gradlew -b samples/boot/oauth2-integration/resourceserver/spring-security-samples-boot-oauth2-integrated-resourceserver.gradle bootRun` * Run Client -> `./gradlew -b samples/boot/oauth2-integration/client/spring-security-samples-boot-oauth2-integrated-client.gradle bootRun` -* Go to `http://localhost:8080` and login using *user1/password* +* Go to `http://localhost:8080` diff --git a/samples/boot/oauth2-integration/client/src/main/java/sample/config/SecurityConfig.java b/samples/boot/oauth2-integration/client/src/main/java/sample/config/SecurityConfig.java index 125ac9f..77ce385 100644 --- a/samples/boot/oauth2-integration/client/src/main/java/sample/config/SecurityConfig.java +++ b/samples/boot/oauth2-integration/client/src/main/java/sample/config/SecurityConfig.java @@ -15,15 +15,10 @@ */ package sample.config; -import org.springframework.context.annotation.Bean; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.provisioning.InMemoryUserDetailsManager; /** * @author Joe Grandja @@ -46,26 +41,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { protected void configure(HttpSecurity http) throws Exception { http .authorizeRequests() - .anyRequest().authenticated() - .and() - .formLogin() - .loginPage("/login") - .failureUrl("/login-error") - .permitAll() + .anyRequest().permitAll() .and() + .logout() + .disable() .oauth2Client(); } // @formatter:on - - // @formatter:off - @Bean - public UserDetailsService users() { - UserDetails user = User.withDefaultPasswordEncoder() - .username("user1") - .password("password") - .roles("USER") - .build(); - return new InMemoryUserDetailsManager(user); - } - // @formatter:on } diff --git a/samples/boot/oauth2-integration/client/src/main/java/sample/web/DefaultController.java b/samples/boot/oauth2-integration/client/src/main/java/sample/web/DefaultController.java index d040498..5661a75 100644 --- a/samples/boot/oauth2-integration/client/src/main/java/sample/web/DefaultController.java +++ b/samples/boot/oauth2-integration/client/src/main/java/sample/web/DefaultController.java @@ -16,7 +16,6 @@ package sample.web; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; /** @@ -35,15 +34,4 @@ public class DefaultController { public String index() { return "index"; } - - @GetMapping("/login") - public String login() { - return "login"; - } - - @GetMapping("/login-error") - public String loginError(Model model) { - model.addAttribute("loginError", true); - return login(); - } } diff --git a/samples/boot/oauth2-integration/client/src/main/resources/templates/index.html b/samples/boot/oauth2-integration/client/src/main/resources/templates/index.html index 3dcd6b3..6c8520c 100644 --- a/samples/boot/oauth2-integration/client/src/main/resources/templates/index.html +++ b/samples/boot/oauth2-integration/client/src/main/resources/templates/index.html @@ -13,19 +13,6 @@
diff --git a/samples/boot/oauth2-integration/client/src/main/resources/templates/login.html b/samples/boot/oauth2-integration/client/src/main/resources/templates/login.html deleted file mode 100644 index cd32f21..0000000 --- a/samples/boot/oauth2-integration/client/src/main/resources/templates/login.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - Spring Security OAuth 2.0 Sample - - - - - - -
-

Login

-

Wrong username or password

-
-
-
- - - user1 / password -
-
-
-
- - -
-
- -
-
- - - - \ No newline at end of file