Skip to content

Commit 518f3a4

Browse files
author
github-actions
committed
chore: Java 스타일 수정
1 parent cff695f commit 518f3a4

File tree

4 files changed

+32
-25
lines changed

4 files changed

+32
-25
lines changed

backend/src/main/java/io/f1/backend/domain/admin/entity/Admin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
import lombok.Builder;
1212
import lombok.Getter;
13+
import lombok.NoArgsConstructor;
1314

1415
import java.time.LocalDateTime;
15-
import lombok.NoArgsConstructor;
1616

1717
@Entity
1818
@Getter

backend/src/main/java/io/f1/backend/domain/user/dao/UserRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
2020

2121
@Query(
2222
"SELECT new io.f1.backend.domain.admin.dto.UserResponse(u.id, u.nickname, u.lastLogin,"
23-
+ " u.createdAt)FROM User u ORDER BY u.lastLogin DESC")
23+
+ " u.createdAt)FROM User u ORDER BY u.lastLogin DESC")
2424
Page<UserResponse> findAllUsersWithPaging(Pageable pageable);
2525
}

backend/src/main/java/io/f1/backend/global/config/SecurityConfig.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import io.f1.backend.domain.user.app.handler.CustomAuthenticationEntryPoint;
77
import io.f1.backend.domain.user.app.handler.OAuthSuccessHandler;
88
import io.f1.backend.domain.user.app.handler.UserAndAdminLogoutSuccessHandler;
9-
109
import io.f1.backend.global.filter.DevTokenAuthFilter;
10+
1111
import lombok.RequiredArgsConstructor;
1212

1313
import org.springframework.context.annotation.Bean;
@@ -36,7 +36,8 @@ public class SecurityConfig {
3636
public SecurityFilterChain userFilterChain(HttpSecurity http) throws Exception {
3737
http.csrf(AbstractHttpConfigurer::disable)
3838
.cors(Customizer.withDefaults())
39-
.addFilterBefore(new DevTokenAuthFilter(), UsernamePasswordAuthenticationFilter.class)
39+
.addFilterBefore(
40+
new DevTokenAuthFilter(), UsernamePasswordAuthenticationFilter.class)
4041
.exceptionHandling(
4142
exception ->
4243
exception.authenticationEntryPoint(customAuthenticationEntryPoint))

backend/src/main/java/io/f1/backend/global/filter/DevTokenAuthFilter.java

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
import io.f1.backend.domain.admin.entity.Admin;
55
import io.f1.backend.domain.user.dto.UserPrincipal;
66
import io.f1.backend.domain.user.entity.User;
7+
78
import jakarta.servlet.FilterChain;
89
import jakarta.servlet.ServletException;
910
import jakarta.servlet.http.HttpServletRequest;
1011
import jakarta.servlet.http.HttpServletResponse;
11-
import java.io.IOException;
12-
import java.time.LocalDateTime;
13-
import java.util.List;
14-
import java.util.Map;
12+
1513
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
1614
import org.springframework.security.core.Authentication;
1715
import org.springframework.security.core.GrantedAuthority;
@@ -20,33 +18,41 @@
2018
import org.springframework.stereotype.Component;
2119
import org.springframework.web.filter.OncePerRequestFilter;
2220

21+
import java.io.IOException;
22+
import java.time.LocalDateTime;
23+
import java.util.List;
24+
import java.util.Map;
25+
2326
@Component
2427
public class DevTokenAuthFilter extends OncePerRequestFilter {
2528

2629
private static final String DEV_TOKEN = "dev-secret-token-1234";
2730
private static final String ADMIN_TOKEN = "admin-secret-token-1234";
2831

2932
@Override
30-
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
31-
FilterChain filterChain) throws ServletException, IOException {
33+
protected void doFilterInternal(
34+
HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
35+
throws ServletException, IOException {
3236

33-
User fakeUser = User.builder()
34-
.provider("kakao")
35-
.providerId("dev")
36-
.lastLogin(LocalDateTime.now())
37-
.build();
37+
User fakeUser =
38+
User.builder()
39+
.provider("kakao")
40+
.providerId("dev")
41+
.lastLogin(LocalDateTime.now())
42+
.build();
3843

3944
fakeUser.setId(1L);
4045
fakeUser.updateNickname("user");
4146

4247
UserPrincipal principal = new UserPrincipal(fakeUser, Map.of());
4348

44-
Admin fakeAdmin = Admin.builder()
45-
.id(1L)
46-
.username("admin")
47-
.password("admin")
48-
.lastLogin(LocalDateTime.now())
49-
.build();
49+
Admin fakeAdmin =
50+
Admin.builder()
51+
.id(1L)
52+
.username("admin")
53+
.password("admin")
54+
.lastLogin(LocalDateTime.now())
55+
.build();
5056

5157
AdminPrincipal adminPrincipal = new AdminPrincipal(fakeAdmin);
5258

@@ -55,14 +61,14 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
5561
if (authHeader != null && authHeader.equals("Bearer " + DEV_TOKEN)) {
5662
List<GrantedAuthority> authorities = List.of(new SimpleGrantedAuthority("ROLE_USER"));
5763

58-
Authentication auth = new UsernamePasswordAuthenticationToken(principal, null,
59-
authorities);
64+
Authentication auth =
65+
new UsernamePasswordAuthenticationToken(principal, null, authorities);
6066
SecurityContextHolder.getContext().setAuthentication(auth);
6167
} else if (authHeader != null && authHeader.equals("Bearer " + ADMIN_TOKEN)) {
6268
List<GrantedAuthority> authorities = List.of(new SimpleGrantedAuthority("ROLE_ADMIN"));
6369

64-
Authentication auth = new UsernamePasswordAuthenticationToken(adminPrincipal, null,
65-
authorities);
70+
Authentication auth =
71+
new UsernamePasswordAuthenticationToken(adminPrincipal, null, authorities);
6672
SecurityContextHolder.getContext().setAuthentication(auth);
6773
}
6874
filterChain.doFilter(request, response);

0 commit comments

Comments
 (0)