mindol1004/spring-jwt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- 위와 동일
This commit is contained in:
bum12ark
2022-02-16 12:09:01 +09:00
parent a01cf0a12d
commit 47faea59e4
3 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
user-service/src/main/java/com/justpickup/userservice/domain/user/entity/User.java
View File

@@ -29,7 +29,6 @@ public class User extends BaseEntity {
private String refreshTokenId; private String refreshTokenId;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
@Column(nullable = false)
private Role role; private Role role;
@Column(insertable = false,updatable = false) @Column(insertable = false,updatable = false)

8
user-service/src/main/java/com/justpickup/userservice/global/security/SecurityConfig.java
View File

@@ -2,6 +2,7 @@ package com.justpickup.userservice.global.security;
import com.justpickup.userservice.domain.jwt.service.RefreshTokenServiceImpl; import com.justpickup.userservice.domain.jwt.service.RefreshTokenServiceImpl;
import com.justpickup.userservice.domain.jwt.utils.JwtTokenProvider; import com.justpickup.userservice.domain.jwt.utils.JwtTokenProvider;
import com.justpickup.userservice.domain.user.service.UserService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
@@ -23,6 +24,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
private final JwtTokenProvider jwtTokenProvider; private final JwtTokenProvider jwtTokenProvider;
private final RefreshTokenServiceImpl refreshTokenServiceImpl; private final RefreshTokenServiceImpl refreshTokenServiceImpl;
private final UserService userService;
@Override @Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception { protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder); auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder);
@@ -44,6 +47,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.logoutUrl("/logout") .logoutUrl("/logout")
.deleteCookies(""); .deleteCookies("");
http.oauth2Login()
.defaultSuccessUrl("http://just-pickup.com:8000/customer-frontend-service/")
.userInfoEndpoint()
.userService(userService);
http.addFilter(loginAuthenticationFilter); http.addFilter(loginAuthenticationFilter);
http.addFilterBefore(new HeaderAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class); http.addFilterBefore(new HeaderAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class);
} }

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

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