From 47faea59e44c497087fc272b1cce7d592d4ac517 Mon Sep 17 00:00:00 2001
From: bum12ark <bum12ark@gmail.com>
Date: Wed, 16 Feb 2022 12:09:01 +0900
Subject: [PATCH] =?UTF-8?q?fix(user-service):=20Oauth=5F2.0,=20jwt=20?=
 =?UTF-8?q?=EB=B8=8C=EB=9E=9C=EC=B9=98=20=EB=B3=91=ED=95=A9=20=ED=9B=84=20?=
 =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 위와 동일
---
 .../userservice/domain/user/entity/User.java  |  1 -
 .../global/security/SecurityConfig.java       |  8 +++++
 .../global/security/WebSecurity.java          | 36 -------------------
 3 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 user-service/src/main/java/com/justpickup/userservice/global/security/WebSecurity.java

diff --git a/user-service/src/main/java/com/justpickup/userservice/domain/user/entity/User.java b/user-service/src/main/java/com/justpickup/userservice/domain/user/entity/User.java
index 0580925..bfce461 100644
--- a/user-service/src/main/java/com/justpickup/userservice/domain/user/entity/User.java
+++ b/user-service/src/main/java/com/justpickup/userservice/domain/user/entity/User.java
@@ -29,7 +29,6 @@ public class User extends BaseEntity {
     private String refreshTokenId;
 
     @Enumerated(EnumType.STRING)
-    @Column(nullable = false)
     private Role role;
 
     @Column(insertable = false,updatable = false)
diff --git a/user-service/src/main/java/com/justpickup/userservice/global/security/SecurityConfig.java b/user-service/src/main/java/com/justpickup/userservice/global/security/SecurityConfig.java
index 7ba52d5..7c73707 100644
--- a/user-service/src/main/java/com/justpickup/userservice/global/security/SecurityConfig.java
+++ b/user-service/src/main/java/com/justpickup/userservice/global/security/SecurityConfig.java
@@ -2,6 +2,7 @@ package com.justpickup.userservice.global.security;
 
 import com.justpickup.userservice.domain.jwt.service.RefreshTokenServiceImpl;
 import com.justpickup.userservice.domain.jwt.utils.JwtTokenProvider;
+import com.justpickup.userservice.domain.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -23,6 +24,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     private final JwtTokenProvider jwtTokenProvider;
     private final RefreshTokenServiceImpl refreshTokenServiceImpl;
 
+    private final UserService userService;
+
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
         auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder);
@@ -44,6 +47,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .logoutUrl("/logout")
                 .deleteCookies("");
 
+        http.oauth2Login()
+            .defaultSuccessUrl("http://just-pickup.com:8000/customer-frontend-service/")
+            .userInfoEndpoint()
+            .userService(userService);
+
         http.addFilter(loginAuthenticationFilter);
         http.addFilterBefore(new HeaderAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class);
     }
diff --git a/user-service/src/main/java/com/justpickup/userservice/global/security/WebSecurity.java b/user-service/src/main/java/com/justpickup/userservice/global/security/WebSecurity.java
deleted file mode 100644
index 933a097..0000000
--- a/user-service/src/main/java/com/justpickup/userservice/global/security/WebSecurity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.justpickup.userservice.global.security;
-
-import com.justpickup.userservice.domain.user.service.UserService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-@RequiredArgsConstructor
-public class WebSecurity extends WebSecurityConfigurerAdapter {
-
-    private final UserService userService;
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.csrf().disable()
-                    .authorizeRequests()
-                    .antMatchers("/login").permitAll()
-                .and()
-                    .logout()
-                        .logoutSuccessUrl("/")
-                .and()
-                    .oauth2Login()
-                    .defaultSuccessUrl("http://just-pickup.com:8000/customer-frontend-service/")
-                        .userInfoEndpoint()
-                .userService(userService);
-
-        super.configure(http);
-
-
-
-    }
-}