Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,4 @@ dependencies {

tasks.named('test') {
useJUnitPlatform()
}

def querydslDir = 'build/generated/sources/annotationProcessor/java/main'
sourceSets {
main.java.srcDirs += [querydslDir]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.smartlogis.userservice.config;

import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;

import com.smartlogis.common.infrastructure.security.HeaderAuthenticationFilter;
import com.smartlogis.common.infrastructure.security.RestAccessDeniedHandler;
import com.smartlogis.common.infrastructure.security.RestAuthenticationEntryPoint;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

@Slf4j
@Configuration
@EnableMethodSecurity
@RequiredArgsConstructor
public class SecurityConfig {

private final HeaderAuthenticationFilter headerAuthenticationFilter;
private final RestAuthenticationEntryPoint restAuthenticationEntryPoint;
private final RestAccessDeniedHandler restAccessDeniedHandler;

@Bean
@ConditionalOnMissingBean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
return http.csrf(AbstractHttpConfigurer::disable)
.formLogin(AbstractHttpConfigurer::disable)
.logout(AbstractHttpConfigurer::disable)
.authorizeHttpRequests(auth -> auth.anyRequest().permitAll())
.addFilterBefore(headerAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
.sessionManagement(c -> c.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.exceptionHandling(c -> {
c.authenticationEntryPoint(restAuthenticationEntryPoint);
c.accessDeniedHandler(restAccessDeniedHandler);
})
.build();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class UserId {

@Column(name = "user_id")
@Column
private UUID id;

protected UserId(UUID id) { this.id = id;}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public ResponseEntity<ApiResponse<Void>> signup(@Valid @RequestBody UserRegister
}

@Operation(summary = "로그인한 회원정보 조회")
@PreAuthorize("isAuthenticated()")
@GetMapping
public ResponseEntity<ApiResponse<UserInfoResponse>> getUser(@AuthenticationPrincipal AuthenticatedUser authentication) {
UserInfoResponse user = userService.getUserById(UUID.fromString(authentication.getId()));
Expand Down Expand Up @@ -138,6 +139,7 @@ public ResponseEntity<ApiResponse<Void>> updateUserRole(
}

@Operation(summary = "회원 탈퇴")
@PreAuthorize("isAuthenticated()")
@DeleteMapping("/delete")
public ResponseEntity<ApiResponse<Void>> delete(
@AuthenticationPrincipal AuthenticatedUser authentication
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</appender>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<root level="INFO">
Expand Down