Feat: 자체엑세스토큰을 통해 로그인 (#124)

sunwon12 · web-flow · commit a354e5be6415 · 2023-11-30T15:39:53.000+09:00
* chore: 디렉토리 구조 수정

* feat: login By accessToken

* remove: todo 주석 삭제
diff --git a/src/main/java/com/flint/flint/config/SecurityConfig.java b/src/main/java/com/flint/flint/config/SecurityConfig.java
@@ -1,8 +1,8 @@
 package com.flint.flint.config;
 
-import com.flint.flint.security.auth.jwt.JwtAuthenticationEntryPoint;
-import com.flint.flint.security.auth.jwt.JwtAuthenticationFilter;
-import com.flint.flint.security.auth.jwt.JwtService;
+import com.flint.flint.security.jwt.JwtAuthenticationEntryPoint;
+import com.flint.flint.security.jwt.JwtAuthenticationFilter;
+import com.flint.flint.security.jwt.JwtService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/com/flint/flint/mail/controller/MailController.java b/src/main/java/com/flint/flint/mail/controller/MailController.java
@@ -5,7 +5,7 @@
 import com.flint.flint.mail.dto.request.SuccessUniversityAuthRequest;
 import com.flint.flint.mail.dto.response.EmailAuthNumberRespose;
 import com.flint.flint.mail.service.AuthEmailService;
-import com.flint.flint.security.auth.dto.AuthenticationResponse;
+import com.flint.flint.security.auth.dto.response.AuthenticationResponse;
 import com.flint.flint.security.auth.dto.AuthorityMemberDTO;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/flint/flint/mail/service/AuthEmailService.java b/src/main/java/com/flint/flint/mail/service/AuthEmailService.java
@@ -10,7 +10,7 @@
 import com.flint.flint.member.spec.Authority;
 import com.flint.flint.redis.RedisUtil;
 import com.flint.flint.security.auth.AuthenticationService;
-import com.flint.flint.security.auth.dto.AuthenticationResponse;
+import com.flint.flint.security.auth.dto.response.AuthenticationResponse;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/com/flint/flint/member/domain/main/Policy.java b/src/main/java/com/flint/flint/member/domain/main/Policy.java
@@ -2,7 +2,7 @@
 
 import com.flint.flint.common.BaseTimeEntity;
 import com.flint.flint.member.spec.Agree;
-import com.flint.flint.security.auth.dto.RegisterRequest;
+import com.flint.flint.security.auth.dto.request.RegisterRequest;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
diff --git a/src/main/java/com/flint/flint/security/auth/AuthenticationController.java b/src/main/java/com/flint/flint/security/auth/AuthenticationController.java
@@ -1,9 +1,9 @@
 package com.flint.flint.security.auth;
 
 import com.flint.flint.common.ResponseForm;
-import com.flint.flint.security.auth.dto.AuthenticationResponse;
-import com.flint.flint.security.auth.dto.RegisterRequest;
-import com.flint.flint.security.oauth.dto.AuthorizionRequestHeader;
+import com.flint.flint.security.auth.dto.response.AuthenticationResponse;
+import com.flint.flint.security.auth.dto.request.RegisterRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
@@ -24,29 +24,28 @@ public class AuthenticationController {
     //테스트용
 
     @PostMapping("/register")
-    public ResponseForm<AuthenticationResponse> register(@Valid @RequestBody RegisterRequest registerRequest, @RequestHeader(HttpHeaders.AUTHORIZATION) AuthorizionRequestHeader authorizionRequestHeader) {
-        AuthenticationResponse authenticationResponse = authenticationService.register(registerRequest, authorizionRequestHeader);
+    public ResponseForm<AuthenticationResponse> register(@Valid @RequestBody RegisterRequest registerRequest, HttpServletRequest oauth2TokenWithBearer) {
+        AuthenticationResponse authenticationResponse = authenticationService.register(registerRequest, oauth2TokenWithBearer);
         return new ResponseForm<>(authenticationResponse);
 
     }
 
     @PostMapping("/login/{providerName}")
-    public ResponseForm<AuthenticationResponse> login(@PathVariable String providerName, @RequestHeader(HttpHeaders.AUTHORIZATION) AuthorizionRequestHeader authorizionRequestHeader) {
-        AuthenticationResponse authenticationResponse = authenticationService.login(providerName, authorizionRequestHeader);
+    public ResponseForm<AuthenticationResponse> loginByOauth2Provider(@PathVariable String providerName, HttpServletRequest oauth2TokenWithBearer) {
+        AuthenticationResponse authenticationResponse = authenticationService.loginByOauth2Provider(providerName, oauth2TokenWithBearer);
         return new ResponseForm<>(authenticationResponse);
     }
 
-//TODO
-//    @PostMapping("/withdraw")
-//    public void removeMember(@PathVariable String id) {
-//        Optional<Member> member = memberRepository.findById(id);
-//        memberRepository.deleteById(id);
-//        authenticationService.deleteRedisToken(email);
-//    }
+    @PostMapping("/login/accesstoken")
+    public ResponseForm loginByAccessToken(HttpServletRequest accessTokenWithBearer) {
+        authenticationService.loginByAccessToken(accessTokenWithBearer);
+        return new ResponseForm<>();
+    }
+
 
     @PostMapping("/renew")
-    public ResponseForm<AuthenticationResponse> newTokenByRefreshToken(@RequestHeader(HttpHeaders.AUTHORIZATION) String refreshToken) {
-        AuthenticationResponse authenticationResponse = authenticationService.newTokenByRefreshToken(refreshToken);
+    public ResponseForm<AuthenticationResponse> newTokenByRefreshToken(HttpServletRequest refreshTokenWithBearer) {
+        AuthenticationResponse authenticationResponse = authenticationService.newTokenByRefreshToken(refreshTokenWithBearer);
         return new ResponseForm<>(authenticationResponse);
     }
-}
+}
diff --git a/src/main/java/com/flint/flint/security/auth/AuthenticationService.java b/src/main/java/com/flint/flint/security/auth/AuthenticationService.java
@@ -8,13 +8,13 @@
 import com.flint.flint.member.repository.MemberRepository;
 import com.flint.flint.member.repository.PolicyRepository;
 import com.flint.flint.redis.RedisUtil;
-import com.flint.flint.security.auth.dto.AuthenticationResponse;
+import com.flint.flint.security.auth.dto.response.AuthenticationResponse;
 import com.flint.flint.security.auth.dto.ClaimsDTO;
-import com.flint.flint.security.auth.dto.RegisterRequest;
-import com.flint.flint.security.auth.jwt.JwtService;
-import com.flint.flint.security.oauth.dto.AuthorizionRequestHeader;
-import com.flint.flint.security.oauth.dto.OAuth2UserAttribute;
-import com.flint.flint.security.oauth.dto.OAuth2UserAttributeFactory;
+import com.flint.flint.security.auth.dto.request.RegisterRequest;
+import com.flint.flint.security.jwt.JwtService;
+import com.flint.flint.security.oauth.OAuth2UserAttribute;
+import com.flint.flint.security.oauth.OAuth2UserAttributeFactory;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -43,38 +43,48 @@ public class AuthenticationService {
      * member 저장, 수신동의 저장, 엑세스,리프레쉬토큰 생성, redis에 리프레쉬 토큰 저장
      */
     @Transactional
-    public AuthenticationResponse register(RegisterRequest registerRequest, AuthorizionRequestHeader authorizionRequestHeader) {
+    public AuthenticationResponse register(RegisterRequest registerRequest, HttpServletRequest oauth2TokenWithBearer) {
         //카카오인지 네이버인지 선택
         OAuth2UserAttribute oAuth2UserAttribute = OAuth2UserAttributeFactory.of(registerRequest.getProviderName());
-        String oauth2AccessToekn = authorizionRequestHeader.getAccessToken().replace("Bearer ", "");
+        String oauth2AccessToken = jwtService.parseTokenFrom(oauth2TokenWithBearer);
         //정보 추출
-        oAuth2UserAttribute.setUserAttributesByOauthToken(oauth2AccessToekn);
+        oAuth2UserAttribute.setUserAttributesByOauthToken(oauth2AccessToken);
         checkRegistration(oAuth2UserAttribute.getProviderId());
         Member member = saveInformation(registerRequest, oAuth2UserAttribute);
         return generateToken(member);
     }
 
     /**
-     * 유저 리프레쉬 토큰의 만료기간까지 다 지났을 때 로그인
-     * (리프레쉬 토큰이 살아있을 때 로그인은 newTokenByRefreshToken()를 호출한다)
-     * 엑세스,리프레쉬토큰 생성, redis에 리프레쉬 토큰 저장
+     * Oauth2Provider 토큰으로 로그인
+     * 첫 로그인 혹은 엑세스,리프레쉬 토큰 없을 때
      */
     @Transactional
-    public AuthenticationResponse login(String providerName, AuthorizionRequestHeader authorizionRequestHeader) {
+    public AuthenticationResponse loginByOauth2Provider(String providerName, HttpServletRequest oauth2TokenWithBearer) {
         OAuth2UserAttribute oAuth2UserAttribute = OAuth2UserAttributeFactory.of(providerName);
-        String oauth2AccessToekn = authorizionRequestHeader.getAccessToken().replace("Bearer ", "");
+        String oauth2AccessToken = jwtService.parseTokenFrom(oauth2TokenWithBearer);
         //정보 추출
-        oAuth2UserAttribute.setUserAttributesByOauthToken(oauth2AccessToekn);
+        oAuth2UserAttribute.setUserAttributesByOauthToken(oauth2AccessToken);
         String providerId = oAuth2UserAttribute.getProviderId();
         Member member = memberRepository.findByProviderId(providerId).orElseThrow(() -> new FlintCustomException(HttpStatus.NOT_FOUND, ResultCode.USER_NOT_JOINED));
         return generateToken(member);
     }
 
     /**
-     * 리프레쉬 토큰 재발급
+     * 엑세스 토큰으로 로그인
      */
     @Transactional
-    public AuthenticationResponse newTokenByRefreshToken(String refreshToken) {
+    public void loginByAccessToken(HttpServletRequest accessTokenWithBearer) {
+        String accessToken = jwtService.parseTokenFrom(accessTokenWithBearer);
+        jwtService.isTokenValid(accessToken);
+    }
+
+
+    /**
+     * 리프레쉬 토큰으로 로그인
+     */
+    @Transactional
+    public AuthenticationResponse newTokenByRefreshToken(HttpServletRequest refreshTokenWithBearer) {
+        String refreshToken = jwtService.parseTokenFrom(refreshTokenWithBearer);
         String providerId = jwtService.parseProviderId(refreshToken);
         Member member = memberRepository.findByProviderId(providerId).orElseThrow(() -> new FlintCustomException(HttpStatus.NOT_FOUND, ResultCode.USER_NOT_FOUND));
         jwtService.isTokenValid(refreshToken);
@@ -84,6 +94,7 @@ public AuthenticationResponse newTokenByRefreshToken(String refreshToken) {
         throw new FlintCustomException(HttpStatus.BAD_REQUEST, ResultCode.REFRESHTOKEN_OUTDATED);
     }
 
+
     /**
      * 엑세스 토큰 리프레쉬 토큰 생성, 레디쉬에 리프레쉬 토큰 저장
      */
@@ -118,4 +129,4 @@ private Member saveInformation(RegisterRequest registerRequest, OAuth2UserAttrib
         policyRepository.save(policy);
         return member;
     }
-}
+}
diff --git a/src/main/java/com/flint/flint/security/auth/dto/request/RegisterRequest.java b/src/main/java/com/flint/flint/security/auth/dto/request/RegisterRequest.java
@@ -1,4 +1,4 @@
-package com.flint.flint.security.auth.dto;
+package com.flint.flint.security.auth.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;
diff --git a/src/main/java/com/flint/flint/security/auth/dto/response/AuthenticationResponse.java b/src/main/java/com/flint/flint/security/auth/dto/response/AuthenticationResponse.java
@@ -1,4 +1,4 @@
-package com.flint.flint.security.auth.dto;
+package com.flint.flint.security.auth.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/com/flint/flint/security/jwt/JwtAuthenticationEntryPoint.java b/src/main/java/com/flint/flint/security/jwt/JwtAuthenticationEntryPoint.java
@@ -1,4 +1,4 @@
-package com.flint.flint.security.auth.jwt;
+package com.flint.flint.security.jwt;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/src/main/java/com/flint/flint/security/jwt/JwtAuthenticationFilter.java b/src/main/java/com/flint/flint/security/jwt/JwtAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package com.flint.flint.security.auth.jwt;
+package com.flint.flint.security.jwt;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
diff --git a/src/main/java/com/flint/flint/security/jwt/JwtService.java b/src/main/java/com/flint/flint/security/jwt/JwtService.java
@@ -1,4 +1,4 @@
-package com.flint.flint.security.auth.jwt;
+package com.flint.flint.security.jwt;
 
 
 import com.flint.flint.common.exception.FlintCustomException;
@@ -24,8 +24,9 @@
 import org.springframework.util.StringUtils;
 
 import java.security.Key;
-import java.time.LocalDate;
-import java.util.*;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Set;
 
 /**
  * 엑세스, 리프레쉬 토큰 생성, 클레임 추출, 토큰 검증
@@ -37,17 +38,15 @@
 @RequiredArgsConstructor
 public class JwtService {
 
+    private static final String HEADER_PREFIX = "Bearer ";
+    private final MemberRepository memberRepository;
     @Value("${jwt.secretKey}")
     private String secretKey;
     @Value("${jwt.accessTokenExpiration}")
     private Long accessTokenExpiration;
     @Value("${jwt.refreshTokenExpiration}")
     private Long refreshTokenExpiration;
 
-    private final MemberRepository memberRepository;
-    private static final String HEADER_PREFIX = "Bearer ";
-
-
     //토큰 생성 메소드들
     //클레임으로 변환 후
     public String generateAccessToken(ClaimsDTO claimsDTO) {
@@ -104,43 +103,41 @@ public Claims parseAllClaims(String token) {
                 .getBody();
     }
 
-    //토큰 검증 메소드
-    //TODO
     public boolean isTokenValid(String token) {
         String providerId = parseProviderId(token);
         Date expiration = parseExpiration(token);
-        if(expiration.before(new Date())) {
+        if (expiration.before(new Date())) {
             throw new FlintCustomException(HttpStatus.BAD_REQUEST, ResultCode.JWT_DATE_NOT);
         }
-        if(!memberRepository.existsByProviderId(providerId)) {
+        if (!memberRepository.existsByProviderId(providerId)) {
             throw new FlintCustomException(HttpStatus.NOT_FOUND, ResultCode.USER_NOT_FOUND);
         }
         return true;
     }
 
 
-        //request 헤더에서 토큰 추출
-        public String parseTokenFrom (HttpServletRequest request){
-            String authorizationHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
-            if (StringUtils.hasText(authorizationHeader) && authorizationHeader.startsWith(HEADER_PREFIX))
-                return authorizationHeader.replace(HEADER_PREFIX, "");
-            return null;
-        }
+    //request 헤더에서 토큰 추출
+    public String parseTokenFrom(HttpServletRequest request) {
+        String authorizationHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
+        if (StringUtils.hasText(authorizationHeader) && authorizationHeader.startsWith(HEADER_PREFIX))
+            return authorizationHeader.replace(HEADER_PREFIX, "");
+        return null;
+    }
 
-        public Authentication getAuthentication (String accessToken){
-
-            Claims claims = parseAllClaims(accessToken);
-            String providerId = claims.getSubject();
-            Long id = Long.parseLong((claims.get("id")).toString());
-            String email = claims.get("email").toString();
-            String authority = claims.get("authority").toString();
-            AuthorityMemberDTO authorityMemberDTO = AuthorityMemberDTO.builder()
-                    .id(id)
-                    .providerId(providerId)
-                    .email(email)
-                    .authority(authority)
-                    .build();
-            Collection<? extends GrantedAuthority> authorities = Set.of(new SimpleGrantedAuthority(authority));
-            return new UsernamePasswordAuthenticationToken(authorityMemberDTO, "", authorities);
-        }
+    public Authentication getAuthentication(String accessToken) {
+
+        Claims claims = parseAllClaims(accessToken);
+        String providerId = claims.getSubject();
+        Long id = Long.parseLong((claims.get("id")).toString());
+        String email = claims.get("email").toString();
+        String authority = claims.get("authority").toString();
+        AuthorityMemberDTO authorityMemberDTO = AuthorityMemberDTO.builder()
+                .id(id)
+                .providerId(providerId)
+                .email(email)
+                .authority(authority)
+                .build();
+        Collection<? extends GrantedAuthority> authorities = Set.of(new SimpleGrantedAuthority(authority));
+        return new UsernamePasswordAuthenticationToken(authorityMemberDTO, "", authorities);
     }
+}
diff --git a/src/main/java/com/flint/flint/security/oauth/KakaoOAuth2UserAttribute.java b/src/main/java/com/flint/flint/security/oauth/KakaoOAuth2UserAttribute.java
@@ -1,4 +1,4 @@
-package com.flint.flint.security.oauth.dto;
+package com.flint.flint.security.oauth;
 
 import com.flint.flint.member.domain.main.Member;
 import com.flint.flint.member.spec.Authority;
diff --git a/src/main/java/com/flint/flint/security/oauth/NaverOAuth2UserAttribute.java b/src/main/java/com/flint/flint/security/oauth/NaverOAuth2UserAttribute.java
@@ -1,4 +1,4 @@
-package com.flint.flint.security.oauth.dto;
+package com.flint.flint.security.oauth;
 
 import com.flint.flint.member.domain.main.Member;
 import com.flint.flint.member.spec.Authority;
diff --git a/src/main/java/com/flint/flint/security/oauth/OAuth2UserAttribute.java b/src/main/java/com/flint/flint/security/oauth/OAuth2UserAttribute.java
@@ -1,4 +1,4 @@
-package com.flint.flint.security.oauth.dto;
+package com.flint.flint.security.oauth;
 
 import com.flint.flint.member.domain.main.Member;
 import lombok.Data;
diff --git a/src/main/java/com/flint/flint/security/oauth/OAuth2UserAttributeFactory.java b/src/main/java/com/flint/flint/security/oauth/OAuth2UserAttributeFactory.java
@@ -1,9 +1,7 @@
-package com.flint.flint.security.oauth.dto;
+package com.flint.flint.security.oauth;
 
 import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
 
-import java.util.Map;
-
 /**
  * OAuth2 구별
  * @Author 정순원
diff --git a/src/main/java/com/flint/flint/security/oauth/dto/AuthorizionRequestHeader.java b/src/main/java/com/flint/flint/security/oauth/dto/AuthorizionRequestHeader.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.flint.flint.security.auth.dto;`
	`1`	`+package com.flint.flint.security.auth.dto.request;`
`2`	`2`
`3`	`3`	`import jakarta.validation.constraints.NotBlank;`
`4`	`4`	`import lombok.*;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.flint.flint.security.auth.jwt;`
	`1`	`+package com.flint.flint.security.jwt;`
`2`	`2`
`3`	`3`	`import jakarta.servlet.http.HttpServletRequest;`
`4`	`4`	`import jakarta.servlet.http.HttpServletResponse;`