[FEAT/#292] 구글 로그인 구현합니다. #310
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package com.sopt.clody.data.datastore | ||
|
|
||
| import android.content.Context | ||
| import dagger.Module | ||
| import dagger.Provides | ||
| import dagger.hilt.InstallIn | ||
| import dagger.hilt.android.qualifiers.ApplicationContext | ||
| import dagger.hilt.components.SingletonComponent | ||
| import javax.inject.Singleton | ||
|
|
||
| @Module | ||
| @InstallIn(SingletonComponent::class) | ||
| object DataStoreModule { | ||
|
|
||
| @Provides | ||
| @Singleton | ||
| fun provideOAuthDataStore( | ||
| @ApplicationContext context: Context, | ||
| ): OAuthDataStore { | ||
| return OAuthDataStore(context) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package com.sopt.clody.data.datastore | ||
|
|
||
| import android.content.Context | ||
| import androidx.datastore.preferences.core.edit | ||
| import androidx.datastore.preferences.preferencesDataStore | ||
| import dagger.hilt.android.qualifiers.ApplicationContext | ||
| import kotlinx.coroutines.flow.first | ||
| import javax.inject.Inject | ||
|
|
||
| class OAuthDataStore @Inject constructor(@ApplicationContext context: Context) { | ||
| private val Context.dataStore by preferencesDataStore(name = "oauth_pref") | ||
| private val dataStore = context.dataStore | ||
|
|
||
| suspend fun saveIdToken(token: String) { | ||
| dataStore.edit { it[OAuthDataStoreKeys.GOOGLE_ID_TOKEN] = token } | ||
| } | ||
|
|
||
| suspend fun getIdToken(): String? { | ||
| return dataStore.data.first()[OAuthDataStoreKeys.GOOGLE_ID_TOKEN] | ||
| } | ||
|
Comment on lines
+14
to
+20
There was a problem hiding this comment. Security concern: Consider encrypting sensitive OAuth tokens. The ID token is stored in plain text. OAuth tokens are sensitive data that should be encrypted at rest. Consider using EncryptedSharedPreferences or Android Keystore for secure token storage. For example, you could use EncryptedSharedPreferences: val masterKey = MasterKey.Builder(context)
.setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
.build()
val encryptedPrefs = EncryptedSharedPreferences.create(
context,
"oauth_encrypted_prefs",
masterKey,
EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
)🤖 Prompt for AI Agents |
||
|
|
||
| suspend fun savePlatform(provider: OAuthProvider) { | ||
| dataStore.edit { it[OAuthDataStoreKeys.OAUTH_PLATFORM] = provider.name } | ||
| } | ||
|
|
||
| suspend fun getPlatform(): OAuthProvider? { | ||
| return dataStore.data.first()[OAuthDataStoreKeys.OAUTH_PLATFORM]?.let { | ||
| runCatching { OAuthProvider.valueOf(it) }.getOrNull() | ||
| } | ||
| } | ||
|
|
||
| suspend fun clear() { | ||
| dataStore.edit { | ||
| it.remove(OAuthDataStoreKeys.GOOGLE_ID_TOKEN) | ||
| it.remove(OAuthDataStoreKeys.OAUTH_PLATFORM) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package com.sopt.clody.data.datastore | ||
|
|
||
| import androidx.datastore.preferences.core.stringPreferencesKey | ||
|
|
||
| object OAuthDataStoreKeys { | ||
| val GOOGLE_ID_TOKEN = stringPreferencesKey("google_id_token") | ||
| val OAUTH_PLATFORM = stringPreferencesKey("oauth_platform") | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package com.sopt.clody.data.datastore | ||
|
|
||
| enum class OAuthProvider(val apiValue: String) { | ||
| GOOGLE("google"), | ||
| KAKAO("kakao"), | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package com.sopt.clody.data.remote.dto.request | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class GoogleSignUpRequestDto( | ||
| @SerialName("idToken") val idToken: String, | ||
| @SerialName("fcmToken") val fcmToken: String, | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| package com.sopt.clody.data.remote.dto.response | ||
|
|
||
| import com.sopt.clody.data.datastore.OAuthProvider | ||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class UserInfoResponseDto( | ||
| @SerialName("email") val email: String, | ||
| @SerialName("name") val name: String, | ||
| @SerialName("platform") val platform: OAuthProvider?, | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,10 @@ import com.airbnb.mvrx.hilt.hiltMavericksViewModelFactory | |
| import com.airbnb.mvrx.withState | ||
| import com.sopt.clody.core.fcm.FcmTokenProvider | ||
| import com.sopt.clody.core.login.LoginSdk | ||
| import com.sopt.clody.data.datastore.OAuthDataStore | ||
| import com.sopt.clody.data.datastore.OAuthProvider | ||
| import com.sopt.clody.data.remote.dto.request.SignUpRequestDto | ||
| import com.sopt.clody.data.remote.dto.response.SignUpResponseDto | ||
| import com.sopt.clody.data.remote.util.NetworkUtil | ||
| import com.sopt.clody.domain.repository.AuthRepository | ||
| import com.sopt.clody.domain.repository.TokenRepository | ||
|
|
@@ -31,6 +34,7 @@ class SignUpViewModel @AssistedInject constructor( | |
| private val authRepository: AuthRepository, | ||
| private val tokenRepository: TokenRepository, | ||
| private val fcmTokenProvider: FcmTokenProvider, | ||
| private val oAuthDataStore: OAuthDataStore, | ||
| private val networkUtil: NetworkUtil, | ||
| private val languageProvider: LanguageProvider, | ||
| ) : MavericksViewModel<SignUpContract.SignUpState>(initialState) { | ||
|
|
@@ -139,39 +143,67 @@ class SignUpViewModel @AssistedInject constructor( | |
| } | ||
| } | ||
|
|
||
| private suspend fun signUp(context: Context) { | ||
| val state = withState(this@SignUpViewModel) { it } | ||
|
|
||
| if (!networkUtil.isNetworkAvailable()) { | ||
| setState { copy(errorMessage = "네트워크 연결을 확인해주세요.") } | ||
| return | ||
| } | ||
|
|
||
| setState { copy(isLoading = true) } | ||
|
|
||
| val platform = oAuthDataStore.getPlatform() | ||
| val fcmToken = fcmTokenProvider.getToken().orEmpty() | ||
|
|
||
| if (platform == OAuthProvider.GOOGLE) { | ||
| val idToken = oAuthDataStore.getIdToken() | ||
| if (idToken.isNullOrBlank()) { | ||
| setState { copy(errorMessage = "Google ID Token이 없습니다.", isLoading = false) } | ||
| return | ||
| } | ||
| val request = SignUpRequestDto( | ||
| platform = OAuthProvider.GOOGLE.apiValue, | ||
| name = state.nickname, | ||
| fcmToken = fcmToken, | ||
| ) | ||
|
|
||
| val result = authRepository.signUp("Bearer $idToken", request) | ||
| handleSignUpResult(result, isGoogle = true) | ||
| } else { | ||
| loginSdk.login(context).fold( | ||
| onSuccess = { token -> | ||
| val request = SignUpRequestDto( | ||
| platform = OAuthProvider.KAKAO.apiValue, | ||
| name = state.nickname, | ||
| fcmToken = fcmToken, | ||
| ) | ||
| val result = authRepository.signUp("Bearer ${token.value}", request) | ||
| handleSignUpResult(result, isGoogle = false) | ||
| }, | ||
| onFailure = { | ||
| setState { copy(errorMessage = "로그인에 실패했어요~", isLoading = false) } | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private suspend fun handleSignUpResult( | ||
| result: Result<SignUpResponseDto>, | ||
| isGoogle: Boolean, | ||
| ) { | ||
| result.fold( | ||
| onSuccess = { | ||
| tokenRepository.setTokens(it.accessToken, it.refreshToken) | ||
| if (isGoogle) oAuthDataStore.clear() | ||
| _sideEffects.send(SignUpContract.SignUpSideEffect.NavigateToTimeReminder) | ||
| }, | ||
| onFailure = { | ||
| setState { copy(errorMessage = "회원가입에 실패했어요~") } | ||
| }, | ||
| ) | ||
| setState { copy(isLoading = false) } | ||
| } | ||
| private fun validateNickname(nickname: String): Boolean { | ||
| val state = withState(this@SignUpViewModel) { it } | ||
| setState { copy(nicknameMaxLength = languageProvider.getNicknameMaxLength()) } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[p4]
preferences 기반 토큰 저장 방식이 아닌 preferences datastore 로 사용한 것 같은데, 추후에 카카오 로그인도 이것과 합치나요? 동일하게 preferences가 아닌 해당 방식을 채택한 이유가 궁금합니다!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
음.
SharedPreferences는 Sync I/O 기반이라 UI thread를 막을 수 있어서 구조적으로 위험할 수 잇죠.반면,
DataStore는 Coroutine 기반으로 설계되어 IO 안정성이 좋습니다.그래서 공식문서에서도 장기적으로 Datastore을 지향하고 있슴다.
카카오같은 경우는 로그인/회원가입에 loginsdk를 통해서 auth token을 발급하는 구조라 구글 로그인과는 조금 다를 수 있습니다.
구글 로그인은 요청하면 또 이메일 선택 UI가 뜨기 때문에 로컬에 캐싱했다가 회원가입 때 쏘는 구조로 했슴다이.