Skip to content

[FIX] @CurrentUser를 @UserId로 변경 #315

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
merged 1 commit into from
Jan 21, 2025
Merged

[FIX] @CurrentUser를 @UserId로 변경 #315

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
3 changes: 2 additions & 1 deletion src/main/java/com/somemore/global/auth/jwt/controller/TokenExchangeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.somemore.global.auth.jwt.controller;

import com.somemore.global.auth.annotation.CurrentUser;
import com.somemore.global.auth.annotation.UserId;
import com.somemore.global.auth.jwt.domain.EncodedToken;
import com.somemore.global.auth.jwt.manager.TokenManager;
import com.somemore.global.common.response.ApiResponse;
Expand All @@ -23,7 +24,7 @@ public class TokenExchangeController {

@GetMapping("/exchange")
public ApiResponse<String> exchangeToken(
@CurrentUser UUID userId
@UserId UUID userId
) {
EncodedToken accessToken = tokenManager.getAccessTokenByUserId(userId);

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/somemore/global/auth/sign/out/SignOutController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.somemore.global.auth.sign.out;

import com.somemore.global.auth.annotation.CurrentUser;
import com.somemore.global.auth.annotation.UserId;
import com.somemore.global.common.response.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
Expand All @@ -22,7 +22,7 @@ public class SignOutController {
@PostMapping("/sign-out")
public ApiResponse<String> signOut(
HttpServletResponse response,
@CurrentUser UUID userId) {
@UserId UUID userId) {

signOutUseCase.signOut(response, userId);

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/somemore/global/sse/controller/SseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.somemore.global.sse.controller;

import com.somemore.global.auth.annotation.CurrentUser;
import com.somemore.global.auth.annotation.UserId;
import com.somemore.global.sse.usecase.SseUseCase;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
Expand All @@ -23,7 +23,7 @@ public class SseController {
@Secured({"ROLE_VOLUNTEER", "ROLE_CENTER"})
@GetMapping("/subscribe")
public SseEmitter subscribe(
@CurrentUser UUID userId) {
@UserId UUID userId) {

return sseUseCase.subscribe(userId);
}
Expand Down
Loading