Skip to content

Commit 72ec263

Browse files
committed
Remove formLogin() from client sample app
Closes gh-108
1 parent 0b95672 commit 72ec263

File tree

5 files changed

+4
-83
lines changed

5 files changed

+4
-83
lines changed

samples/boot/oauth2-integration/README.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ This sample integrates `spring-security-oauth2-client` and `spring-security-oaut
88
** *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`
99
* Run Resource Server -> `./gradlew -b samples/boot/oauth2-integration/resourceserver/spring-security-samples-boot-oauth2-integrated-resourceserver.gradle bootRun`
1010
* Run Client -> `./gradlew -b samples/boot/oauth2-integration/client/spring-security-samples-boot-oauth2-integrated-client.gradle bootRun`
11-
* Go to `http://localhost:8080` and login using *user1/password*
11+
* Go to `http://localhost:8080`

samples/boot/oauth2-integration/client/src/main/java/sample/config/SecurityConfig.java

+3-23
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,10 @@
1515
*/
1616
package sample.config;
1717

18-
import org.springframework.context.annotation.Bean;
1918
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
2019
import org.springframework.security.config.annotation.web.builders.WebSecurity;
2120
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
2221
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
23-
import org.springframework.security.core.userdetails.User;
24-
import org.springframework.security.core.userdetails.UserDetails;
25-
import org.springframework.security.core.userdetails.UserDetailsService;
26-
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
2722

2823
/**
2924
* @author Joe Grandja
@@ -46,26 +41,11 @@ public void configure(WebSecurity web) {
4641
protected void configure(HttpSecurity http) throws Exception {
4742
http
4843
.authorizeRequests()
49-
.anyRequest().authenticated()
50-
.and()
51-
.formLogin()
52-
.loginPage("/login")
53-
.failureUrl("/login-error")
54-
.permitAll()
44+
.anyRequest().permitAll()
5545
.and()
46+
.logout()
47+
.disable()
5648
.oauth2Client();
5749
}
5850
// @formatter:on
59-
60-
// @formatter:off
61-
@Bean
62-
public UserDetailsService users() {
63-
UserDetails user = User.withDefaultPasswordEncoder()
64-
.username("user1")
65-
.password("password")
66-
.roles("USER")
67-
.build();
68-
return new InMemoryUserDetailsManager(user);
69-
}
70-
// @formatter:on
7151
}

samples/boot/oauth2-integration/client/src/main/java/sample/web/DefaultController.java

-12
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package sample.web;
1717

1818
import org.springframework.stereotype.Controller;
19-
import org.springframework.ui.Model;
2019
import org.springframework.web.bind.annotation.GetMapping;
2120

2221
/**
@@ -35,15 +34,4 @@ public String root() {
3534
public String index() {
3635
return "index";
3736
}
38-
39-
@GetMapping("/login")
40-
public String login() {
41-
return "login";
42-
}
43-
44-
@GetMapping("/login-error")
45-
public String loginError(Model model) {
46-
model.addAttribute("loginError", true);
47-
return login();
48-
}
4937
}

samples/boot/oauth2-integration/client/src/main/resources/templates/index.html

-13
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,6 @@
1313
<div class="container">
1414
<div class="container-fluid">
1515
<div class="navbar-collapse collapse" id="navbar">
16-
<ul class="nav navbar-nav navbar-right">
17-
<li class="dropdown">
18-
<a id="user-menu" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
19-
<span sec:authentication="name">User</span>
20-
</a>
21-
<ul class="dropdown-menu">
22-
<li><a id="sign-out" href="javascript:document.logoutForm.submit()">Sign Out</a></li>
23-
</ul>
24-
<form name="logoutForm" th:action="@{/logout}" method="post" th:hidden="true">
25-
<input hidden type="submit" value="Sign Out"/>
26-
</form>
27-
</li>
28-
</ul>
2916
</div>
3017
</div>
3118
</div>

samples/boot/oauth2-integration/client/src/main/resources/templates/login.html

-34
This file was deleted.

0 commit comments

Comments
 (0)