Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ import kotlinx.serialization.Serializable
@Serializable
data class SignInRequestDto(
@SerialName("authType")
val authType: String
)
val authType: String,
@SerialName("fcmToken")
val fcmToken: String,
)
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ import com.terning.data.auth.dto.request.SignInRequestDto
import com.terning.domain.auth.entity.SignInRequest

fun SignInRequest.toSignInRequestDto(): SignInRequestDto =
SignInRequestDto(authType = authType)
SignInRequestDto(
authType = authType,
fcmToken = fcmToken
)
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.terning.domain.auth.entity

data class SignInRequest(
val authType: String
)
val authType: String,
val fcmToken: String,
)
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,13 @@ class SignInViewModel @Inject constructor(
accessToken: String,
authType: String = KAKAO,
) {
userRepository.fetchAndSetFcmToken()
authRepository.signIn(
accessToken,
SignInRequest(authType = authType)
SignInRequest(
authType = authType,
fcmToken = userRepository.getFcmToken()
)
).onSuccess { response ->
when {
response.accessToken == null -> {
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
compileSdk = "35"
minSdk = "28"
targetSdk = "35"
versionName = "1.3.6"
versionCode = "103060"
versionName = "1.3.7"
versionCode = "103070"
jvmTarget = "1.8"

## Android gradle plugin
Expand Down