Merge pull request #35 from LikeLion-12th-SKHU/develop

리프레시 토큰
LikeLion-12th-SKHU · Jul 25, 2024 · 1827d63 · 1827d63
2 parents 9fe5547 + 9582afd
commit 1827d63
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 58 deletions.
diff --git a/src/main/java/org/likelion/likelion_12th_team05/global/auth/config/SecurityConfig.java b/src/main/java/org/likelion/likelion_12th_team05/global/auth/config/SecurityConfig.java
@@ -32,7 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                 .csrf(AbstractHttpConfigurer::disable)
                 /*.authorizeHttpRequests(authorize -> authorize
                         .requestMatchers("/sign-up/**", "/sign-in/**", "/login/oauth2/**").permitAll()
-                        .requestMatchers("/user/**").hasRole("USER")
+                        .requestMatchers("/user/**").hasRole("ROLE_USER")
                 )*/
                 .authorizeHttpRequests(authorizeRequests -> authorizeRequests
                         .anyRequest().permitAll())  // 스웨거 안 열림 이슈로 다 허용으로 바꿈

diff --git a/...in/java/org/likelion/likelion_12th_team05/global/auth/googleAuth/AuthLoginController.java b/...in/java/org/likelion/likelion_12th_team05/global/auth/googleAuth/AuthLoginController.java
diff --git a/src/main/java/org/likelion/likelion_12th_team05/global/auth/googleAuth/AuthLoginService.java b/src/main/java/org/likelion/likelion_12th_team05/global/auth/googleAuth/AuthLoginService.java
@@ -62,7 +62,7 @@ public GoogleToken signUpOrSignIn(String googleAccessToken) {
                 userRepository.save(User.builder()
                         .email(userInfo.getEmail())
                         .name(userInfo.getName())
-                        .role(Role.USER)
+                        .role(Role.ROLE_USER)
                         .build())
         );
         return googleTokenProvider.generateToken(user);

