Refactor/320 auth memberid

backend/src/main/java/com/woowacourse/moamoa/auth/config/AuthConfig.java

@@ -2,14 +2,11 @@
 
 import com.woowacourse.moamoa.auth.controller.AuthenticatedMemberResolver;
 import com.woowacourse.moamoa.auth.controller.AuthenticatedRefreshArgumentResolver;
-import com.woowacourse.moamoa.auth.controller.AuthenticationArgumentResolver;
 import com.woowacourse.moamoa.auth.controller.interceptor.AuthenticationInterceptor;
-
 import com.woowacourse.moamoa.auth.controller.interceptor.PathMatcherContainer;
 import com.woowacourse.moamoa.auth.controller.interceptor.PathMatcherInterceptor;
 import com.woowacourse.moamoa.auth.infrastructure.TokenProvider;
 import java.util.List;
-
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -25,15 +22,13 @@
 public class AuthConfig implements WebMvcConfigurer {
 
     private final AuthenticatedRefreshArgumentResolver authenticatedRefreshArgumentResolver;
-    private final AuthenticationArgumentResolver authenticationArgumentResolver;
     private final AuthenticatedMemberResolver authenticatedMemberResolver;
 
     private final PathMatcherContainer pathMatcherContainer;
     private final TokenProvider jwtTokenProvider;
 
     @Override
     public void addArgumentResolvers(final List<HandlerMethodArgumentResolver> resolvers) {
-        resolvers.add(authenticationArgumentResolver);
         resolvers.add(authenticatedMemberResolver);
         resolvers.add(authenticatedRefreshArgumentResolver);
     }

backend/src/main/java/com/woowacourse/moamoa/auth/config/AuthenticatedMember.java → backend/src/main/java/com/woowacourse/moamoa/auth/config/AuthenticatedMemberId.java

@@ -7,5 +7,5 @@
 
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface AuthenticatedMember {
+public @interface AuthenticatedMemberId {
 }

backend/src/main/java/com/woowacourse/moamoa/auth/controller/AuthController.java

@@ -1,7 +1,7 @@
 package com.woowacourse.moamoa.auth.controller;
 
+import com.woowacourse.moamoa.auth.config.AuthenticatedMemberId;
 import com.woowacourse.moamoa.auth.config.AuthenticatedRefresh;
-import com.woowacourse.moamoa.auth.config.AuthenticationPrincipal;
 import com.woowacourse.moamoa.auth.service.AuthService;
 import com.woowacourse.moamoa.auth.service.response.AccessTokenResponse;
 import com.woowacourse.moamoa.auth.service.response.TokensResponse;
@@ -35,13 +35,13 @@ public ResponseEntity<AccessTokenResponse> login(@RequestParam final String code
     }
 
     @GetMapping("/api/auth/refresh")
-    public ResponseEntity<AccessTokenResponse> refreshToken(@AuthenticatedRefresh Long githubId, @CookieValue String refreshToken) {
-        return ResponseEntity.ok().body(authService.refreshToken(githubId, refreshToken));
+    public ResponseEntity<AccessTokenResponse> refreshToken(@AuthenticatedRefresh Long memberId, @CookieValue String refreshToken) {
+        return ResponseEntity.ok().body(authService.refreshToken(memberId, refreshToken));
     }
 
     @DeleteMapping("/api/auth/logout")
-    public ResponseEntity<Void> logout(@AuthenticationPrincipal Long githubId) {
-        authService.logout(githubId);
+    public ResponseEntity<Void> logout(@AuthenticatedMemberId Long memberId) {
+        authService.logout(memberId);
 
         return ResponseEntity.noContent().header("Set-Cookie", removeCookie().toString()).build();
     }

backend/src/main/java/com/woowacourse/moamoa/auth/controller/AuthenticatedMemberResolver.java

@@ -1,12 +1,9 @@
 package com.woowacourse.moamoa.auth.controller;
 
-import com.woowacourse.moamoa.auth.config.AuthenticatedMember;
+import com.woowacourse.moamoa.auth.config.AuthenticatedMemberId;
 import com.woowacourse.moamoa.auth.config.AuthenticationExtractor;
 import com.woowacourse.moamoa.auth.infrastructure.TokenProvider;
 import com.woowacourse.moamoa.common.exception.UnauthorizedException;
-import com.woowacourse.moamoa.member.domain.Member;
-import com.woowacourse.moamoa.member.domain.repository.MemberRepository;
-import com.woowacourse.moamoa.member.service.exception.MemberNotFoundException;
 import javax.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.MethodParameter;
@@ -20,12 +17,11 @@
 @RequiredArgsConstructor
 public class AuthenticatedMemberResolver implements HandlerMethodArgumentResolver {
 
-    private final MemberRepository memberRepository;
     private final TokenProvider tokenProvider;
 
     @Override
     public boolean supportsParameter(final MethodParameter parameter) {
-        return parameter.hasParameterAnnotation(AuthenticatedMember.class);
+        return parameter.hasParameterAnnotation(AuthenticatedMemberId.class);
     }
 
     @Override
@@ -38,9 +34,6 @@ public Object resolveArgument(final MethodParameter parameter, final ModelAndVie
             throw new UnauthorizedException("인증 타입이 올바르지 않습니다.");
         }
 
-        final Long githubId = Long.valueOf(tokenProvider.getPayload(token));
-
-        final Member member = memberRepository.findByGithubId(githubId).orElseThrow(MemberNotFoundException::new);
-        return member.getId();
+        return Long.valueOf(tokenProvider.getPayload(token));
     }
 }

backend/src/main/java/com/woowacourse/moamoa/auth/controller/interceptor/AuthenticationInterceptor.java

@@ -31,7 +31,7 @@ private void validateToken(final String token, final String requestURI) {
             return;
         }
         if (token == null || !tokenProvider.validateToken(token)) {
-            throw new UnauthorizedException("유효하지 않은 토큰입니다.");
+            throw new UnauthorizedException(String.format("유효하지 않은 토큰[%s]입니다.", token));
         }
     }
 }

backend/src/main/java/com/woowacourse/moamoa/auth/domain/Token.java

@@ -10,24 +10,26 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = PROTECTED)
 @AllArgsConstructor
