fix(user-service): Oauth_2.0, jwt 브랜치 병합 후 충돌 해결

- 위와 동일

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)

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);
     }

user-service/src/main/java/com/justpickup/userservice/global/security/WebSecurity.java

@@ -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);
-
-
-
-    }
-}