Skip to content

Commit

Permalink
[ALL] 무중단 배포 설정 추가 (#713)
Browse files Browse the repository at this point in the history
* [BE] 로그아웃 API 구현 (#710)

* feat: 로그아웃 시 토큰 삭제 구현

* test: 로그아웃 테스트 작성

* refactor: log를 남길 profile 추가

* refactor: 불필요한 변경사항 삭제

* refactor: 불필요한 테스트 삭제

Co-authored-by: Maru <[email protected]>
  • Loading branch information
yaho99 and chawani authored Oct 20, 2022
1 parent 116efee commit 24f9d48
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
import com.woowacourse.teatime.auth.service.AuthService;
import com.woowacourse.teatime.auth.service.LoginService;
import com.woowacourse.teatime.auth.service.UserAuthService;
import com.woowacourse.teatime.auth.support.UserAuthenticationPrincipal;
import com.woowacourse.teatime.auth.support.dto.UserRoleDto;
import com.woowacourse.teatime.util.AuthorizationExtractor;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -45,7 +43,7 @@ public ResponseEntity<LoginResponse> login(@Valid @RequestBody LoginRequest requ
public ResponseEntity<LoginResponse> loginV2(@Valid @RequestBody LoginRequest request,
HttpServletResponse response) {
UserAuthDto userAuthDto = loginService.login(request);
cookieTokenProvider.setCookie(response, userAuthDto.getRefreshToken());
cookieTokenProvider.set(response, userAuthDto.getRefreshToken());
return ResponseEntity.ok(LoginResponse.from(userAuthDto));
}

Expand All @@ -56,7 +54,7 @@ public ResponseEntity<RefreshAccessTokenResponse> generateToken(
HttpServletResponse response) {
String token = AuthorizationExtractor.extract(request);
GenerateTokenDto generateTokenDto = userAuthService.generateToken(cookie, token);
cookieTokenProvider.setCookie(response, generateTokenDto.getRefreshToken());
cookieTokenProvider.set(response, generateTokenDto.getRefreshToken());
return ResponseEntity.ok(new RefreshAccessTokenResponse(generateTokenDto.getAccessToken()));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public ResponseCookieTokenProvider(@Value("${refresh-token.expire-length}") Stri
this.expireLength = Long.parseLong(expireLength);
}

public void setCookie(HttpServletResponse response, String refreshToken) {
public void set(HttpServletResponse response, String refreshToken) {
ResponseCookie cookie = ResponseCookie.from("refreshToken", refreshToken)
.maxAge(expireLength)
.path("/")
Expand Down
42 changes: 40 additions & 2 deletions back/src/main/resources/logback-spring.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</root>
</springProfile>

<springProfile name="dev">
<springProfile name="dev1">
<include resource="logback/file-info-appender.xml"/>
<include resource="logback/dev-warn-appender.xml"/>
<include resource="logback/slack/dev-slack-alarm-appender.xml"/>
Expand All @@ -32,8 +32,46 @@
</logger>
</springProfile>

<springProfile name="dev2">
<include resource="logback/file-info-appender.xml"/>
<include resource="logback/dev-warn-appender.xml"/>
<include resource="logback/slack/dev-slack-alarm-appender.xml"/>

<logger name="com.woowacourse.teatime" level="INFO">
<appender-ref ref="FILE-INFO"/>
<appender-ref ref="DEV-WARN"/>
<appender-ref ref="DEV_ASYNC_SLACK"/>
</logger>

<logger name="org.springframework" level="INFO">
<appender-ref ref="FILE-INFO"/>
<appender-ref ref="DEV-WARN"/>
<appender-ref ref="DEV_ASYNC_SLACK"/>
</logger>
</springProfile>

<springProfile name="prod1">
<include resource="logback/file-info-appender.xml"/>
<include resource="logback/prod-warn-appender.xml"/>
<include resource="logback/file-error-appender.xml"/>
<include resource="logback/slack/prod-slack-alarm-appender.xml"/>

<logger name="com.woowacourse.teatime" level="INFO">
<appender-ref ref="FILE-INFO"/>
<appender-ref ref="PROD-WARN"/>
<appender-ref ref="FILE-ERROR"/>
<appender-ref ref="PROD_ASYNC_SLACK"/>
</logger>

<logger name="org.springframework" level="INFO">
<appender-ref ref="FILE-INFO"/>
<appender-ref ref="PROD-WARN"/>
<appender-ref ref="FILE-ERROR"/>
<appender-ref ref="PROD_ASYNC_SLACK"/>
</logger>
</springProfile>

<springProfile name="prod">
<springProfile name="prod2">
<include resource="logback/file-info-appender.xml"/>
<include resource="logback/prod-warn-appender.xml"/>
<include resource="logback/file-error-appender.xml"/>
Expand Down

0 comments on commit 24f9d48

Please sign in to comment.