[CAT-69] 디바이스 및 유저 인증 모듈 구현 #29

HyomK · 2024-07-23T15:04:05Z

작업 내용

file name lint 추가
디바이스 아이디 발급 로직 구현
DeviceId, Token LocalDataSource 구현
NetworkModule Qualifier 추가
HttpLogger 추가
TokenRefreshInterceptor 구현
Auth RemoteDataSource구현

이후 AuthRepository에서 datasource 사용하여 유저 정보 로직 처리

체크리스트

빌드 확인
TokenRefreshInterceptor 때문에 PomonyangService 하나로 쓰니까 di cycle 생겨서 AuthService만 분리할까 하는데 괜찮은지 의견주세요!

AuthService를 사용한다면, 토큰 갱신 외 유저 등록, 탈퇴 api 가 들어갈 것 같네요

동작 화면

SSAID 발급 로그

TokenRefresh 테스트
App Inspector를 이용하여 테스트함
특정 API호출 - (401 : 토큰만료) -> AccessToken Refresh API 호출 -> 특정 API 재호출

2024-07-23.11.52.32.mov

살려주세요

linear · 2024-07-23T15:05:06Z

CAT-69 [Android] 유저 인증 모듈 구현

lee-ji-hoon · 2024-07-23T23:00:09Z

...c/main/java/com/pomonyang/data/local/datastore/datasource/deviceid/DeviceIdDataSourceImpl.kt

+    companion object {
+        const val DEVICE_ID_PREFERENCES_NAME = "device_id_preferences"
+        private val DEVICE_ID_KEY = stringPreferencesKey("device_id")
+    }


companion object 최하단에 부탁할게~!

https://kotlinlang.org/docs/coding-conventions.html#class-layout

lee-ji-hoon · 2024-07-23T23:01:36Z

...c/main/java/com/pomonyang/data/local/datastore/datasource/deviceid/DeviceIdDataSourceImpl.kt

+    private suspend fun getStoredDeviceId(): String? = try {
+        dataStore.data
+            .catch { exception ->
+                if (exception is IOException) {
+                    emit(emptyPreferences())
+                } else {
+                    throw exception
+                }
+            }.first()[DEVICE_ID_KEY]
+    } catch (exception: IOException) {
+        null
+    }


여기 코드에 의도가 궁금해

dataStore 전체를 catch하는데 이때 IO면 null인데 내부에서 IO가 터지면 emptyPreferences 를 반환하는데 IO가 아니면 throw를 하고 있어서 어떤 의도인지 간략하게 알 수 있을까?

https://developer.android.com/codelabs/android-preferences-datastore?hl=ko#5

공식 가이드에 따르기는 했어요

하나 찾았다. try - catch

data/src/main/java/com/pomonyang/data/local/datastore/di/DataStoreModule.kt

lee-ji-hoon · 2024-07-23T23:03:51Z

data/src/main/java/com/pomonyang/data/local/datastore/di/LocalDataSourceModule.kt

+    @Binds
+    abstract fun provideTokenDataSource(tokenDataSourceImpl: TokenDataSourceImpl): TokenDataSource
+
+    @Binds
+    abstract fun provideDeviceIdDataSource(deviceIdDataSourceImpl: DeviceIdDataSourceImpl): DeviceIdDataSource
+}


이번에 추가한것들 중에 DataSource나 몇몇 클래스들 Singleton으로 안한 이유가 혹시 있을까?

요거는 제가 놓친 부분인것 같네요 Singleton annotation 추가하기로

data/src/main/java/com/pomonyang/data/remote/interceptor/TokenRefreshInterceptor.kt

data/src/main/java/com/pomonyang/data/remote/model/response/TokenResponse.kt

data/src/main/java/com/pomonyang/data/remote/di/NetworkModule.kt

lee-ji-hoon · 2024-07-24T06:31:09Z

data/src/main/java/com/pomonyang/data/remote/di/NetworkModule.kt

 @Module
 @InstallIn(SingletonComponent::class)


NetworkModule 클래스에서 전체적으로 정렬이 뭔가 달라진거 같은데 나랑 혹시 옵션이 뭔가 다른건지 아니면 ktlint로 인해서 자동 정렬이 된건지 알 수 있을까?

