Skip to content

[CHORE] 운영 서버 최신화 #29

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
parkmineum merged 1 commit into from
May 17, 2025
Merged

[CHORE] 운영 서버 최신화 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 13 deletions src/main/java/com/example/hackathon/controller/TestController.java
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/main/java/com/example/hackathon/domain/activity/controller/ActivityController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public Response<List<ActivityResponseDto>> getTodayMissionActivities(@AuthUser L
);
}

@Operation(summary = "유저의 활동 내역을 추가하는 API", description = "유저의 활동 내역을 추가합니다.")
@PostMapping("/user/activities")
public Response<Void> addUserActivities(
@AuthUser Long userId,
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/example/hackathon/global/auth/controller/OAuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.example.hackathon.global.auth.service.KakaoOAuthService;
import com.example.hackathon.global.response.Response;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
Expand All @@ -18,6 +19,10 @@ public OAuthController(KakaoOAuthService kakaoOAuthService) {
this.kakaoOAuthService = kakaoOAuthService;
}

@Operation(
summary = "카카오 로그인 콜백 API",
description = "카카오 OAuth 인증 후 리디렉션되는 콜백 엔드포인트입니다. 인가 코드를 통해 JWT 토큰을 반환합니다."
)
@GetMapping("/kakao/callback")
public Response<?> kakaoLogin(@RequestParam("code") String code) {
String jwtToken = kakaoOAuthService.loginWithKakao(code);
Expand Down