Skip to content

Commit 1a9d3d1

Browse files
SporiffSporiff
authored
Add basic user interface for login/registration/logout. (#10)
1 parent ec07d8c commit 1a9d3d1

13 files changed

Lines changed: 359 additions & 6 deletions

File tree

‎src/main/java/org/openpodcastapi/opa/advice/GlobalModelAttributeAdvice.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package org.openpodcastapi.opa.advice;
2+
3+
import lombok.extern.log4j.Log4j2;
4+
import org.springframework.security.core.Authentication;
5+
import org.springframework.security.core.context.SecurityContextHolder;
6+
import org.springframework.ui.Model;
7+
import org.springframework.web.bind.annotation.ControllerAdvice;
8+
import org.springframework.web.bind.annotation.ModelAttribute;
9+
10+
import java.security.Principal;
11+
12+
@Log4j2
13+
@ControllerAdvice
14+
public class GlobalModelAttributeAdvice {
15+
16+
@ModelAttribute
17+
public void addAuthenticationFlag(Model model) {
18+
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
19+
boolean isAuthenticated = authentication != null && authentication.isAuthenticated()
20+
&& !"anonymousUser".equals(authentication.getPrincipal());
21+
model.addAttribute("isAuthenticated", isAuthenticated);
22+
}
23+
24+
@ModelAttribute
25+
public void addUserDetails(Principal principal, Model model) {
26+
String username = principal != null ? principal.getName() : "Guest";
27+
model.addAttribute("username", username);
28+
}
29+
}

‎src/main/java/org/openpodcastapi/opa/config/SecurityConfig.java‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.springframework.security.config.Customizer;
77
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
88
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
9-
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
109
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
1110
import org.springframework.security.web.SecurityFilterChain;
1211

@@ -19,13 +18,22 @@ public class SecurityConfig {
1918
public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception {
2019
http
2120
.authorizeHttpRequests(auth -> auth
22-
.requestMatchers("/docs").permitAll()
21+
.requestMatchers("/", "/login", "/logout-confirm", "/register", "/docs", "/css/**", "/js/**", "/images/**", "/favicon.ico").permitAll()
2322
.requestMatchers("/admin/**").hasRole("ADMIN")
24-
.requestMatchers("/api/v1/users/**").permitAll()
2523
.anyRequest().authenticated())
26-
.csrf(AbstractHttpConfigurer::disable)
27-
.formLogin(Customizer.withDefaults())
28-
.logout(Customizer.withDefaults());
24+
.formLogin(login -> login
25+
.loginPage("/login")
26+
.defaultSuccessUrl("/home", true)
27+
.failureUrl("/login?error=true")
28+
)
29+
.logout(logout -> logout
30+
.logoutUrl("/logout")
31+
.logoutSuccessUrl("/")
32+
.invalidateHttpSession(true)
33+
.clearAuthentication(true)
34+
.deleteCookies("JSESSIONID")
35+
)
36+
.csrf(Customizer.withDefaults());
2937
return http.build();
3038
}
3139

‎src/main/java/org/openpodcastapi/opa/config/TemplateConfig.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
44
import org.springframework.context.annotation.Bean;
5+
import org.springframework.context.annotation.Configuration;
56

7+
@Configuration
68
public class TemplateConfig {
79
@Bean
810
public LayoutDialect layoutDialect() {

‎src/main/java/org/openpodcastapi/opa/config/WebConfig.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package org.openpodcastapi.opa.config;
22

3+
import org.springframework.context.annotation.Configuration;
34
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
45
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
56

7+
@Configuration
68
public class WebConfig implements WebMvcConfigurer {
79
@Override
810
public void addResourceHandlers(ResourceHandlerRegistry registry) {

‎src/main/java/org/openpodcastapi/opa/ui/controller/AuthController.java‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
package org.openpodcastapi.opa.ui.controller;
2+
3+
import jakarta.validation.Valid;
4+
import lombok.RequiredArgsConstructor;
5+
import lombok.extern.log4j.Log4j2;
6+
import org.openpodcastapi.opa.user.dto.CreateUserDto;
7+
import org.openpodcastapi.opa.user.service.UserService;
8+
import org.springframework.dao.DataIntegrityViolationException;
9+
import org.springframework.stereotype.Controller;
10+
import org.springframework.ui.Model;
11+
import org.springframework.validation.BindingResult;
12+
import org.springframework.web.bind.annotation.GetMapping;
13+
import org.springframework.web.bind.annotation.ModelAttribute;
14+
import org.springframework.web.bind.annotation.PostMapping;
15+
import org.springframework.web.bind.annotation.RequestParam;
16+
17+
@Controller
18+
@Log4j2
19+
@RequiredArgsConstructor
20+
public class AuthController {
21+
private static final String USER_REQUEST_ATTRIBUTE = "createUserRequest";
22+
private static final String REGISTER_TEMPLATE = "auth/register";
23+
private final UserService userService;
24+
25+
// === Login page ===
26+
@GetMapping("/login")
27+
public String loginPage(@RequestParam(value = "error", required = false) String error,
28+
Model model) {
29+
if (error != null) {
30+
model.addAttribute("loginError", true);
31+
}
32+
return "auth/login";
33+
}
34+
35+
// === Logout confirmation page ===
36+
@GetMapping("/logout-confirm")
37+
public String logoutPage() {
38+
return "auth/logout";
39+
}
40+
41+
// === Registration page ===
42+
@GetMapping("/register")
43+
public String getRegister(Model model) {
44+
model.addAttribute(USER_REQUEST_ATTRIBUTE, new CreateUserDto("", "", ""));
45+
return REGISTER_TEMPLATE;
46+
}
47+
48+
// === Registration POST handler ===
49+
@PostMapping("/register")
50+
public String processRegistration(
51+
@Valid @ModelAttribute CreateUserDto createUserRequest,
52+
BindingResult result,
53+
Model model
54+
) {
55+
if (result.hasErrors()) {
56+
model.addAttribute(USER_REQUEST_ATTRIBUTE, createUserRequest);
57+
return REGISTER_TEMPLATE;
58+
}
59+
60+
try {
61+
userService.createAndPersistUser(createUserRequest);
62+
} catch (DataIntegrityViolationException _) {
63+
result.rejectValue("username", "", "Username or email already exists");
64+
model.addAttribute(USER_REQUEST_ATTRIBUTE, createUserRequest);
65+
return REGISTER_TEMPLATE;
66+
}
67+
68+
return "redirect:/login?registered";
69+
}
70+
}

‎src/main/java/org/openpodcastapi/opa/ui/controller/HomeController.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package org.openpodcastapi.opa.ui.controller;
2+
3+
import lombok.RequiredArgsConstructor;
4+
import lombok.extern.log4j.Log4j2;
5+
import org.springframework.security.core.Authentication;
6+
import org.springframework.stereotype.Controller;
7+
import org.springframework.web.bind.annotation.GetMapping;
8+
9+
@Controller
10+
@RequiredArgsConstructor
11+
@Log4j2
12+
public class HomeController {
13+
14+
@GetMapping("/")
15+
public String getLandingPage() {
16+
return "landing";
17+
}
18+
19+
@GetMapping("/home")
20+
public String getHomePage(Authentication auth) {
21+
if (auth != null && !auth.isAuthenticated()) {
22+
return "redirect:/login";
23+
}
24+
return "home";
25+
}
26+
}

‎src/main/resources/templates/auth/login.html‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!-- auth/login.html -->
2+
<!DOCTYPE html>
3+
<html lang="en" xmlns:th="http://www.thymeleaf.org"
4+
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
5+
layout:decorate="~{layouts/main}">
6+
<head>
7+
<title layout:fragment="title">Log in - Open Podcast API</title>
8+
</head>
9+
<body>
10+
<div layout:fragment="content" th:remove>
11+
<h1 class="title">Log in</h1>
12+
<div>
13+
<div th:if="${loginError}" class="has-text-danger">
14+
Invalid username or password.
15+
</div>
16+
17+
<form th:action="@{/login}" method="post">
18+
<div class="field">
19+
<label for="username" class="label">Username</label>
20+
<div class="control">
21+
<input autocomplete="username" id="username" name="username" class="input" type="text"
22+
placeholder="Username">
23+
</div>
24+
</div>
25+
<div class="field">
26+
<label for="password" class="label">Password</label>
27+
<div class="control">
28+
<input autocomplete="current-password" id="password" name="password" class="input" type="password"
29+
placeholder="Password">
30+
</div>
31+
</div>
32+
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
33+
<div class="field">
34+
<div class="control">
35+
<button type="submit" name="submit" class="button is-success">Log in</button>
36+
</div>
37+
</div>
38+
</form>
39+
</div>
40+
</div>
41+
</body>
42+
</html>

‎src/main/resources/templates/auth/logout.html‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!-- auth/logout.html -->
2+
<!DOCTYPE html>
3+
<html lang="en" xmlns:th="http://www.thymeleaf.org"
4+
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
5+
layout:decorate="~{layouts/main}">
6+
<head>
7+
<title layout:fragment="title">Log out - Open Podcast API</title>
8+
</head>
9+
<body>
10+
11+
<div layout:fragment="content" th:remove>
12+
<h1>Are you sure you want to log out?</h1>
13+
<div>
14+
<form th:action="@{/logout}" method="post">
15+
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
16+
<button type="submit" class="button is-danger">Log out</button>
17+
</form>
18+
</div>
19+
</div>
20+
21+
</body>
22+
</html>

‎src/main/resources/templates/auth/register.html‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<!-- auth/register.html -->
2+
<!DOCTYPE html>
3+
<html lang="en" xmlns:th="http://www.thymeleaf.org"
4+
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
5+
layout:decorate="~{layouts/main}">
6+
<head>
7+
<title layout:fragment="title">Sign up - Open Podcast API</title>
8+
</head>
9+
<body>
10+
<div layout:fragment="content" th:remove>
11+
<h1>Sign up</h1>
12+
<form
13+
th:object="${createUserRequest}"
14+
th:action="@{/register}"
15+
method="post">
16+
<div class="field">
17+
<label for="username" class="label">Username</label>
18+
<div class="control">
19+
<input id="username" autocomplete="username" name="username" th:field="*{username}" class="input"
20+
type="text"
21+
placeholder="Username">
22+
<div th:if="${#fields.hasErrors('username')}" th:errors="*{username}"></div>
23+
</div>
24+
</div>
25+
<div class="field">
26+
<label for="email" class="label">Email</label>
27+
<div class="control">
28+
<input id="email" autocomplete="email" name="email" th:field="*{email}" class="input" type="email"
29+
placeholder="address@example.com">
30+
<div th:if="${#fields.hasErrors('email')}" th:errors="*{email}"></div>
31+
</div>
32+
</div>
33+
<div class="field">
34+
<label for="password" class="label">Password</label>
35+
<div class="control">
36+
<input id="password" autocomplete="new-password" name="password" th:field="*{password}"
37+
class="input" type="password"
38+
placeholder="Password">
39+
<div th:if="${#fields.hasErrors('password')}" th:errors="*{password}"></div>
40+
</div>
41+
</div>
42+
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
43+
<div class="field">
44+
<div class="control">
45+
<input type="submit" name="submit" class="button is-success" value="Submit"/>
46+
</div>
47+
</div>
48+
</form>
49+
</div>
50+
</body>
51+
</html>

‎src/main/resources/templates/home.html‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!-- home.html -->
2+
<!--/*@thymesVar id="username" type="String"*/-->
3+
<!DOCTYPE html>
4+
<html lang="en" xmlns:th="http://www.thymeleaf.org"
5+
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
6+
layout:decorate="~{layouts/main}">
7+
<head>
8+
<title layout:fragment="title">Home - Open Podcast API</title>
9+
</head>
10+
<body>
11+
12+
<div layout:fragment="content" th:remove>
13+
<article class="content">
14+
<h1>Welcome, <span th:text="${username}"></span>!</h1>
15+
</article>
16+
</div>
17+
18+
</body>
19+
</html>

0 commit comments

Comments
 (0)