// 전 fun provideTokenInterceptorRetrofit( @TokenClient okHttpClient: OkHttpClient, networkResultCallAdapterFactory: NetworkResultCallAdapterFactory, json: Json ): Retrofit = Retrofit.Builder() .client(okHttpClient) .baseUrl(BASE_URL) .addConverterFactory(json.asConverterFactory("application/json".toMediaType())) .addCallAdapterFactory(networkResultCallAdapterFactory) .build() // 후 fun provideTokenInterceptorRetrofit( @TokenClient okHttpClient: OkHttpClient, networkResultCallAdapterFactory: NetworkResultCallAdapterFactory, json: Json ): Retrofit = Retrofit.Builder().client(okHttpClient).baseUrl(BASE_URL).addConverterFactory(json.asConverterFactory("application/json".toMediaType())).addCallAdapterFactory(networkResultCallAdapterFactory).build()

@Provides @Singleton @TokenApi fun provideTokenInterceptorRetrofit( @TokenClient okHttpClient: OkHttpClient, networkResultCallAdapterFactory: NetworkResultCallAdapterFactory, json: Json ): Retrofit = Retrofit.Builder().client(okHttpClient).baseUrl(BASE_URL).addConverterFactory(json.asConverterFactory("application/json".toMediaType())).addCallAdapterFactory(networkResultCallAdapterFactory).build()

오잉 저도 안스 기준 이렇게 되어있는데 lint로 자동 정렬되어서 올라가나

...c/main/java/com/pomonyang/data/local/datastore/datasource/deviceid/DeviceIdDataSourceImpl.kt

HyomK · 2024-07-23T15:09:21Z

data/src/main/java/com/pomonyang/data/remote/model/response/TokenResponse.kt

일단은 response,request는 임시로 만들어놨어!

HyomK · 2024-07-23T15:10:29Z

data/src/main/java/com/pomonyang/data/remote/interceptor/TokenRefreshInterceptor.kt

