File tree Expand file tree Collapse file tree 5 files changed +33
-4
lines changed
main/java/timeeat/controller/auth Expand file tree Collapse file tree 5 files changed +33
-4
lines changed Original file line number Diff line number Diff line change @@ -31,10 +31,9 @@ public ResponseEntity<Void> redirectOauthLoginPage(@RequestHeader(HttpHeaders.OR
3131 .build ();
3232 }
3333
34- // TODO : login() ControllerTest, DocumentTest 수정
3534 @ PostMapping ("/api/auth/login" )
36- public ResponseEntity <LoginResponse > login (@ RequestBody LoginRequest request ,
37- @ RequestHeader ( HttpHeaders . ORIGIN ) String origin ) {
35+ public ResponseEntity <LoginResponse > login (@ RequestHeader ( HttpHeaders . ORIGIN ) String origin ,
36+ @ RequestBody LoginRequest request ) {
3837 MemberResponse member = authService .login (request , origin );
3938 TokenResponse token = new TokenResponse (
4039 jwtManager .issueAccessToken (member .id ()),
Original file line number Diff line number Diff line change @@ -82,4 +82,8 @@ protected final String refreshToken() {
8282 Member member = memberGenerator .generate (Long .toString (DEFAULT_OAUTH_MEMBER_INFO .socialId ()));
8383 return jwtManager .issueRefreshToken (member .getId ());
8484 }
85+
86+ protected final String oauthLoginSocialId () {
87+ return Long .toString (DEFAULT_OAUTH_MEMBER_INFO .socialId ());
88+ }
8589}
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ class RedirectOauthLoginPage {
4646 class Login {
4747
4848 @ Test
49- void 인가코드를_통해_로그인할_수_있다 () {
49+ void 인가코드를_통해_회원가입할_수_있다 () {
5050 LoginRequest request = new LoginRequest ("auth-code" );
5151
5252 LoginResponse response = given ().body (request )
@@ -63,6 +63,26 @@ class Login {
6363 () -> assertThat (response .information ().isSignUp ()).isTrue ()
6464 );
6565 }
66+
67+ @ Test
68+ void 인가코드를_통해_로그인할_수_있다 () {
69+ memberGenerator .generate (oauthLoginSocialId ());
70+ LoginRequest request = new LoginRequest ("auth-code" );
71+
72+ LoginResponse response = given ().body (request )
73+ .header (HttpHeaders .ORIGIN , allowedOrigin )
74+ .contentType (ContentType .JSON )
75+ .when ().post ("/api/auth/login" )
76+ .then ()
77+ .statusCode (201 )
78+ .extract ().as (LoginResponse .class );
79+
80+ assertAll (
81+ () -> assertThat (response .token ().accessToken ()).isNotBlank (),
82+ () -> assertThat (response .token ().refreshToken ()).isNotBlank (),
83+ () -> assertThat (response .information ().isSignUp ()).isFalse ()
84+ );
85+ }
6686 }
6787
6888 @ Nested
Original file line number Diff line number Diff line change @@ -70,6 +70,9 @@ class Login {
7070 RestDocsRequest requestDocument = request ()
7171 .tag (Tag .AUTH_API )
7272 .summary ("로그인" )
73+ .requestHeader (
74+ headerWithName (HttpHeaders .ORIGIN ).description ("요청 Origin" )
75+ )
7376 .requestBodyField (
7477 fieldWithPath ("code" ).type (STRING ).description ("Oauth 인가 코드" )
7578 );
Original file line number Diff line number Diff line change 1818import timeeat .document .BaseDocumentTest ;
1919import timeeat .document .RestDocsRequest ;
2020import timeeat .document .RestDocsResponse ;
21+ import timeeat .document .Tag ;
2122
2223public class MemberDocumentTest extends BaseDocumentTest {
2324
2425 @ Nested
2526 class updateMember {
2627
2728 RestDocsRequest requestDocument = request ()
29+ .tag (Tag .MEMBER_API )
30+ .summary ("회원 정보 수정" )
2831 .requestHeader (
2932 headerWithName (HttpHeaders .AUTHORIZATION ).description ("액세스 토큰" )
3033 ).requestBodyField (
You can’t perform that action at this time.
0 commit comments