Skip to content

Refactor/#174 Google Ads OAuth 로그인 성공 시 상태코드 및 응답 수정 #175

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

Merged
jinnieusLab merged 2 commits into from
Jul 10, 2026
Merged

Refactor/#174 Google Ads OAuth 로그인 성공 시 상태코드 및 응답 수정 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e2bd7c
:recycle: refactor: Google Ads OAuth 로그인 성공 시 상태코드 및 응답 수정
jinnieusLab Jul 10, 2026
9208c0c
:memo: docs: Google Ads OAuth 로그인 Swagger 명세 수정
jinnieusLab Jul 10, 2026
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
13 changes: 4 additions & 9 deletions ...com/whereyouad/WhereYouAd/domains/advertisement/presentation/GoogleAdOAuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;

import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.util.UriComponentsBuilder;

import com.whereyouad.WhereYouAd.global.response.DataResponse;
import java.io.IOException;
import java.net.URI;
import java.util.Map;
import java.util.UUID;

@RestController
Expand All @@ -42,8 +43,7 @@ public class GoogleAdOAuthController implements GoogleAdOAuthDocs {

// 구글 연동 로그인 화면으로 리다이렉트
@GetMapping("/login")
public ResponseEntity<Void> redirectToGoogleAuth(@RequestParam("orgId") Long orgId, @AuthenticationPrincipal(expression = "userId") Long userId,
HttpServletResponse response) throws IOException {
public ResponseEntity<DataResponse<Map<String, String>>> redirectToGoogleAuth(@RequestParam("orgId") Long orgId, @AuthenticationPrincipal(expression = "userId") Long userId) {

String stateToken = UUID.randomUUID().toString();
String rawState = userId + "_" + orgId;
Expand All @@ -59,12 +59,7 @@ public ResponseEntity<Void> redirectToGoogleAuth(@RequestParam("orgId") Long org
"&prompt=consent" +
"&state=" + stateToken;

URI location = URI.create(authUrl);

return ResponseEntity
.status(HttpStatus.FOUND)
.location(location)
.build();
return ResponseEntity.ok(DataResponse.from(Map.of("redirectUrl", authUrl)));
}

@GetMapping("/callback")
Expand Down
6 changes: 3 additions & 3 deletions .../com/whereyouad/WhereYouAd/domains/advertisement/presentation/docs/GoogleAdOAuthDocs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.RequestParam;

import java.io.IOException;
import java.util.Map;

public interface GoogleAdOAuthDocs {

Expand All @@ -19,9 +20,8 @@ public interface GoogleAdOAuthDocs {
"인증이 완료되면 사전에 등록된 콜백(callback) URI로 인증 코드(code)와 상태 값(state)이 반환됩니다."
)
@GetMapping("/login")
ResponseEntity<Void> redirectToGoogleAuth(@Parameter @RequestParam("orgId") Long orgId,
@Parameter(hidden = true) @AuthenticationPrincipal(expression = "userId") Long userId,
HttpServletResponse response) throws IOException;
ResponseEntity<DataResponse<Map<String, String>>> redirectToGoogleAuth(@Parameter @RequestParam("orgId") Long orgId,
@Parameter(hidden = true) @AuthenticationPrincipal(expression = "userId") Long userId);

@Operation(
summary = "구글 OAuth 인증 콜백 및 리프레시 토큰 발급",
Expand Down
Loading