Merge pull request #147 from team-offonoff/auth-joined

회원가입이 완료된 소셜 회원은 로그인 요청시에 `access_token` 발급
team-offonoff · Jan 26, 2024 · 5465a70 · 5465a70
2 parents a2701a6 + 50594d0
commit 5465a70
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/src/docs/asciidoc/oauth.adoc b/src/docs/asciidoc/oauth.adoc
@@ -36,3 +36,7 @@ operation::o-auth-controller-test/oauth_kakao_existing_member_by_id-token[snippe
 #### E1. 탈퇴한 회원
 
 operation::o-auth-controller-test/oauth_kakao_deactivated_member_by_id-token[snippets="http-request,http-response"]
+
+#### E2. 정보 미등록 회원
+
+operation::o-auth-controller-test/oauth_kakao_not_completety_joined_member_by_id-token[snippets="http-request,http-response"]
diff --git a/src/main/java/life/offonoff/ab/application/service/auth/OAuthService.java b/src/main/java/life/offonoff/ab/application/service/auth/OAuthService.java
@@ -57,6 +57,7 @@ private OAuthSignInResponse loginOAuthProfile(OAuthProfile oAuthProfile) {
 
         return new OAuthSignInResponse(false,
                                         response.getMemberId(),
-                                        response.getJoinStatus());
+                                        response.getJoinStatus(),
+                                        response.getAccessToken());
     }
 }
diff --git a/src/main/java/life/offonoff/ab/web/response/oauth/OAuthSignInResponse.java b/src/main/java/life/offonoff/ab/web/response/oauth/OAuthSignInResponse.java
@@ -6,7 +6,10 @@
 @Getter
 public class OAuthSignInResponse extends OAuthResponse {
 
-    public OAuthSignInResponse(Boolean newMember, Long memberId, JoinStatus joinStatus) {
+    private String accessToken;
+
+    public OAuthSignInResponse(Boolean newMember, Long memberId, JoinStatus joinStatus, String accessToken) {
         super(newMember, memberId, joinStatus);
+        this.accessToken = accessToken;
     }
 }
diff --git a/src/main/java/life/offonoff/ab/web/response/oauth/OAuthSignUpResponse.java b/src/main/java/life/offonoff/ab/web/response/oauth/OAuthSignUpResponse.java
@@ -1,7 +1,9 @@
 package life.offonoff.ab.web.response.oauth;
 
 import life.offonoff.ab.domain.member.JoinStatus;
+import lombok.Getter;
 
+@Getter
 public class OAuthSignUpResponse extends OAuthResponse {
 
     public OAuthSignUpResponse(Boolean newMember, Long memberId, JoinStatus joinStatus) {

diff --git a/src/test/java/life/offonoff/ab/web/OAuthControllerTest.java b/src/test/java/life/offonoff/ab/web/OAuthControllerTest.java
@@ -5,6 +5,7 @@
 import life.offonoff.ab.application.service.request.oauth.OAuthRequest;
 import life.offonoff.ab.config.WebConfig;
 import life.offonoff.ab.domain.member.JoinStatus;
+import life.offonoff.ab.exception.IllegalJoinStatusException;
 import life.offonoff.ab.exception.MemberDeactivatedException;
 import life.offonoff.ab.restdocs.RestDocsTest;
 import life.offonoff.ab.util.token.JwtProvider;
@@ -21,6 +22,7 @@
 import static life.offonoff.ab.application.service.request.oauth.AuthorizeType.BY_CODE;
 import static life.offonoff.ab.application.service.request.oauth.AuthorizeType.BY_IDTOKEN;
 import static life.offonoff.ab.domain.member.JoinStatus.AUTH_REGISTERED;
+import static life.offonoff.ab.domain.member.JoinStatus.COMPLETE;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.when;
 import static org.springframework.restdocs.payload.PayloadDocumentation.*;
@@ -80,7 +82,7 @@ void oauth_kakao_existing_member_by_code() throws Exception {
         OAuthRequest request = new OAuthRequest(BY_CODE, "authorize_code", "redirect_uri", null);
 
         when(oAuthService.authorize(any()))
-                .thenReturn(new OAuthSignInResponse(false, 1L, AUTH_REGISTERED));
+                .thenReturn(new OAuthSignInResponse(false, 1L, COMPLETE, "access_token"));
 
         mvc.perform(post(OAuthUri.BASE + OAuthUri.KAKAO + OAuthUri.AUTHORIZE)
                         .contentType(MediaType.APPLICATION_JSON)
@@ -127,7 +129,7 @@ void oauth_kakao_existing_member_by_idToken() throws Exception {
         OAuthRequest request = new OAuthRequest(BY_IDTOKEN, null, null, "id_token");
 
         when(oAuthService.authorize(any()))
-                .thenReturn(new OAuthSignInResponse(false, 1L, AUTH_REGISTERED));
+                .thenReturn(new OAuthSignInResponse(false, 1L, COMPLETE, "access_token"));
 
         mvc.perform(post(OAuthUri.BASE + OAuthUri.KAKAO + OAuthUri.AUTHORIZE)
                         .contentType(MediaType.APPLICATION_JSON)
@@ -137,6 +139,21 @@ void oauth_kakao_existing_member_by_idToken() throws Exception {
                 .andDo(print());
     }
 
+    @Test
+    void oauth_kakao_not_completety_joined_member_by_idToken() throws Exception {
+        // given
+        OAuthRequest request = new OAuthRequest(BY_IDTOKEN, null, null, "id_token");
+
+        when(oAuthService.authorize(any()))
+                .thenThrow(new IllegalJoinStatusException(1L, AUTH_REGISTERED));
+
+        mvc.perform(post(OAuthUri.BASE + OAuthUri.KAKAO + OAuthUri.AUTHORIZE)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(new ObjectMapper().writeValueAsString(request)))
+                .andExpect(status().isBadRequest())
+                .andDo(print());
+    }
+
     @Test
     void oauth_kakao_deactivated_member_by_idToken() throws Exception {
         OAuthRequest request = new OAuthRequest(BY_IDTOKEN, null, null, "id_token");