[MERGE] #113 -> develop

[FIX/#113] 소셜로그인 서버 수정사항 반영
Genti2024 · Aug 18, 2024 · 84134b3 · 84134b3
2 parents 24a196d + 709c325
commit 84134b3
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 28 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -19,6 +19,10 @@ object AndroidXDependencies {
     const val legacy = "androidx.legacy:legacy-support-v4:${Versions.legacySupportVersion}"
     const val security = "androidx.security:security-crypto:${Versions.securityVersion}"
 
+    const val navigationFragment =
+        "androidx.navigation:navigation-fragment-ktx:${Versions.navigationVersion}"
+    const val navigationUi = "androidx.navigation:navigation-ui-ktx:${Versions.navigationVersion}"
+
     const val lifeCycleKtx = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycleVersion}"
     const val lifecycleJava8 =
         "androidx.lifecycle:lifecycle-common-java8:${Versions.lifecycleVersion}"

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -15,6 +15,7 @@ object Versions {
     const val securityVersion = "1.1.0-alpha06"
     const val hiltVersion = "2.46.1"
     const val fragmentKtxVersion = "1.5.7"
+    const val navigationVersion = "2.7.7"
     const val coroutinesAndroidVersion = "1.7.1"
     const val lifecycleVersion = "2.6.1"
     const val ossPluginVersion = "0.10.4"

diff --git a/data/src/main/java/kr/genti/data/dto/request/AuthRequestDto.kt b/data/src/main/java/kr/genti/data/dto/request/AuthRequestDto.kt
@@ -6,12 +6,10 @@ import kr.genti.domain.entity.request.AuthRequestModel
 
 @Serializable
 data class AuthRequestDto(
-    @SerialName("token")
-    val token: String,
-    @SerialName("oauthPlatform")
-    val oauthPlatform: String,
+    @SerialName("accessToken")
+    val accessToken: String,
 ) {
     companion object {
-        fun AuthRequestModel.toDto() = AuthRequestDto(token, oauthPlatform)
+        fun AuthRequestModel.toDto() = AuthRequestDto(accessToken)
     }
 }
diff --git a/data/src/main/java/kr/genti/data/dto/request/SignupRequestDto.kt b/data/src/main/java/kr/genti/data/dto/request/SignupRequestDto.kt
@@ -6,12 +6,12 @@ import kr.genti.domain.entity.request.SignupRequestModel
 
 @Serializable
 data class SignupRequestDto(
-    @SerialName("birthDate")
-    val birthDate: String,
+    @SerialName("birthYear")
+    val birthYear: String,
     @SerialName("sex")
     val sex: String,
 ) {
     companion object {
-        fun SignupRequestModel.toDto() = SignupRequestDto(birthDate, sex)
+        fun SignupRequestModel.toDto() = SignupRequestDto(birthYear, sex)
     }
 }
diff --git a/data/src/main/java/kr/genti/data/dto/response/SignUpUserDto.kt b/data/src/main/java/kr/genti/data/dto/response/SignUpUserDto.kt
@@ -12,10 +12,10 @@ data class SignUpUserDto(
     val lastLoginOauthPlatform: String,
     @SerialName("nickname")
     val nickname: String,
-    @SerialName("birthDate")
-    val birthDate: String,
+    @SerialName("birthYear")
+    val birthYear: String,
     @SerialName("sex")
     val sex: String,
 ) {
-    fun toModel() = SignUpUserModel(email, lastLoginOauthPlatform, nickname, birthDate, sex)
+    fun toModel() = SignUpUserModel(email, lastLoginOauthPlatform, nickname, birthYear, sex)
 }
diff --git a/data/src/main/java/kr/genti/data/service/AuthService.kt b/data/src/main/java/kr/genti/data/service/AuthService.kt
@@ -14,7 +14,7 @@ interface AuthService {
         @Body request: ReissueRequestDto,
     ): BaseResponse<ReissueTokenDto>
 
-    @POST("auth/v1/login/oauth2/token")
+    @POST("auth/v1/login/oauth2/token/kakao")
     suspend fun postOauthDataToGetToken(
         @Body request: AuthRequestDto,
     ): BaseResponse<AuthTokenDto>

diff --git a/domain/src/main/kotlin/kr/genti/domain/entity/request/AuthRequestModel.kt b/domain/src/main/kotlin/kr/genti/domain/entity/request/AuthRequestModel.kt
@@ -1,6 +1,5 @@
 package kr.genti.domain.entity.request
 
 data class AuthRequestModel(
-    val token: String,
-    val oauthPlatform: String,
+    val accessToken: String,
 )
diff --git a/domain/src/main/kotlin/kr/genti/domain/entity/request/SignupRequestModel.kt b/domain/src/main/kotlin/kr/genti/domain/entity/request/SignupRequestModel.kt
@@ -1,6 +1,6 @@
 package kr.genti.domain.entity.request
 
 data class SignupRequestModel(
-    val birthDate: String,
+    val birthYear: String,
     val sex: String,
 )
diff --git a/domain/src/main/kotlin/kr/genti/domain/entity/response/SignUpUserModel.kt b/domain/src/main/kotlin/kr/genti/domain/entity/response/SignUpUserModel.kt
@@ -4,6 +4,6 @@ data class SignUpUserModel(
     val email: String,
     val lastLoginOauthPlatform: String,
     val nickname: String,
-    val birthDate: String,
+    val birthYear: String,
     val sex: String,
 )
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,8 +17,6 @@ androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "j
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
-androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
-androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigationUiKtx" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }

diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
@@ -52,6 +52,8 @@ dependencies {
         implementation(appCompat)
         implementation(constraintLayout)
         implementation(fragment)
+        implementation(navigationFragment)
+        implementation(navigationUi)
         implementation(startup)
         implementation(legacy)
         implementation(security)
@@ -68,9 +70,9 @@ dependencies {
         kapt(hiltWorkManagerCompiler)
     }
 
-    implementation(MaterialDesignDependencies.materialDesign)
-    implementation(libs.androidx.navigation.fragment.ktx)
-    implementation(libs.androidx.navigation.ui.ktx)
+    MaterialDesignDependencies.run {
+        implementation(materialDesign)
+    }
 
     TestDependencies.run {
         testImplementation(jUnit)

diff --git a/presentation/src/main/java/kr/genti/presentation/auth/login/LoginViewModel.kt b/presentation/src/main/java/kr/genti/presentation/auth/login/LoginViewModel.kt
@@ -62,7 +62,7 @@ class LoginViewModel
 
         private fun changeTokenFromServer(accessToken: String) {
             viewModelScope.launch {
-                authRepository.postOauthDataToGetToken(AuthRequestModel(accessToken, KAKAO))
+                authRepository.postOauthDataToGetToken(AuthRequestModel(accessToken))
                     .onSuccess {
                         with(userRepository) {
                             setTokens(it.accessToken, it.refreshToken)
@@ -75,8 +75,4 @@ class LoginViewModel
                     }
             }
         }
-
-        companion object {
-            const val KAKAO = "KAKAO"
-        }
     }
diff --git a/presentation/src/main/java/kr/genti/presentation/auth/signup/SignupActivity.kt b/presentation/src/main/java/kr/genti/presentation/auth/signup/SignupActivity.kt
@@ -103,7 +103,7 @@ class SignupActivity : BaseActivity<ActivitySignupBinding>(R.layout.activity_sig
             updateProperties("user_email", state.data.email)
             updateProperties("user_platform", state.data.lastLoginOauthPlatform)
             updateProperties("user_nickname", state.data.nickname)
-            updateProperties("user_birth_date", state.data.birthDate)
+            updateProperties("user_birth_year", state.data.birthYear)
             updateProperties("user_sex", state.data.sex)
             updateIntProperties("user_share", 0)
             updateIntProperties("user_picturedownload", 0)

diff --git a/presentation/src/main/java/kr/genti/presentation/auth/signup/SignupViewModel.kt b/presentation/src/main/java/kr/genti/presentation/auth/signup/SignupViewModel.kt
@@ -51,7 +51,7 @@ class SignupViewModel
             checkAllSelected()
         }
 
-        fun checkAllSelected() {
+        private fun checkAllSelected() {
             isAllSelected.value = isGenderSelected.value == true && isYearSelected.value == true
         }