diff --git a/...in/java/org/likelion/likelion_12th_team05/global/auth/googleAuth/GoogleTokenProvider.java b/...in/java/org/likelion/likelion_12th_team05/global/auth/googleAuth/GoogleTokenProvider.java
@@ -45,7 +45,7 @@ public GoogleToken generateToken(User user) {
                 .setSubject(user.getEmail())
                 .claim(AUTHORITIES_KEY, user.getRole().name())
                 .setExpiration(tokenExpiredTime)
-                .signWith(key, SignatureAlgorithm.HS512)
+                .signWith(key, SignatureAlgorithm.HS256)
                 .compact();
 
         return GoogleToken.builder()

diff --git a/src/main/java/org/likelion/likelion_12th_team05/global/auth/jwt/JwtTokenProvider.java b/src/main/java/org/likelion/likelion_12th_team05/global/auth/jwt/JwtTokenProvider.java
@@ -47,26 +47,30 @@ public String generateToken(String email) {
 
         Date expireDate = new Date(date.getTime() + Long.parseLong(tokenExpireTime));
 
-        return Jwts.builder()
+        String accessToken = Jwts.builder()
                 .setSubject(email)
                 .setIssuedAt(date)
                 .setExpiration(expireDate)
                 .signWith(key, SignatureAlgorithm.HS256)
                 .compact();
+
+        return accessToken;
     }
 
-//    public String refreshToken(String email) {
-//        Date date = new Date();
-//
-//        Date expireDate = new Date(date.getTime() + Long.parseLong(tokenExpireTime) * 24);
-//
-//        return Jwts.builder()
-//                .setSubject(email)
-//                .setIssuedAt(date)
-//                .setExpiration(expireDate)
-//                .signWith(key, SignatureAlgorithm.HS256)
-//                .compact();
-//    }
+    public String refreshToken(String email) {
+        Date date = new Date();
+
+        Date expireDate = new Date(date.getTime() + Long.parseLong(tokenExpireTime) * 24 * 7);
+
+        String refreshToken = Jwts.builder()
+                .setSubject(email)
+                .setIssuedAt(date)
+                .setExpiration(expireDate)
+                .signWith(key, SignatureAlgorithm.HS256)
+                .compact();
+
+        return refreshToken;
+    }
 
     public boolean validateToken(String token) {
         // 토큰을 검증하는 부분

diff --git a/src/main/java/org/likelion/likelion_12th_team05/global/auth/jwt/TokenDto.java b/src/main/java/org/likelion/likelion_12th_team05/global/auth/jwt/TokenDto.java
@@ -0,0 +1,13 @@
+package org.likelion.likelion_12th_team05.global.auth.jwt;
+
+import lombok.Builder;
+
+@Builder
+public record TokenDto(
+        String grantType,
+
+        String accessToken,
+
+        String refreshToken
+) {
+}
diff --git a/src/main/java/org/likelion/likelion_12th_team05/user/api/UserController.java b/src/main/java/org/likelion/likelion_12th_team05/user/api/UserController.java
@@ -8,6 +8,7 @@
 import org.likelion.likelion_12th_team05.config.ApiResponseTemplate;
 import org.likelion.likelion_12th_team05.global.auth.googleAuth.AuthLoginService;
 import org.likelion.likelion_12th_team05.global.auth.googleAuth.GoogleToken;
+import org.likelion.likelion_12th_team05.global.auth.jwt.TokenDto;
 import org.likelion.likelion_12th_team05.user.api.dto.request.UserSignInReqDto;
 import org.likelion.likelion_12th_team05.user.api.dto.request.UserSignUpReqDto;
 import org.likelion.likelion_12th_team05.user.api.dto.response.UserSignInResDto;
@@ -31,9 +32,9 @@ public UserController(UserService userService, AuthLoginService authLoginService
             @ApiResponse(responseCode = "401", description = "인증이 필요합니다.")
     })
     @PostMapping("/sign-up")
-    public ApiResponseTemplate<SuccessCode> userSignUp(@RequestBody @Valid UserSignUpReqDto userSignUpReqDto) {
-        userService.userSignUp(userSignUpReqDto);
-        return ApiResponseTemplate.successWithNoContent(SuccessCode.USER_SIGNUP_SUCCESS);
+    public ApiResponseTemplate<String> userSignUp(@RequestBody @Valid UserSignUpReqDto userSignUpReqDto, TokenDto tokenDto) {
+        userService.userSignUp(userSignUpReqDto, tokenDto);
+        return ApiResponseTemplate.successResponse(userSignUpReqDto.refreshToken(), SuccessCode.USER_SIGNUP_SUCCESS);
     }
 
     @Operation(summary = "구글 로그인", description = "구글 로그인")

diff --git a/src/main/java/org/likelion/likelion_12th_team05/user/api/dto/request/UserSignInReqDto.java b/src/main/java/org/likelion/likelion_12th_team05/user/api/dto/request/UserSignInReqDto.java
@@ -12,6 +12,8 @@ public record UserSignInReqDto(
 
         @NotBlank(message = "비밀번호를 필수로 입력해야 합니다.")
         @Size(min = 8, message = "8자 이상 입력하세요.")
-        String password
+        String password,
+
+        String refreshToken
 ) {
 }
diff --git a/src/main/java/org/likelion/likelion_12th_team05/user/api/dto/request/UserSignUpReqDto.java b/src/main/java/org/likelion/likelion_12th_team05/user/api/dto/request/UserSignUpReqDto.java
@@ -19,6 +19,8 @@ public record UserSignUpReqDto(
         @Size(min = 8, message = "8자 이상 입력하세요.")
         String password,
 
+        String refreshToken,
+
         Role role
 ) {
 }
diff --git a/src/main/java/org/likelion/likelion_12th_team05/user/api/dto/response/UserSignInResDto.java b/src/main/java/org/likelion/likelion_12th_team05/user/api/dto/response/UserSignInResDto.java
@@ -4,11 +4,12 @@
 import org.likelion.likelion_12th_team05.user.domain.User;
 
 @Builder
-public record UserSignInResDto(String name, String email, String token) {
-    public static UserSignInResDto of(User user, String token) {
+public record UserSignInResDto(String name, String email, String accessToken, String refreshToken) {
+    public static UserSignInResDto of(User user, String accessToken, String refreshToken) {
         return UserSignInResDto.builder()
                 .name(user.getName())
                 .email(user.getEmail())
-                .token(token).build();
+                .accessToken(accessToken)
+                .refreshToken(refreshToken).build();
     }
 }
diff --git a/src/main/java/org/likelion/likelion_12th_team05/user/application/UserService.java b/src/main/java/org/likelion/likelion_12th_team05/user/application/UserService.java
@@ -2,6 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.likelion.likelion_12th_team05.global.auth.jwt.JwtTokenProvider;
+import org.likelion.likelion_12th_team05.global.auth.jwt.TokenDto;
 import org.likelion.likelion_12th_team05.user.api.dto.request.UserSignInReqDto;
 import org.likelion.likelion_12th_team05.user.api.dto.request.UserSignUpReqDto;
 import org.likelion.likelion_12th_team05.user.api.dto.response.UserSignInResDto;
@@ -28,15 +29,18 @@ public UserService(UserRepository userRepository, PasswordEncoder passwordEncode
 
     // 회원가입
     @Transactional
-    public void userSignUp(UserSignUpReqDto userSignUpReqDto) {
+    public void userSignUp(UserSignUpReqDto userSignUpReqDto, TokenDto tokenDto) {
         if (userRepository.existsByEmail(userSignUpReqDto.email())) {
             throw new IllegalArgumentException("이미 존재하는 이메일입니다.");
         }
+
         User user = User.builder()
                 .name(userSignUpReqDto.name())
                 .email(userSignUpReqDto.email())
                 .password(passwordEncoder.encode(userSignUpReqDto.password()))
-                .role(Role.USER)
+                .accessToken(tokenDto.accessToken())
+                .refreshToken(tokenDto.refreshToken())
+                .role(Role.ROLE_USER)
                 .build();
 
         userRepository.save(user);
@@ -45,13 +49,13 @@ public void userSignUp(UserSignUpReqDto userSignUpReqDto) {
     public UserSignInResDto userSignIn(UserSignInReqDto userSignUpReqDto) {
         User user = userRepository.findByEmail(userSignUpReqDto.email())
                 .orElseThrow(() -> new IllegalArgumentException("이메일이나 패스워드가 일치하지 않습니다."));
-        String token = tokenProvider.generateToken(user.getEmail());
-//      String refreshToken = tokenProvider.refreshToken(user.getEmail());
+        String accessToken = tokenProvider.generateToken(user.getEmail());
+        String refreshToken = tokenProvider.refreshToken(user.getEmail());
 
         if (!passwordEncoder.matches(userSignUpReqDto.password(), user.getPassword())) {
             throw new IllegalArgumentException("이메일이나 패스워드가 일치하지 않습니다.");
         }
 
-        return UserSignInResDto.of(user, token);
+        return UserSignInResDto.of(user, accessToken, refreshToken);
     }
 }
diff --git a/src/main/java/org/likelion/likelion_12th_team05/user/domain/Role.java b/src/main/java/org/likelion/likelion_12th_team05/user/domain/Role.java
@@ -1,5 +1,5 @@
 package org.likelion.likelion_12th_team05.user.domain;
 
 public enum Role {
-    USER
+    ROLE_USER
 }
diff --git a/src/main/java/org/likelion/likelion_12th_team05/user/domain/User.java b/src/main/java/org/likelion/likelion_12th_team05/user/domain/User.java
@@ -24,9 +24,12 @@ public class User {
     private String name;
     private String email;
     private String password;
+
+    private String accessToken;
+    private String refreshToken;
+
+    @Enumerated(value = EnumType.STRING)
     private Role role;
-//    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-//    private List<Curation> curations = new ArrayList<>();
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Curation> curations = new ArrayList<>();
@@ -38,10 +41,12 @@ public class User {
     private List<Like> likes = new ArrayList<>();
 
     @Builder
-    private User(String name, String email, String password, Role role){
+    private User(String name, String email, String password, String accessToken, String refreshToken, Role role){
         this.name = name;
         this.email = email;
         this.password = password;
+        this.accessToken = accessToken;
+        this.refreshToken = refreshToken;
         this.role = role;
     }
 }