Skip to content

Commit b15d7fa

Browse files
committed
Fix: 토큰으로 유저 조회 GRPC
1 parent 97095e7 commit b15d7fa

4 files changed

Lines changed: 118 additions & 114 deletions

File tree

‎src/main/java/flipnote/user/application/AuthService.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ public TokenValidateResult validateToken(String token) {
151151
}
152152
});
153153

154-
findActiveUser(claims.userId());
155-
156154
return new TokenValidateResult(claims.userId(), claims.email(), claims.role());
157155
}
158156

‎src/main/java/flipnote/user/application/UserService.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
import flipnote.image.grpc.v1.Type;
1515
import flipnote.user.application.command.UpdateProfileCommand;
1616
import flipnote.user.application.result.MyInfoResult;
17+
import flipnote.user.application.result.TokenValidateResult;
1718
import flipnote.user.application.result.UserInfoResult;
1819
import flipnote.user.application.result.UserResult;
1920
import flipnote.user.application.result.UserUpdateResult;
20-
import flipnote.user.domain.AuthErrorCode;
2121
import flipnote.user.domain.ImageErrorCode;
22-
import flipnote.user.domain.TokenClaims;
2322
import flipnote.user.domain.UserErrorCode;
2423
import flipnote.user.domain.common.BizException;
2524
import flipnote.user.domain.entity.User;
@@ -38,6 +37,7 @@ public class UserService {
3837
private final UserRepository userRepository;
3938
private final SessionInvalidationRepository sessionInvalidationRepository;
4039
private final JwtProvider jwtProvider;
40+
private final AuthService authService;
4141
private final ImageCommandServiceGrpc.ImageCommandServiceBlockingStub imageCommandServiceStub;
4242

4343
public MyInfoResult getMyInfo(Long userId) {
@@ -108,11 +108,8 @@ public Optional<UserResult> findActiveUserByEmail(String email) {
108108
}
109109

110110
public UserResult findUserByToken(String token) {
111-
if (!jwtProvider.isTokenValid(token)) {
112-
throw new BizException(AuthErrorCode.INVALID_TOKEN);
113-
}
114-
TokenClaims claims = jwtProvider.extractClaims(token);
115-
return UserResult.from(findActiveUser(claims.userId()));
111+
TokenValidateResult tokenResult = authService.validateToken(token);
112+
return UserResult.from(findActiveUser(tokenResult.userId()));
116113
}
117114

118115
private User findActiveUser(Long userId) {
Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,56 @@
11
package flipnote.user.interfaces.grpc;
22

3+
import org.springframework.grpc.server.exception.GrpcExceptionHandler;
4+
import org.springframework.stereotype.Component;
5+
36
import flipnote.user.domain.common.BizException;
47
import flipnote.user.domain.common.ErrorCode;
58
import io.grpc.Status;
69
import io.grpc.StatusException;
710
import io.grpc.StatusRuntimeException;
811
import lombok.extern.slf4j.Slf4j;
9-
import org.springframework.grpc.server.exception.GrpcExceptionHandler;
10-
import org.springframework.stereotype.Component;
1112

1213
@Slf4j
1314
@Component
1415
public class GrpcExceptionHandlerImpl implements GrpcExceptionHandler {
1516

16-
@Override
17-
public StatusException handleException(Throwable t) {
18-
if (t instanceof BizException e) {
19-
ErrorCode errorCode = e.getErrorCode();
20-
log.warn("gRPC BizException: code={}, status={}, message={}",
21-
errorCode.getCode(), errorCode.getStatus(), errorCode.getMessage());
22-
return toGrpcStatus(errorCode)
23-
.withDescription(errorCode.getMessage())
24-
.asException();
25-
}
26-
if (t instanceof StatusException e) {
27-
log.warn("gRPC StatusException: status={}, description={}",
28-
e.getStatus().getCode(), e.getStatus().getDescription());
29-
return e;
30-
}
31-
if (t instanceof StatusRuntimeException e) {
32-
log.warn("gRPC StatusRuntimeException: status={}, description={}",
33-
e.getStatus().getCode(), e.getStatus().getDescription());
34-
return e.getStatus().asException(e.getTrailers());
35-
}
36-
log.error("gRPC Unhandled exception", t);
37-
return Status.INTERNAL.withDescription("Internal server error").asException();
38-
}
17+
@Override
18+
public StatusException handleException(Throwable t) {
19+
switch (t) {
20+
case BizException e -> {
21+
ErrorCode errorCode = e.getErrorCode();
22+
log.warn("gRPC BizException: code={}, status={}, message={}",
23+
errorCode.getCode(), errorCode.getStatus(), errorCode.getMessage());
24+
return toGrpcStatus(errorCode)
25+
.withDescription(errorCode.getMessage())
26+
.asException();
27+
}
28+
case StatusException e -> {
29+
log.warn("gRPC StatusException: status={}, description={}",
30+
e.getStatus().getCode(), e.getStatus().getDescription());
31+
return e;
32+
}
33+
case StatusRuntimeException e -> {
34+
log.warn("gRPC StatusRuntimeException: status={}, description={}",
35+
e.getStatus().getCode(), e.getStatus().getDescription());
36+
return e.getStatus().asException(e.getTrailers());
37+
}
38+
default -> {
39+
}
40+
}
41+
log.error("gRPC Unhandled exception", t);
42+
return Status.INTERNAL.withDescription("Internal server error").asException();
43+
}
3944

40-
private Status toGrpcStatus(ErrorCode errorCode) {
41-
return switch (errorCode.getStatus()) {
42-
case 400 -> Status.INVALID_ARGUMENT;
43-
case 401 -> Status.UNAUTHENTICATED;
44-
case 403 -> Status.PERMISSION_DENIED;
45-
case 404 -> Status.NOT_FOUND;
46-
case 409 -> Status.ALREADY_EXISTS;
47-
case 429 -> Status.RESOURCE_EXHAUSTED;
48-
default -> Status.INTERNAL;
49-
};
50-
}
45+
private Status toGrpcStatus(ErrorCode errorCode) {
46+
return switch (errorCode.getStatus()) {
47+
case 400 -> Status.INVALID_ARGUMENT;
48+
case 401 -> Status.UNAUTHENTICATED;
49+
case 403 -> Status.PERMISSION_DENIED;
50+
case 404 -> Status.NOT_FOUND;
51+
case 409 -> Status.ALREADY_EXISTS;
52+
case 429 -> Status.RESOURCE_EXHAUSTED;
53+
default -> Status.INTERNAL;
54+
};
55+
}
5156
}

‎src/main/java/flipnote/user/interfaces/grpc/GrpcUserQueryService.java‎

Lines changed: 73 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.List;
44

5-
import org.springframework.stereotype.Service;
5+
import org.springframework.grpc.server.service.GrpcService;
66

77
import flipnote.user.application.UserService;
88
import flipnote.user.application.result.UserResult;
@@ -18,76 +18,80 @@
1818
import io.grpc.Status;
1919
import io.grpc.stub.StreamObserver;
2020
import lombok.RequiredArgsConstructor;
21+
import lombok.extern.slf4j.Slf4j;
2122

22-
@Service
23+
@GrpcService
2324
@RequiredArgsConstructor
25+
@Slf4j
2426
public class GrpcUserQueryService extends UserQueryServiceGrpc.UserQueryServiceImplBase {
2527

26-
private final UserService userService;
27-
28-
@Override
29-
public void getUser(GetUserRequest request, StreamObserver<GetUserResponse> responseObserver) {
30-
UserResult user = userService.findActiveUserById(request.getUserId())
31-
.orElseThrow(() -> Status.NOT_FOUND
32-
.withDescription("사용자를 찾을 수 없습니다.")
33-
.asRuntimeException());
34-
35-
responseObserver.onNext(toUserResponse(user));
36-
responseObserver.onCompleted();
37-
}
38-
39-
@Override
40-
public void getUsers(GetUsersRequest request, StreamObserver<GetUsersResponse> responseObserver) {
41-
List<Long> userIds = request.getUserIdsList();
42-
List<UserResult> users = userService.findActiveUsersByIds(userIds);
43-
44-
GetUsersResponse response = GetUsersResponse.newBuilder()
45-
.addAllUsers(users.stream().map(this::toUserResponse).toList())
46-
.build();
47-
48-
responseObserver.onNext(response);
49-
responseObserver.onCompleted();
50-
}
51-
52-
@Override
53-
public void getUserByEmail(GetUserByEmailRequest request, StreamObserver<GetUserByEmailResponse> responseObserver) {
54-
userService.findActiveUserByEmail(request.getEmail())
55-
.ifPresentOrElse(
56-
user -> responseObserver.onNext(
57-
GetUserByEmailResponse.newBuilder()
58-
.setExists(true)
59-
.setUser(toUserResponse(user))
60-
.build()
61-
),
62-
() -> responseObserver.onNext(
63-
GetUserByEmailResponse.newBuilder()
64-
.setExists(false)
65-
.build()
66-
)
67-
);
68-
69-
responseObserver.onCompleted();
70-
}
71-
72-
@Override
73-
public void getUserByToken(GetUserByTokenRequest request, StreamObserver<GetUserByTokenResponse> responseObserver) {
74-
UserResult user = userService.findUserByToken(request.getAccessToken());
75-
76-
responseObserver.onNext(
77-
GetUserByTokenResponse.newBuilder()
78-
.setUserId(user.id())
79-
.setNickname(user.nickname())
80-
.build()
81-
);
82-
responseObserver.onCompleted();
83-
}
84-
85-
private GetUserResponse toUserResponse(UserResult user) {
86-
return GetUserResponse.newBuilder()
87-
.setId(user.id())
88-
.setEmail(user.email())
89-
.setNickname(user.nickname())
90-
.setProfileImageUrl(user.profileImageUrl())
91-
.build();
92-
}
28+
private final UserService userService;
29+
30+
@Override
31+
public void getUser(GetUserRequest request, StreamObserver<GetUserResponse> responseObserver) {
32+
UserResult user = userService.findActiveUserById(request.getUserId())
33+
.orElseThrow(() -> Status.NOT_FOUND
34+
.withDescription("사용자를 찾을 수 없습니다.")
35+
.asRuntimeException());
36+
37+
responseObserver.onNext(toUserResponse(user));
38+
responseObserver.onCompleted();
39+
}
40+
41+
@Override
42+
public void getUsers(GetUsersRequest request, StreamObserver<GetUsersResponse> responseObserver) {
43+
List<Long> userIds = request.getUserIdsList();
44+
List<UserResult> users = userService.findActiveUsersByIds(userIds);
45+
46+
GetUsersResponse response = GetUsersResponse.newBuilder()
47+
.addAllUsers(users.stream().map(this::toUserResponse).toList())
48+
.build();
49+
50+
responseObserver.onNext(response);
51+
responseObserver.onCompleted();
52+
}
53+
54+
@Override
55+
public void getUserByEmail(GetUserByEmailRequest request, StreamObserver<GetUserByEmailResponse> responseObserver) {
56+
userService.findActiveUserByEmail(request.getEmail())
57+
.ifPresentOrElse(
58+
user -> responseObserver.onNext(
59+
GetUserByEmailResponse.newBuilder()
60+
.setExists(true)
61+
.setUser(toUserResponse(user))
62+
.build()
63+
),
64+
() -> responseObserver.onNext(
65+
GetUserByEmailResponse.newBuilder()
66+
.setExists(false)
67+
.build()
68+
)
69+
);
70+
71+
responseObserver.onCompleted();
72+
}
73+
74+
@Override
75+
public void getUserByToken(GetUserByTokenRequest request, StreamObserver<GetUserByTokenResponse> responseObserver) {
76+
log.debug("getUserByToken accessToken [{}]", request.getAccessToken());
77+
78+
UserResult user = userService.findUserByToken(request.getAccessToken());
79+
80+
responseObserver.onNext(
81+
GetUserByTokenResponse.newBuilder()
82+
.setUserId(user.id())
83+
.setNickname(user.nickname())
84+
.build()
85+
);
86+
responseObserver.onCompleted();
87+
}
88+
89+
private GetUserResponse toUserResponse(UserResult user) {
90+
return GetUserResponse.newBuilder()
91+
.setId(user.id())
92+
.setEmail(user.email())
93+
.setNickname(user.nickname())
94+
.setProfileImageUrl(user.profileImageUrl())
95+
.build();
96+
}
9397
}

0 commit comments

Comments
 (0)