Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v1.0.2 #163

Merged
merged 3 commits into from
Feb 26, 2024
Merged

v1.0.2 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
048d78c
fix: 레퍼러 없이 온보딩 페이지로 리다이렉트하도록 설정 (#158)
uwoobeat Feb 26, 2024
17b42ba
feat: 소셜 로그인 후 헤더로 엑세스 토큰 발급하는 임시 로직 추가 (#161)
uwoobeat Feb 26, 2024
eaf02cc
fix: 도커 컴포즈 실행 명령 수정 (#162)
Sangwook02 Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/production_build_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,5 +138,5 @@ jobs:
aws s3 cp ${{ env.S3_COPY_PATH }} docker-compose.yml
echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
docker pull ${{ env.IMAGE_FULL_URL }}
docker compose up -d
docker-compose up -d
docker image prune -a -f
1 change: 1 addition & 0 deletions src/main/java/com/gdschongik/gdsc/global/common/constant/SecurityConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ public class SecurityConstant {
public static final String TOKEN_ROLE_NAME = "role";
public static final String GITHUB_NAME_ATTR_KEY = "id";
public static final String ACCESS_TOKEN_HEADER_PREFIX = "Bearer ";
public static final String ACCESS_TOKEN_HEADER_NAME = "Authorization";

private SecurityConstant() {}
}
6 changes: 5 additions & 1 deletion src/main/java/com/gdschongik/gdsc/global/security/CustomSuccessHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,12 @@ public void onAuthenticationSuccess(
RefreshTokenDto refreshTokenDto = jwtService.createRefreshToken(oAuth2User.getMemberId());
cookieUtil.addTokenCookies(response, accessTokenDto.tokenValue(), refreshTokenDto.tokenValue());

// 임시로 헤더에 엑세스 토큰 추가
response.addHeader(ACCESS_TOKEN_HEADER_NAME, ACCESS_TOKEN_HEADER_PREFIX + accessTokenDto.tokenValue());

// 랜딩 상태를 파라미터로 추가하여 리다이렉트
String baseUrl = determineTargetUrl(request, response);
// String baseUrl = determineTargetUrl(request, response);
String baseUrl = PROD_CLIENT_URL + "/";
String redirectUrl = String.format(
SOCIAL_LOGIN_REDIRECT_URL,
baseUrl,
Expand Down
Loading