+    override fun intercept(chain: Interceptor.Chain): Response {
+        val origin = chain.request()
+        val response = chain.proceed(origin)
+        if (response.code == 401) {


대부분 401롤 처리해줘서 Authenticator 로도 할 수 있지만, 혹시를 대비해서 Interceptor로 만들어봤어요

HyomK · 2024-07-23T15:10:49Z

data/src/main/java/com/pomonyang/data/remote/interceptor/TokenRefreshInterceptor.kt

+                    .newBuilder()
+                    .addHeader("Content-Type", "application/x-www-form-urlencoded")
+                    .addHeader("Accept", "*/*")
+                    .addHeader("Authorization", "Bearer $accessToken")


여기도 나중에 서버 요청에 따라 바꾸는 걸로

...c/main/java/com/pomonyang/data/local/datastore/datasource/deviceid/DeviceIdDataSourceImpl.kt

HyomK · 2024-07-24T11:53:02Z

...c/main/java/com/pomonyang/data/local/datastore/datasource/deviceid/DeviceIdDataSourceImpl.kt

+    private suspend fun getStoredDeviceId(): String? = try {
+        dataStore.data
+            .catch { exception ->
+                if (exception is IOException) {
+                    emit(emptyPreferences())
+                } else {
+                    throw exception
+                }
+            }.first()[DEVICE_ID_KEY]
+    } catch (exception: IOException) {
+        null
+    }


https://developer.android.com/codelabs/android-preferences-datastore?hl=ko#5

공식 가이드에 따르기는 했어요

HyomK · 2024-07-24T11:54:07Z

data/src/main/java/com/pomonyang/data/local/datastore/di/LocalDataSourceModule.kt

+    @Binds
+    abstract fun provideTokenDataSource(tokenDataSourceImpl: TokenDataSourceImpl): TokenDataSource
+
+    @Binds
+    abstract fun provideDeviceIdDataSource(deviceIdDataSourceImpl: DeviceIdDataSourceImpl): DeviceIdDataSource
+}


요거는 제가 놓친 부분인것 같네요 Singleton annotation 추가하기로

HyomK · 2024-07-24T11:56:51Z

data/src/main/java/com/pomonyang/data/remote/di/NetworkModule.kt

 @Module
 @InstallIn(SingletonComponent::class)


@Provides @Singleton @TokenApi fun provideTokenInterceptorRetrofit( @TokenClient okHttpClient: OkHttpClient, networkResultCallAdapterFactory: NetworkResultCallAdapterFactory, json: Json ): Retrofit = Retrofit.Builder().client(okHttpClient).baseUrl(BASE_URL).addConverterFactory(json.asConverterFactory("application/json".toMediaType())).addCallAdapterFactory(networkResultCallAdapterFactory).build()

HyomK · 2024-07-24T11:57:17Z

data/src/main/java/com/pomonyang/data/remote/di/NetworkModule.kt

 @Module
 @InstallIn(SingletonComponent::class)


오잉 저도 안스 기준 이렇게 되어있는데 lint로 자동 정렬되어서 올라가나

data/src/main/java/com/pomonyang/data/remote/di/NetworkModule.kt

lee-ji-hoon

토큰과 관련이 되면서 이것저것 복잡하던 부분 잘 구현된거 같아 고생했어~!

HyomK added 12 commits July 23, 2024 23:27

chore: ktlint standard file name disable 처리

d5cb54d

feat: Token DataSource 구현

8fddccb

feat: DeviceId DataSource 구현

9ed6e09

feat: LocalDataSourceModule 구현

26b9127

feat: internal 접근 제어자 추가

84608b4

feat: httpRequestInterceptor 헤더 token 추가

58301ab

feat: AuthService 추가

0e94e7a

feat: AuthDataSource 구현

ec9f7fa

feat: RemoteDataSourceModule 구현

c9d449e

feat: TokenRefreshInterceptor 구현

ab32d90

feat: AuthService DI, Http Logger 추가

7da59a4

fix: datasourceImpl internal 제어자 추가

9b741ac

HyomK added the feature 기능 개발 label Jul 23, 2024

HyomK self-assigned this Jul 23, 2024

github-actions bot requested a review from lee-ji-hoon July 23, 2024 15:04

lee-ji-hoon reviewed Jul 24, 2024

View reviewed changes

HyomK commented Jul 24, 2024

View reviewed changes

HyomK added 4 commits July 24, 2024 23:22

fix: DeviceId nullable 제거

d6632d6

refactor: Companion Object 하단으로 이동

3f205b3

feat: AuthDataStore Singleton annotation 추가

7a089fe

rename: dataSource remote/local 네이밍 추가

3bfb403

HyomK force-pushed the feature/cat-69 branch from 5defe17 to 3bfb403 Compare July 24, 2024 14:40

refactor: local datasource singleton 추가

849ecd3

lee-ji-hoon approved these changes Jul 24, 2024

View reviewed changes

HyomK merged commit c8fe90a into develop Jul 24, 2024

HyomK deleted the feature/cat-69 branch July 24, 2024 14:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CAT-69] 디바이스 및 유저 인증 모듈 구현 #29

[CAT-69] 디바이스 및 유저 인증 모듈 구현 #29

HyomK commented Jul 23, 2024

linear bot commented Jul 23, 2024

lee-ji-hoon Jul 23, 2024

lee-ji-hoon Jul 23, 2024

HyomK Jul 24, 2024

lee-ji-hoon Jul 24, 2024

lee-ji-hoon Jul 23, 2024

HyomK Jul 24, 2024

lee-ji-hoon Jul 24, 2024

HyomK Jul 24, 2024

HyomK Jul 24, 2024

HyomK Jul 23, 2024

HyomK Jul 23, 2024

HyomK Jul 23, 2024

HyomK Jul 24, 2024

HyomK Jul 24, 2024

HyomK Jul 24, 2024

HyomK Jul 24, 2024

lee-ji-hoon left a comment

[CAT-69] 디바이스 및 유저 인증 모듈 구현 #29

[CAT-69] 디바이스 및 유저 인증 모듈 구현 #29

Conversation

HyomK commented Jul 23, 2024

작업 내용

체크리스트

동작 화면

살려주세요

linear bot commented Jul 23, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lee-ji-hoon left a comment

Choose a reason for hiding this comment