Skip to content

Commit dbf4617

Browse files
authored
πŸ”– release: v0.0.10
2 parents b2c05ef + 7302153 commit dbf4617

File tree

7 files changed

+22
-86
lines changed

7 files changed

+22
-86
lines changed

β€Žbackend/src/main/java/io/f1/backend/BackendApplication.javaβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
package io.f1.backend;
22

3+
import io.f1.backend.domain.user.dto.OAuthRedirectProperties;
4+
35
import org.springframework.boot.SpringApplication;
46
import org.springframework.boot.autoconfigure.SpringBootApplication;
7+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
58
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
69

710
@EnableJpaAuditing
811
@SpringBootApplication
12+
@EnableConfigurationProperties(OAuthRedirectProperties.class)
913
public class BackendApplication {
1014

1115
public static void main(String[] args) {

β€Žbackend/src/main/java/io/f1/backend/domain/user/app/handler/OAuthSuccessHandler.javaβ€Ž

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.f1.backend.domain.user.app.handler;
22

3+
import io.f1.backend.domain.user.dto.OAuthRedirectProperties;
34
import io.f1.backend.domain.user.dto.UserPrincipal;
45

56
import jakarta.servlet.http.HttpServletRequest;
@@ -17,6 +18,8 @@
1718
@RequiredArgsConstructor
1819
public class OAuthSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
1920

21+
private final OAuthRedirectProperties redirectProperties;
22+
2023
@Override
2124
public void onAuthenticationSuccess(
2225
HttpServletRequest request, HttpServletResponse response, Authentication authentication)
@@ -25,11 +28,9 @@ public void onAuthenticationSuccess(
2528
response.setContentType("application/json;charset=UTF-8");
2629

2730
if (principal.getUserNickname() == null) {
28-
String SIGNUP_REDIRECT_URL = "http://localhost:3000/signup";
29-
getRedirectStrategy().sendRedirect(request, response, SIGNUP_REDIRECT_URL);
31+
getRedirectStrategy().sendRedirect(request, response, redirectProperties.signupUrl());
3032
} else {
31-
String MAIN_REDIRECT_URL = "http://localhost:3000/room";
32-
getRedirectStrategy().sendRedirect(request, response, MAIN_REDIRECT_URL);
33+
getRedirectStrategy().sendRedirect(request, response, redirectProperties.mainUrl());
3334
}
3435
}
3536
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package io.f1.backend.domain.user.dto;
2+
3+
import org.springframework.boot.context.properties.ConfigurationProperties;
4+
5+
@ConfigurationProperties(prefix = "custom.oauth.redirect")
6+
public record OAuthRedirectProperties(String signupUrl, String mainUrl) {}

β€Žbackend/src/main/java/io/f1/backend/domain/user/entity/User.javaβ€Ž

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
import lombok.Builder;
1616
import lombok.Getter;
1717
import lombok.NoArgsConstructor;
18-
import lombok.Setter;
1918

2019
import java.time.LocalDateTime;
2120

2221
@Getter
23-
@Setter // quizService의 ν€΄μ¦ˆ 쑰회 λ©”μ„œλ“œ κ΅¬ν˜„ μ‹œκΉŒμ§€ μž„μ‹œ μ‚¬μš©
2422
@Entity
2523
@Table(name = "`user`")
2624
@NoArgsConstructor

β€Žbackend/src/main/java/io/f1/backend/global/config/SecurityConfig.javaβ€Ž

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
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-
import io.f1.backend.global.filter.DevTokenAuthFilter;
109

1110
import lombok.RequiredArgsConstructor;
1211

@@ -19,7 +18,6 @@
1918
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
2019
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
2120
import org.springframework.security.web.SecurityFilterChain;
22-
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
2321

2422
@Configuration
2523
@EnableWebSecurity
@@ -40,8 +38,6 @@ public class SecurityConfig {
4038
public SecurityFilterChain userFilterChain(HttpSecurity http) throws Exception {
4139
http.csrf(AbstractHttpConfigurer::disable)
4240
.cors(Customizer.withDefaults())
43-
.addFilterBefore(
44-
new DevTokenAuthFilter(), UsernamePasswordAuthenticationFilter.class)
4541
.exceptionHandling(
4642
exception ->
4743
exception.authenticationEntryPoint(customAuthenticationEntryPoint))
@@ -87,6 +83,7 @@ public SecurityFilterChain userFilterChain(HttpSecurity http) throws Exception {
8783
userInfo.userService(
8884
customOAuthUserService))
8985
.successHandler(oAuthSuccessHandler))
86+
.httpBasic(Customizer.withDefaults())
9087
.logout(
9188
logout ->
9289
logout.logoutUrl("/logout")

β€Žbackend/src/main/java/io/f1/backend/global/filter/DevTokenAuthFilter.javaβ€Ž

Lines changed: 0 additions & 76 deletions
This file was deleted.

β€Žbackend/src/main/resources/application.ymlβ€Ž

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ server:
6464
secure: true
6565
http-only: true
6666
timeout: ${SESSION_TIMEOUT}
67+
68+
custom:
69+
oauth:
70+
redirect:
71+
signup-url: ${SIGNUP_URL}
72+
main-url: ${MAIN_URL}
6773
---
6874
spring:
6975
config:

0 commit comments

Comments
Β (0)