Skip to content

Commit ac76dc5

Browse files
authored
Merge pull request #406 from teamterning/refactor/#403-login
[REFACTOR/#403] ๋กœ๊ทธ์ธ API ์ˆ˜์ •
2 parents 3dbef5b + 4bca14e commit ac76dc5

File tree

5 files changed

+18
-8
lines changed

5 files changed

+18
-8
lines changed

โ€Ždata/auth/src/main/java/com/terning/data/auth/dto/request/SignInRequestDto.ktโ€Ž

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ import kotlinx.serialization.Serializable
66
@Serializable
77
data class SignInRequestDto(
88
@SerialName("authType")
9-
val authType: String
10-
)
9+
val authType: String,
10+
@SerialName("fcmToken")
11+
val fcmToken: String,
12+
)

โ€Ždata/auth/src/main/java/com/terning/data/auth/mapper/SignInRequestMapper.ktโ€Ž

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ import com.terning.data.auth.dto.request.SignInRequestDto
44
import com.terning.domain.auth.entity.SignInRequest
55

66
fun SignInRequest.toSignInRequestDto(): SignInRequestDto =
7-
SignInRequestDto(authType = authType)
7+
SignInRequestDto(
8+
authType = authType,
9+
fcmToken = fcmToken
10+
)
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.terning.domain.auth.entity
22

33
data class SignInRequest(
4-
val authType: String
5-
)
4+
val authType: String,
5+
val fcmToken: String,
6+
)

โ€Žfeature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.ktโ€Ž

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,13 @@ class SignInViewModel @Inject constructor(
6262
accessToken: String,
6363
authType: String = KAKAO,
6464
) {
65+
userRepository.fetchAndSetFcmToken()
6566
authRepository.signIn(
6667
accessToken,
67-
SignInRequest(authType = authType)
68+
SignInRequest(
69+
authType = authType,
70+
fcmToken = userRepository.getFcmToken()
71+
)
6872
).onSuccess { response ->
6973
when {
7074
response.accessToken == null -> {

โ€Žgradle/libs.versions.tomlโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
compileSdk = "35"
33
minSdk = "28"
44
targetSdk = "35"
5-
versionName = "1.3.6"
6-
versionCode = "103060"
5+
versionName = "1.3.7"
6+
versionCode = "103070"
77
jvmTarget = "1.8"
88

99
## Android gradle plugin

0 commit comments

Comments
ย (0)