[Feat/#144] Google 로그인 연동

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />

app/src/main/java/com/paw/key/data/di/AppModule.kt

@@ -2,6 +2,7 @@ package com.paw.key.data.di
 
 import android.content.ContentResolver
 import android.content.Context
+import androidx.credentials.CredentialManager
 import com.paw.key.BuildConfig
 import dagger.Module
 import dagger.Provides
@@ -26,4 +27,16 @@ object AppModule {
     fun provideContentResolver(@ApplicationContext context: Context): ContentResolver {
         return context.contentResolver
     }
+
+    @Provides
+    @Singleton
+    fun provideContext(@ApplicationContext context: Context): Context {
+        return context
+    }
+
+    @Provides
+    @Singleton
+    fun provideCredentialManager(@ApplicationContext context: Context): CredentialManager {
+        return CredentialManager.create(context)
+    }
 }

app/src/main/java/com/paw/key/data/di/NetworkModule.kt

@@ -34,8 +34,8 @@ object NetworkModule {
     fun providesOkHttpClient(
         loggingInterceptor: HttpLoggingInterceptor,
     ): OkHttpClient = OkHttpClient.Builder()
-        .connectTimeout(10, TimeUnit.SECONDS)
-        .readTimeout(10, TimeUnit.SECONDS)
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(30, TimeUnit.SECONDS)
         .addInterceptor(loggingInterceptor)
         .build()
 

app/src/main/java/com/paw/key/data/di/RepositoryModule.kt

@@ -20,6 +20,10 @@ import com.paw.key.data.repositoryimpl.list.PostsListRepositoryImpl
 import com.paw.key.data.repositoryimpl.login.AuthRepositoryImpl
 import com.paw.key.data.repositoryimpl.walklist.WalkListDetailRepositoryImpl
 import com.paw.key.data.repositoryimpl.walkreview.WalkReviewRepositoryImpl
+import com.paw.key.data.remote.datasource.datasourceimpl.AuthRemoteDataSourceImpl
+import com.paw.key.data.remote.datasource.datasourceimpl.GoogleAuthDataSourceImpl
+import com.paw.key.data.remote.datasource.login.AuthRemoteDataSource
+import com.paw.key.data.remote.datasource.login.GoogleAuthDataSource
 import com.paw.key.domain.repository.ArchivedListRepository
 import com.paw.key.domain.repository.DummyRepository
 import com.paw.key.domain.repository.LikeRepository
@@ -50,6 +54,18 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 interface RepositoryModule {
 
+    @Binds
+    @Singleton
+    fun bindAuthRemoteDataSource(
+        impl: AuthRemoteDataSourceImpl,
+    ): AuthRemoteDataSource
+
+    @Binds
+    @Singleton
+    fun bindGoogleAuthDataSource(
+        impl: GoogleAuthDataSourceImpl,
+    ): GoogleAuthDataSource
+
     @Binds
     fun bindsDummyRepository(
         dummyRepositoryImpl: DummyRepositoryImpl

app/src/main/java/com/paw/key/data/dto/request/LoginRequestDto.kt

@@ -5,13 +5,13 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class LoginRequestDto (
-    @SerialName("email")
-    val email: String,
+    @SerialName("idToken")
+    val idToken: String,
+    @SerialName("deviceId")
+    val deviceId: String
 )
-// 테스트용입니다
-
-
 fun LoginRequestDto.toEntity(): LoginRequestDto {
-    val email = this.email
-    return LoginRequestDto(email)
+    val idToken = this.idToken
+    val deviceId = this.deviceId
+    return LoginRequestDto(idToken, deviceId)
 }

app/src/main/java/com/paw/key/data/dto/response/LoginResponseDto.kt

@@ -5,9 +5,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class LoginResponseDto (
-    @SerialName("AccessToken")
-    val AccessToken: String,
-    @SerialName("RefreshToken")
-    val RefreshToken: String
+    @SerialName("accessToken")
+    val accessToken: String,
+    @SerialName("refreshToken")
+    val refreshToken: String
 )
-// 테스트용입니다

app/src/main/java/com/paw/key/data/remote/datasource/datasourceimpl/AuthRemoteDataSourceImpl.kt

@@ -8,11 +8,14 @@ import com.paw.key.data.service.login.LoginService
 import javax.inject.Inject
 
 class AuthRemoteDataSourceImpl @Inject constructor(
-    private val loginService: LoginService,
+    private val loginService: LoginService
 ) : AuthRemoteDataSource {
-    override suspend fun login(
-        providerToken: String,
-        provider: String,
-    ): BaseResponse<LoginResponseDto> =
-        loginService.login(providerToken, LoginRequestDto(provider))
-}
+    override suspend fun login(idToken: String, deviceId: String): LoginResponseDto {
+        return loginService.login(
+            LoginRequestDto(
+                idToken = idToken,
+                deviceId = deviceId
+            )
+        )
+    }
+}

app/src/main/java/com/paw/key/data/remote/datasource/datasourceimpl/GoogleAuthDataSourceImpl.kt

@@ -7,12 +7,8 @@ import com.google.android.libraries.identity.googleid.GetGoogleIdOption
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 import com.paw.key.BuildConfig
 import com.paw.key.core.util.suspendRunCatching
-import com.paw.key.data.dto.request.LoginRequestDto
-import com.paw.key.data.dto.response.BaseResponse
-import com.paw.key.data.dto.response.LoginResponseDto
-import com.paw.key.data.remote.datasource.login.AuthRemoteDataSource
 import com.paw.key.data.remote.datasource.login.GoogleAuthDataSource
-import com.paw.key.data.service.login.LoginService
+import timber.log.Timber
 import javax.inject.Inject
 
 class GoogleAuthDataSourceImpl @Inject constructor(
@@ -22,7 +18,6 @@ class GoogleAuthDataSourceImpl @Inject constructor(
         suspendRunCatching {
             val googleIdOption = GetGoogleIdOption.Builder()
                 .setFilterByAuthorizedAccounts(false)
-                .setAutoSelectEnabled(false)
                 .setServerClientId(BuildConfig.GOOGLE_WEB_CLIENT_ID)
                 .build()
 
@@ -32,5 +27,6 @@ class GoogleAuthDataSourceImpl @Inject constructor(
 
             val response = credentialManager.getCredential(context, request)
             GoogleIdTokenCredential.createFrom(response.credential.data)
+
         }
 }

app/src/main/java/com/paw/key/data/remote/datasource/login/AuthRemoteDataSource.kt

@@ -4,5 +4,5 @@ import com.paw.key.data.dto.response.BaseResponse
 import com.paw.key.data.dto.response.LoginResponseDto
 
 interface AuthRemoteDataSource {
-    suspend fun login(providerToken: String, provider: String): BaseResponse<LoginResponseDto>
+    suspend fun login(idToken: String, deviceId: String): LoginResponseDto
 }

app/src/main/java/com/paw/key/data/repositoryimpl/login/AuthRepositoryImpl.kt

@@ -7,29 +7,33 @@ import com.paw.key.data.dto.response.LoginResponseDto
 import com.paw.key.data.remote.datasource.login.AuthRemoteDataSource
 import com.paw.key.data.remote.datasource.login.GoogleAuthDataSource
 import com.paw.key.domain.repository.login.AuthRepository
+import dagger.hilt.android.qualifiers.ApplicationContext
+import timber.log.Timber
 import javax.inject.Inject
 
 class AuthRepositoryImpl @Inject constructor(
     private val authRemoteDataSource: AuthRemoteDataSource,
     private val googleAuthDataSource: GoogleAuthDataSource,
-    private val context: Context
+    @ApplicationContext private val context: Context
 ) : AuthRepository {
 
     override suspend fun signInWithGoogle(context: Context): Result<String> =
         googleAuthDataSource.signIn(context).map { it.idToken }
 
-    override suspend fun login(providerToken: String, provider: String): Result<LoginResponseDto> =
+    override suspend fun login(idToken: String, deviceId: String): Result<LoginResponseDto> =
         suspendRunCatching {
-            val loginResponse = authRemoteDataSource.login(providerToken, provider).data
+
+            val loginResponse = authRemoteDataSource.login(idToken, deviceId)
 
             UserDataStore.saveAcessToken(
-                context = context,
-                token = loginResponse.AccessToken
+                context = this.context,
+                token = loginResponse.accessToken
             )
             UserDataStore.saveRefreshToken(
-                context = context,
-                token = loginResponse.RefreshToken
+                context = this.context,
+                token = loginResponse.refreshToken
             )
+
             loginResponse
         }
 }

app/src/main/java/com/paw/key/data/service/login/LoginService.kt

@@ -9,9 +9,8 @@ import retrofit2.http.POST
 
 
 interface LoginService {
-    @POST("api/v1/auth/login")
+    @POST("auth/google/login")
     suspend fun login(
-        @Header("Authorization") providerToken: String,
         @Body loginRequestDto: LoginRequestDto
-    ): BaseResponse<LoginResponseDto>
+    ): LoginResponseDto
 }

app/src/main/java/com/paw/key/domain/repository/login/AuthRepository.kt

@@ -5,5 +5,5 @@ import com.paw.key.data.dto.response.LoginResponseDto
 
 interface AuthRepository {
     suspend fun signInWithGoogle(context: Context): Result<String>
-    suspend fun login(providerToken: String, provider: String): Result<LoginResponseDto>
+    suspend fun login(idToken: String, deviceId: String): Result<LoginResponseDto>
 }