Skip to content

Commit e5511d6

Browse files
committed
feat: email claim이 없는 경우에도 정상 처리한다.
1 parent 3f52f02 commit e5511d6

3 files changed

Lines changed: 3 additions & 6 deletions

File tree

src/main/java/com/moneymong/domain/user/service/UserFacadeService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ public class UserFacadeService {
2424

2525
public LoginSuccessResponse login(LoginRequest loginRequest) {
2626
OAuthUserDataResponse oAuthUserData = oAuthService.login(loginRequest);
27-
2827
OAuthUserInfo oAuthUserInfo = OAuthUserInfo.from(oAuthUserData);
29-
3028
AuthUserInfo registerResult = userService.getOrRegister(oAuthUserInfo);
3129

3230
Tokens tokens = tokenService.createTokens(registerResult);

src/main/java/com/moneymong/global/security/oauth/handler/AppleService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ public OAuthUserDataResponse getOAuthUserData(OAuthUserDataRequest request) {
9595
AppleUserData.class
9696
);
9797

98-
assert userData != null;
99-
10098
String refreshToken = userData.getRefreshToken();
10199
String idToken = userData.getIdToken();
102100

@@ -180,7 +178,8 @@ private OAuthUserDataResponse decodePayload(String idToken, String nickname, Str
180178
Map<String, Claim> claims = decoded.getClaims();
181179

182180
String providerUid = decoded.getSubject();
183-
String email = claims.get("email").asString();
181+
Claim emailClaim = claims.get("email");
182+
String email = (emailClaim == null || emailClaim.isMissing() || emailClaim.isNull()) ? null : emailClaim.asString();
184183

185184
return OAuthUserDataResponse.builder()
186185
.provider(getAuthProvider().toString())

src/main/resources/application-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spring:
2222

2323
data:
2424
redis:
25-
host: localhost
25+
host: moneymong-redis
2626
port: 6379
2727
password: ${REDIS_PASSWORD}
2828

0 commit comments

Comments
 (0)