+@ToString
 public class Token {
 
     @Id
     @GeneratedValue(strategy = IDENTITY)
     private Long id;
 
     @Column(nullable = false)
-    private Long githubId;
+    private Long memberId;
 
     private String refreshToken;
 
-    public Token(final Long githubId, final String refreshToken) {
-        this(null, githubId, refreshToken);
+    public Token(final Long memberId, final String refreshToken) {
+        this(null, memberId, refreshToken);
     }
 
     public void updateRefreshToken(final String refreshToken) {

backend/src/main/java/com/woowacourse/moamoa/auth/domain/repository/TokenRepository.java

@@ -6,5 +6,5 @@
 
 public interface TokenRepository extends JpaRepository<Token, Long> {
 
-    Optional<Token> findByGithubId(Long githubId);
+    Optional<Token> findByMemberId(Long memberId);
 }

backend/src/main/java/com/woowacourse/moamoa/auth/infrastructure/JwtTokenProvider.java

@@ -93,7 +93,7 @@ public boolean validateToken(final String token) {
     }
 
     @Override
-    public String recreationAccessToken(final Long githubId, final String refreshToken) {
+    public String recreationAccessToken(final Long memberId, final String refreshToken) {
         Jws<Claims> claims = Jwts.parserBuilder()
                 .setSigningKey(key)
                 .build()
@@ -102,7 +102,7 @@ public String recreationAccessToken(final Long githubId, final String refreshTok
         Date tokenExpirationDate = claims.getBody().getExpiration();
         validateTokenExpiration(tokenExpirationDate);
 
-        return createAccessToken(githubId);
+        return createAccessToken(memberId);
     }
 
     private void validateTokenExpiration(Date tokenExpirationDate) {
@@ -111,11 +111,11 @@ private void validateTokenExpiration(Date tokenExpirationDate) {
         }
     }
 
-    private String createAccessToken(final Long githubId) {
+    private String createAccessToken(final Long memberId) {
         final Date now = new Date();
 
         return Jwts.builder()
-                .setSubject(Long.toString(githubId))
+                .setSubject(Long.toString(memberId))
                 .setIssuedAt(now)
                 .setExpiration(new Date(now.getTime() + validityInMilliseconds))
                 .signWith(key, SignatureAlgorithm.HS256)

backend/src/main/java/com/woowacourse/moamoa/auth/infrastructure/TokenProvider.java

@@ -12,7 +12,7 @@ public interface TokenProvider {
 
     boolean validateToken(final String token);
 
-    String recreationAccessToken(final Long githubId, final String refreshToken);
+    String recreationAccessToken(final Long memberId, final String refreshToken);
 
     long getValidityInMilliseconds();
 }

backend/src/main/java/com/woowacourse/moamoa/auth/service/AuthService.java

@@ -10,6 +10,7 @@
 import com.woowacourse.moamoa.auth.service.response.TokensResponse;
 import com.woowacourse.moamoa.common.exception.UnauthorizedException;
 import com.woowacourse.moamoa.member.service.MemberService;
+import com.woowacourse.moamoa.member.service.response.MemberResponse;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -29,39 +30,37 @@ public class AuthService {
     public TokensResponse createToken(final String code) {
         final String accessToken = oAuthClient.getAccessToken(code);
         final GithubProfileResponse githubProfileResponse = oAuthClient.getProfile(accessToken);
-        memberService.saveOrUpdate(githubProfileResponse.toMember());
+        final MemberResponse memberResponse = memberService.saveOrUpdate(githubProfileResponse.toMember());
+        final Long memberId = memberResponse.getId();
 
-        final Long githubId = githubProfileResponse.getGithubId();
-        final Optional<Token> token = tokenRepository.findByGithubId(githubId);
-
-        final TokensResponse tokenResponse = tokenProvider.createToken(githubProfileResponse.getGithubId());
+        final Optional<Token> token = tokenRepository.findByMemberId(memberId);
+        final TokensResponse tokenResponse = tokenProvider.createToken(memberId);
 
         if (token.isPresent()) {
             token.get().updateRefreshToken(tokenResponse.getRefreshToken());
             return tokenResponse;
         }
 
-        tokenRepository.save(new Token(githubProfileResponse.getGithubId(), tokenResponse.getRefreshToken()));
+        tokenRepository.save(new Token(memberId, tokenResponse.getRefreshToken()));
 
         return tokenResponse;
     }
 
-    public AccessTokenResponse refreshToken(final Long githubId, final String refreshToken) {
-        final Token token = tokenRepository.findByGithubId(githubId)
+    public AccessTokenResponse refreshToken(final Long memberId, final String refreshToken) {
+        final Token token = tokenRepository.findByMemberId(memberId)
                 .orElseThrow(TokenNotFoundException::new);
 
         if (!token.getRefreshToken().equals(refreshToken)) {
-            throw new UnauthorizedException("유효하지 않은 토큰입니다.");
+            throw new UnauthorizedException(String.format("유효하지 않은 토큰[%s]입니다.", token));
         }
 
-        String accessToken = tokenProvider.recreationAccessToken(githubId, refreshToken);
-
+        String accessToken = tokenProvider.recreationAccessToken(memberId, refreshToken);
         return new AccessTokenResponse(accessToken, tokenProvider.getValidityInMilliseconds());
     }
 
     @Transactional
-    public void logout(final Long githubId) {
-        final Token token = tokenRepository.findByGithubId(githubId)
+    public void logout(final Long memberId) {
+        final Token token = tokenRepository.findByMemberId(memberId)
                 .orElseThrow(TokenNotFoundException::new);
 
         tokenRepository.delete(token);

backend/src/main/java/com/woowacourse/moamoa/common/config/WebConfig.java

@@ -1,11 +1,7 @@
 package com.woowacourse.moamoa.common.config;
 
-import com.woowacourse.moamoa.MoamoaApplication;
 import java.util.List;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;

backend/src/main/java/com/woowacourse/moamoa/member/controller/MemberController.java

@@ -1,12 +1,11 @@
 package com.woowacourse.moamoa.member.controller;
 
-import com.woowacourse.moamoa.auth.config.AuthenticationPrincipal;
-import com.woowacourse.moamoa.member.service.response.MemberResponse;
+import com.woowacourse.moamoa.auth.config.AuthenticatedMemberId;
 import com.woowacourse.moamoa.member.service.MemberService;
+import com.woowacourse.moamoa.member.service.response.MemberResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -17,9 +16,9 @@ public class MemberController {
 
     @GetMapping("/api/members/me")
     public ResponseEntity<MemberResponse> getCurrentMember(
-            @AuthenticationPrincipal Long githubId
+            @AuthenticatedMemberId Long memberId
     ) {
-        MemberResponse response = memberService.getByGithubId(githubId);
+        MemberResponse response = memberService.getByMemberId(memberId);
         return ResponseEntity.ok().body(response);
     }
 }

backend/src/main/java/com/woowacourse/moamoa/member/query/MemberDao.java

@@ -49,12 +49,12 @@ private String countOwnerStudy() {
                 + "FROM study)) as number_of_study ";
     }
 
-    public Optional<MemberData> findByGithubId(final Long githubId) {
+    public Optional<MemberData> findByMemberId(final Long memberId) {
         try {
-            final String sql = "SELECT github_id, username, image_url, profile_url "
+            final String sql = "SELECT id, username, image_url, profile_url "
                     + "FROM member "
-                    + "WHERE member.github_id = :id";
-            final MemberData data = jdbcTemplate.queryForObject(sql, Map.of("id", githubId), MEMBER_DATA_ROW_MAPPER);
+                    + "WHERE member.id = :id";
+            final MemberData data = jdbcTemplate.queryForObject(sql, Map.of("id", memberId), MEMBER_DATA_ROW_MAPPER);
             return Optional.of(data);
         } catch (EmptyResultDataAccessException e) {
             return Optional.empty();
@@ -75,11 +75,11 @@ private static RowMapper<ParticipatingMemberData> createMemberFullDataRowMapper(
 
     private static RowMapper<MemberData> createMemberDataRowMapper() {
         return (resultSet, resultNumber) -> {
-            Long githubId = resultSet.getLong("github_id");
+            Long id = resultSet.getLong("id");
             String username = resultSet.getString("username");
             String imageUrl = resultSet.getString("image_url");
             String profileUrl = resultSet.getString("profile_url");
-            return new MemberData(githubId, username, imageUrl, profileUrl);
+            return new MemberData(id, username, imageUrl, profileUrl);
         };
     }
 }

backend/src/main/java/com/woowacourse/moamoa/member/query/data/MemberData.java

@@ -1,6 +1,5 @@
 package com.woowacourse.moamoa.member.query.data;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -15,8 +14,7 @@
 @ToString
 public class MemberData {
 
-    @JsonProperty("id")
-    private Long githubId;
+    private Long id;
 
     private String username;