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

Api-Release 1.0.6-3 #574

Merged
merged 3 commits into from
Dec 1, 2024
Merged

Api-Release 1.0.6-3 #574

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
6e165a4
fix : 카카오 콜백 url 에 // 중복으로 들어간 문제 해결
ImNM Dec 1, 2024
9000272
fix : docker-compose -> docker compose 사용
ImNM Dec 1, 2024
0eb2535
Merge pull request #573 from Gosrock/fix/kakao-redirect
ImNM Dec 1, 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/BuildApiServer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

#테스트 수행용 도커 컴포즈
- name: Start containers
run: docker-compose up -d
run: docker compose up -d

- name: Gradle Build
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BuildBatchServer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

#테스트 수행용 도커 컴포즈
- name: Start containers
run: docker-compose up -d
run: docker compose up -d

- name: Gradle Build
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BuildSocketServer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

#테스트 수행용 도커 컴포즈
- name: Start containers
run: docker-compose up -d
run: docker compose up -d

- name: Gradle Build
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: ./gradlew spotlessCheck

- name: Start containers
run: docker-compose up -d
run: docker compose up -d

- name: test and analyze
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev-merged-test-coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run: ./gradlew spotlessCheck

- name: Start containers
run: docker-compose up -d
run: docker compose up -d

- name: test and analyze
env:
Expand Down
22 changes: 11 additions & 11 deletions DuDoong-Api/src/main/java/band/gosrock/api/auth/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ public OauthLoginLinkResponse getKakaoOauthLink(
// 스테이징, prod 서버에 배포된 클라이언트에 해당
if (referer.contains(host)) {
log.info("/oauth/kakao" + host);
String format = String.format("https://%s/", host);
String format = String.format("https://%s", host);
if (referer.contains("admin")) {
// 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://두둥.com/admin/
return registerUseCase.getKaKaoOauthLink(format + "admin");
// 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://dudoong.com/admin
return registerUseCase.getKaKaoOauthLink(format + "/admin");
}
return registerUseCase.getKaKaoOauthLink(format);
} else if (referer.contains("5173")) {
// 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:5173/admin/
return registerUseCase.getKaKaoOauthLink(referer + "admin");
// 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:5173/admin
return registerUseCase.getKaKaoOauthLink(referer + "/admin");
}
// 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:3000/
// 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:3000
return registerUseCase.getKaKaoOauthLink(referer);
}

Expand All @@ -98,17 +98,17 @@ public OauthTokenResponse getCredentialFromKaKao(
// 스테이징, prod 서버에 배포된 클라이언트에 해당
if (referer.contains(host)) {
log.info("/oauth/kakao" + host);
String format = String.format("https://%s/", host);
String format = String.format("https://%s", host);
if (referer.contains("admin")) {
return registerUseCase.getCredentialFromKaKao(code, format + "admin");
return registerUseCase.getCredentialFromKaKao(code, format + "/admin");
}
return registerUseCase.getCredentialFromKaKao(code, format);
} else if (referer.contains("5173")) {
return registerUseCase.getCredentialFromKaKao(code, referer + "admin");
// 프론트 개발자가 로컬에서 어드민 테스트 할 때 해당 https://localhost:5173/admin
return registerUseCase.getCredentialFromKaKao(code, referer + "/admin");
}
// 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:3000/admin
return registerUseCase.getCredentialFromKaKao(code, referer);

// 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:3000/
}

@Operation(summary = "개발용 회원가입입니다 클라이언트가 몰라도 됩니다.", deprecated = true)
Expand Down