Skip to content

Commit 33c6d8a

Browse files
authored
Merge pull request #337 from EAT-SSU/chore/#336-login-v2
chore: Login V2๊ด€๋ จ ์กฐ๊ฑด๋ฌธ๊ณผ ์ฃผ์„ ๋ณ€๊ฒฝ
1 parent eb28077 commit 33c6d8a

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

โ€Žsrc/main/java/ssu/eatssu/domain/auth/service/OAuthService.javaโ€Ž

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ public Tokens kakaoLoginV2(KakaoLoginRequestV2 request) {
4646
User user = userRepository.findByProviderId(request.providerId())
4747
.orElseGet(() -> userService.joinV2(request.email(), KAKAO, request.providerId(),request.deviceType()));
4848

49-
if (user.getDeviceType() == null) {
50-
user.updateDeviceType(request.deviceType());
51-
}
49+
user.updateDeviceType(request.deviceType());
50+
5251

5352
return generateOauthJwtTokens(user.getEmail(), KAKAO, request.providerId());
5453
}
@@ -76,9 +75,7 @@ public Tokens appleLoginV2(AppleLoginRequestV2 request) {
7675

7776
updateAppleUserEmail(user, oAuthInfo.email());
7877

79-
if (user.getDeviceType() == null) {
80-
user.updateDeviceType(request.deviceType());
81-
}
78+
user.updateDeviceType(request.deviceType());
8279

8380
return generateOauthJwtTokens(user.getEmail(), APPLE, oAuthInfo.providerId());
8481
}

โ€Žsrc/main/java/ssu/eatssu/domain/user/entity/User.javaโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,6 @@ public void updateDepartment(Department department) {
123123
this.department = department;
124124
}
125125

126-
// ํšŒ์› ๊ฐ€์ž… v2 ๋งˆ์ด๊ทธ๋ ˆ์ด์…˜์„ ์œ„ํ•œ ๋ฉ”์„œ๋“œ (์›๋ž˜๋Š” ๊ฐ€์ž…์‹œ DeviceType์„ ๋ฐ›์•„์•ผ ํ•ฉ๋‹ˆ๋‹ค.)
126+
// ์ถ”ํ›„์— ๊ธฐ์ข…์ด ๋ฐ”๋€Œ๋”๋ผ๋„ ์—…๋ฐ์ดํŠธํ•ฉ๋‹ˆ๋‹ค. + V1-> V2 ๋งˆ์ด๊ทธ๋ ˆ์ด์…˜์„ ์ˆ˜ํ–‰ํ•˜๋Š” ์—ญํ• ์„ ํ•˜๊ธฐ๋„ ํ•ฉ๋‹ˆ๋‹ค.
127127
public void updateDeviceType(DeviceType deviceType) { this.deviceType = deviceType; }
128128
}

0 commit comments

Comments
ย (0)