refactor: memberService에서 인증관련 로직 분리

backend/README.md

@@ -51,7 +51,7 @@ backend
 │           │   │   ├── request
 │           │   │   └── response
 │           │   ├── service
-│           │   └── token
+│           │   └── jwtToken
 │           ├── common
 │           │   ├── annotation
 │           │   ├── aop

backend/src/main/java/com/ody/auth/JwtTokenProvider.java

@@ -1,6 +1,7 @@
 package com.ody.auth;
 
 import com.ody.auth.token.AccessToken;
+import com.ody.auth.token.JwtToken;
 import com.ody.auth.token.RefreshToken;
 import com.ody.common.exception.OdyBadRequestException;
 import com.ody.common.exception.OdyUnauthorizedException;
@@ -9,20 +10,18 @@
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.Jwts;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 @Getter
 @Component
+@RequiredArgsConstructor
 @EnableConfigurationProperties(AuthProperties.class)
 public class JwtTokenProvider {
 
     private final AuthProperties authProperties;
 
-    public JwtTokenProvider(AuthProperties authProperties) {
-        this.authProperties = authProperties;
-    }
-
     public AccessToken createAccessToken(long memberId) {
         return new AccessToken(memberId, authProperties);
     }
@@ -45,36 +44,17 @@ public long parseAccessToken(AccessToken accessToken) {
         }
     }
 
-    public void validate(AccessToken accessToken) {
-        if (!isUnexpired(accessToken)) {
-            throw new OdyUnauthorizedException("만료된 액세스 토큰입니다.");
-        }
-    }
-
-    public void validate(RefreshToken refreshToken) {
-        if (!isUnexpired(refreshToken)) {
-            throw new OdyUnauthorizedException("만료된 리프레시 토큰입니다.");
-        }
-    }
-
-    public boolean isUnexpired(AccessToken accessToken) {
-        try {
-            Jwts.parser()
-                    .setSigningKey(authProperties.getAccessKey())
-                    .parseClaimsJws(accessToken.getValue());
-            return true;
-        } catch (ExpiredJwtException exception) {
-            return false;
-        } catch (JwtException exception) {
-            throw new OdyBadRequestException(exception.getMessage());
+    public void validate(JwtToken jwtToken) {
+        if (!isUnexpired(jwtToken)) {
+            throw new OdyUnauthorizedException("만료된 토큰입니다.");
         }
     }
 
-    public boolean isUnexpired(RefreshToken refreshToken) {
+    public boolean isUnexpired(JwtToken jwtToken) {
         try {
             Jwts.parser()
-                    .setSigningKey(authProperties.getRefreshKey())
-                    .parseClaimsJws(refreshToken.getValue());
+                    .setSigningKey(jwtToken.getSecretKey(authProperties))
+                    .parseClaimsJws(jwtToken.getValue());
             return true;
         } catch (ExpiredJwtException exception) {
             return false;

backend/src/main/java/com/ody/auth/domain/Authorizer.java

@@ -0,0 +1,30 @@
+package com.ody.auth.domain;
+
+import com.ody.auth.domain.authpolicy.AuthPolicy;
+import com.ody.common.exception.OdyUnauthorizedException;
+import com.ody.member.domain.Member;
+import java.util.List;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+@Component
+@RequiredArgsConstructor
+public class Authorizer {
+
+    private final List<AuthPolicy> authPolicies;
+
+    @Transactional
+    public Member authorize(
+            Optional<Member> sameDeviceMember,
+            Optional<Member> samePidMember,
+            Member requestMember
+    ) {
+        return authPolicies.stream()
+                .filter(type -> type.match(sameDeviceMember, samePidMember, requestMember))
+                .findAny()
+                .orElseThrow(() -> new OdyUnauthorizedException("잘못된 인증 요청입니다."))
+                .authorize(sameDeviceMember, samePidMember, requestMember);
+    }
+}

backend/src/main/java/com/ody/auth/domain/authpolicy/AuthPolicy.java

@@ -0,0 +1,19 @@
+package com.ody.auth.domain.authpolicy;
+
+import com.ody.member.domain.Member;
+import java.util.Optional;
+
+public interface AuthPolicy {
+
+    boolean match(
+            Optional<Member> sameDeviceMember,
+            Optional<Member> sameProviderIdMember,
+            Member requestMember
+    );
+
+    Member authorize(
+            Optional<Member> sameDeviceMember,
+            Optional<Member> sameProviderIdMember,
+            Member requestMember
+    );
+}

backend/src/main/java/com/ody/auth/domain/authpolicy/ExistingUserForExistingDevice.java

@@ -0,0 +1,21 @@
+package com.ody.auth.domain.authpolicy;
+
+import com.ody.member.domain.Member;
+import java.util.Optional;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ExistingUserForExistingDevice implements AuthPolicy {
+
+    @Override
+    public boolean match(Optional<Member> sameDeviceMember, Optional<Member> sameProviderIdMember, Member requestMember) {
+        return sameDeviceMember.isPresent()
+                && sameProviderIdMember.isPresent()
+                && requestMember.isSame(sameDeviceMember.get());
+    }
+
+    @Override
+    public Member authorize(Optional<Member> sameDeviceMember, Optional<Member> sameProviderIdMember, Member requestMember) {
+        return sameProviderIdMember.get();
+    }
+}

backend/src/main/java/com/ody/auth/domain/authpolicy/ExistingUserForNewDevice.java

@@ -0,0 +1,26 @@
+package com.ody.auth.domain.authpolicy;
+
+import com.ody.member.domain.Member;
+import java.util.Optional;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ExistingUserForNewDevice implements AuthPolicy {
+
+    @Override
+    public boolean match(
+            Optional<Member> sameDeviceMember,
+            Optional<Member> sameProviderIdMember,
+            Member requestMember
+    ) {
+        return sameDeviceMember.isEmpty()
+                && sameProviderIdMember.isPresent();
+    }
+
+    @Override
+    public Member authorize(Optional<Member> sameDeviceMember, Optional<Member> sameProviderIdMember, Member requestMember) {
+        Member sameAuthProviderMember = sameProviderIdMember.get();
+        sameAuthProviderMember.updateDeviceToken(requestMember.getDeviceToken());
+        return sameAuthProviderMember;
+    }
+}

backend/src/main/java/com/ody/auth/domain/authpolicy/NewUserForExistingDevice.java

@@ -0,0 +1,29 @@
+package com.ody.auth.domain.authpolicy;
+
+import com.ody.member.domain.Member;
+import java.util.Optional;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NewUserForExistingDevice implements AuthPolicy {
+
+    @Override
+    public boolean match(
+            Optional<Member> sameDeviceMember,
+            Optional<Member> sameProviderIdMember,
+            Member requestMember
+    ) {
+        return sameDeviceMember.isPresent()
+                && sameProviderIdMember.isEmpty();
+    }
+
+    @Override
+    public Member authorize(
+            Optional<Member> sameDeviceMember,
+            Optional<Member> sameProviderIdMember,
+            Member requestMember
+    ) {
+        sameDeviceMember.get().updateDeviceTokenNull();
+        return requestMember;
+    }
+}

backend/src/main/java/com/ody/auth/domain/authpolicy/NewUserForNewDevice.java

@@ -0,0 +1,28 @@
+package com.ody.auth.domain.authpolicy;
+
+import com.ody.member.domain.Member;
+import java.util.Optional;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NewUserForNewDevice implements AuthPolicy {
+
+    @Override
+    public boolean match(
+            Optional<Member> sameDeviceMember,
+            Optional<Member> sameProviderIdMember,
+            Member requestMember
+    ) {
+        return sameDeviceMember.isEmpty()
+                && sameProviderIdMember.isEmpty();
+    }
+
+    @Override
+    public Member authorize(
+            Optional<Member> sameDeviceMember,
+            Optional<Member> sameProviderIdMember,
+            Member requestMember
+    ) {
+        return requestMember;
+    }
+}

backend/src/main/java/com/ody/auth/domain/authpolicy/OtherUserForExistingDevice.java

@@ -0,0 +1,31 @@
+package com.ody.auth.domain.authpolicy;
+
+import com.ody.member.domain.Member;
+import java.util.Optional;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OtherUserForExistingDevice implements AuthPolicy {
+
+    @Override
+    public boolean match(
+            Optional<Member> sameDeviceMember,
+            Optional<Member> sameProviderIdMember,
+            Member requestMember
+    ) {
+        return sameDeviceMember.isPresent()
+                && sameProviderIdMember.isPresent()
+                && !requestMember.isSame(sameDeviceMember.get());
+    }
+
+    @Override
+    public Member authorize(
+            Optional<Member> sameDeviceMember,
+            Optional<Member> sameProviderIdMember,
+            Member requestMember
+    ) {
+        sameDeviceMember.get().updateDeviceTokenNull();
+        sameProviderIdMember.get().updateDeviceToken(requestMember.getDeviceToken());
+        return sameProviderIdMember.get();
+    }
+}

backend/src/main/java/com/ody/auth/service/AuthService.java

@@ -2,25 +2,28 @@
 
 import com.ody.auth.JwtTokenProvider;
 import com.ody.auth.domain.AuthorizationHeader;
+import com.ody.auth.domain.Authorizer;
 import com.ody.auth.dto.request.AuthRequest;
 import com.ody.auth.dto.response.AuthResponse;
 import com.ody.auth.token.AccessToken;
 import com.ody.auth.token.RefreshToken;
 import com.ody.common.exception.OdyBadRequestException;
 import com.ody.member.domain.Member;
 import com.ody.member.service.MemberService;
-import lombok.AllArgsConstructor;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
 @Service
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class AuthService {
 
     private final JwtTokenProvider jwtTokenProvider;
     private final MemberService memberService;
+    private final Authorizer authorizer;
 
     public Member parseAccessToken(String rawAccessToken) {
         AccessToken accessToken = new AccessToken(rawAccessToken);
@@ -31,8 +34,16 @@ public Member parseAccessToken(String rawAccessToken) {
 
     @Transactional
     public AuthResponse issueTokens(AuthRequest authRequest) {
-        Member member = memberService.save(authRequest.toMember());
-        return issueNewTokens(member.getId());
+        Member requestMember = authRequest.toMember();
+        Member authorizedMember = findAuthroizedMember(requestMember);
+        Member savedAuthorizedMember = memberService.save(authorizedMember) ;
+        return issueNewTokens(savedAuthorizedMember.getId());
+    }
+
+    private Member findAuthroizedMember(Member requestMember) {
+        Optional<Member> sameDeviceMember = memberService.findByDeviceToken(requestMember.getDeviceToken());
+        Optional<Member> samePidMember = memberService.findByAuthProvider(requestMember.getAuthProvider());
+        return authorizer.authorize(sameDeviceMember, samePidMember, requestMember);
     }
 
     @Transactional
@@ -69,7 +80,6 @@ private AuthResponse issueNewTokens(long memberId) {
     public void logout(String rawAccessTokenValue) {
         AccessToken accessToken = new AccessToken(rawAccessTokenValue);
         jwtTokenProvider.validate(accessToken);
-
         long memberId = jwtTokenProvider.parseAccessToken(accessToken);
         memberService.updateRefreshToken(memberId, null);
     }

backend/src/main/java/com/ody/auth/token/AccessToken.java

@@ -8,10 +8,9 @@
 import lombok.Getter;
 
 @Getter
-public class AccessToken {
+public class AccessToken implements JwtToken {
 
     private static final String ACCESS_TOKEN_PREFIX = "Bearer access-token=";
-    public static final String DELIMITER = " ";
 
     private final String value;
 
@@ -38,4 +37,9 @@ private void validate(String value) {
     private String parseAccessToken(String rawValue) {
         return rawValue.substring(ACCESS_TOKEN_PREFIX.length()).trim();
     }
+
+    @Override
+    public String getSecretKey(AuthProperties authProperties) {
+        return authProperties.getAccessKey();
+    }
 }

backend/src/main/java/com/ody/auth/token/JwtToken.java

@@ -0,0 +1,10 @@
+package com.ody.auth.token;
+
+import com.ody.auth.AuthProperties;
+
+public interface JwtToken {
+
+    String getSecretKey(AuthProperties authProperties);
+
+    String getValue();
+}

backend/src/main/java/com/ody/auth/token/RefreshToken.java

@@ -15,7 +15,7 @@
 @Getter
 @Embeddable
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class RefreshToken {
+public class RefreshToken implements JwtToken {
 
     public static final String REFRESH_TOKEN_PREFIX = "refresh-token=";
 
@@ -45,6 +45,11 @@ public RefreshToken(AuthProperties authProperties) {
                 .compact();
     }
 
+    @Override
+    public String getSecretKey(AuthProperties authProperties) {
+        return authProperties.getRefreshKey();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

backend/src/main/java/com/ody/member/domain/Member.java

@@ -58,8 +58,8 @@ public boolean isLogout() {
         return this.refreshToken == null;
     }
 
-    public boolean isSame(AuthProvider otherAuthProvider) {
-        return this.authProvider.equals(otherAuthProvider);
+    public boolean isSame(Member otherMember) {
+        return this.authProvider.equals(otherMember.getAuthProvider());
     }
 
     public void updateRefreshToken(RefreshToken refreshToken) {