Dev

app/src/main/java/com/autoever/everp/MainActivity.kt

@@ -4,50 +4,28 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.lifecycle.lifecycleScope
-import com.autoever.everp.domain.repository.PushNotificationRepository
-import com.autoever.everp.ui.MainScreen
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.autoever.everp.ui.theme.EverpTheme
+import com.autoever.everp.ui.MainScreen
 import com.autoever.everp.ui.navigation.AppNavGraph
+import com.autoever.everp.ui.theme.EverpTheme
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
-    @Inject
-    lateinit var notificationRepository: PushNotificationRepository
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        getFcmToken()
         setContent {
             EverpTheme {
                 MainScreen()
-//                Surface(modifier = Modifier.fillMaxSize()) {
-//                    AppNavGraph()
-//                }
+                Surface(modifier = Modifier.fillMaxSize()) {
+                    AppNavGraph()
+                }
             }
         }
     }
 
-    private fun getFcmToken() {
-        // Repository를 통해서만 FCM 토큰 접근
-        // MainActivity에서는 Firebase 객체에 직접 접근하지 않음
-        lifecycleScope.launch {
-            try {
-                val token = notificationRepository.getToken()
-                Timber.tag("FCM").i("FCM Token: $token")
-                // TODO: 서버에 토큰 전송 또는 로컬 저장 등 필요한 작업 수행
-            } catch (e: Exception) {
-                Timber.tag("FCM").e(e, "Fetching FCM token failed")
-            }
-        }
-    }
 }

app/src/main/java/com/autoever/everp/auth/api/HttpUserApi.kt

@@ -16,7 +16,9 @@ import java.net.URL
  * 기존 GWService.getUserInfo와 동일한 동작을 제공한다.
  */
 class HttpUserApi : UserApi {
-    private companion object { const val TAG = "UserApi" }
+    private companion object {
+        const val TAG = "UserApi"
+    }
 
     override suspend fun getUserInfo(accessToken: String): UserInfo = withContext(Dispatchers.IO) {
         val url = URL(AuthEndpoint.USER_INFO)
@@ -42,6 +44,9 @@ class HttpUserApi : UserApi {
             // API 응답은 { success, message, data: { ... } } 형태일 수 있으므로 data 객체를 우선 시도
             val root = JSONObject(resp)
             val json = root.optJSONObject("data") ?: root
+
+            Timber.tag(TAG).d("[SUCCESS] 사용자 정보 조회 성공: $json")
+
             UserInfo(
                 userId = json.optString("userId").ifBlank { null },
                 userName = json.optString("userName").ifBlank { null },

app/src/main/java/com/autoever/everp/auth/repository/DefaultUserRepository.kt

@@ -2,13 +2,16 @@ package com.autoever.everp.auth.repository
 
 import com.autoever.everp.auth.api.UserApi
 import com.autoever.everp.auth.model.UserInfo
+import timber.log.Timber
 import javax.inject.Inject
 
 class DefaultUserRepository @Inject constructor(
     private val api: UserApi,
 ) : UserRepository {
     override suspend fun fetchUserInfo(accessToken: String): UserInfo {
-        return api.getUserInfo(accessToken)
+        val userInfo = api.getUserInfo(accessToken)
+        Timber.d("Fetched User Info: $userInfo")
+        return userInfo
     }
 }
 

app/src/main/java/com/autoever/everp/auth/session/SessionManager.kt

@@ -1,56 +1,76 @@
 package com.autoever.everp.auth.session
 
-import android.util.Log
+import com.autoever.everp.common.annotation.ApplicationScope
+import com.autoever.everp.data.datasource.local.AuthLocalDataSource
+import com.autoever.everp.domain.model.auth.AccessToken
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
 import timber.log.Timber
+import java.time.LocalDateTime
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SessionManager @Inject constructor(
-    private val tokenStore: TokenStore,
+    private val authLocalDataSource: AuthLocalDataSource,
+    @ApplicationScope private val applicationScope: CoroutineScope,
 ) {
     private val _state = MutableStateFlow<AuthState>(AuthState.Unauthenticated)
     val state: StateFlow<AuthState> = _state
 
     init {
-        refreshFromStore()
+        applicationScope.launch {
+            refreshFromStore()
+        }
     }
 
     fun refreshFromStore() {
-        try {
-            val token = tokenStore.getAccessToken()
-            if (token.isNullOrEmpty()) {
+        applicationScope.launch {
+            try {
+                val token = authLocalDataSource.getAccessToken()
+                if (token.isNullOrEmpty()) {
+                    _state.value = AuthState.Unauthenticated
+                    Timber.tag(TAG).i("[INFO] 저장소에서 토큰이 없어 비인증 상태로 설정했습니다.")
+                } else {
+                    _state.value = AuthState.Authenticated(token)
+                    Timber.tag(TAG).i("[INFO] 저장소의 토큰으로 인증 상태를 설정했습니다. (길이: ${token.length})")
+                }
+            } catch (e: Exception) {
                 _state.value = AuthState.Unauthenticated
-                Timber.tag(TAG).i("[INFO] 저장소에서 토큰이 없어 비인증 상태로 설정했습니다.")
-            } else {
-                _state.value = AuthState.Authenticated(token)
-                Timber.tag(TAG).i("[INFO] 저장소의 토큰으로 인증 상태를 설정했습니다. (길이: ${token.length})")
+                Timber.tag(TAG).e(e, "[ERROR] 저장소에서 토큰을 불러오는 중 오류가 발생했습니다: ${e.message}")
             }
-        } catch (e: Exception) {
-            _state.value = AuthState.Unauthenticated
-            Log.e(TAG, "[ERROR] 저장소에서 토큰을 불러오는 중 오류가 발생했습니다: ${e.message}")
         }
     }
 
     fun setAuthenticated(accessToken: String) {
-        try {
-            tokenStore.saveAccessToken(accessToken)
-            _state.value = AuthState.Authenticated(accessToken)
-            Timber.tag(TAG).i("[INFO] 인증 완료 상태로 전환했습니다. (토큰 길이: ${accessToken.length})")
-        } catch (e: Exception) {
-            Timber.tag(TAG).e("[ERROR] 인증 상태 설정 중 오류가 발생했습니다: ${e.message}")
+        applicationScope.launch {
+            try {
+                authLocalDataSource.saveAccessToken(
+                    AccessToken(
+                        token = accessToken,
+                        type = "Bearer",
+                        expiresIn = LocalDateTime.now().plusHours(1), // 기본값: 1시간 후
+                    ),
+                )
+                _state.value = AuthState.Authenticated(accessToken)
+                Timber.tag(TAG).i("[INFO] 인증 완료 상태로 전환했습니다. (토큰 길이: ${accessToken.length})")
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "[ERROR] 인증 상태 설정 중 오류가 발생했습니다: ${e.message}")
+            }
         }
     }
 
     fun signOut() {
-        try {
-            tokenStore.clear()
-            _state.value = AuthState.Unauthenticated
-            Timber.tag(TAG).i("[INFO] 로그아웃 완료: 인증 상태를 해제했습니다.")
-        } catch (e: Exception) {
-            Timber.tag(TAG).e("[ERROR] 로그아웃 처리 중 오류가 발생했습니다: ${e.message}")
+        applicationScope.launch {
+            try {
+                authLocalDataSource.clearAccessToken()
+                _state.value = AuthState.Unauthenticated
+                Timber.tag(TAG).i("[INFO] 로그아웃 완료: 인증 상태를 해제했습니다.")
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "[ERROR] 로그아웃 처리 중 오류가 발생했습니다: ${e.message}")
+            }
         }
     }
 

app/src/main/java/com/autoever/everp/common/annotation/CoroutineScopeAnnotation.kt

@@ -0,0 +1,9 @@
+package com.autoever.everp.common.annotation
+
+import javax.inject.Qualifier
+
+// 일회용 -> 절대 쓰지 말기
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class ApplicationScope
+

app/src/main/java/com/autoever/everp/common/annotation/RetrofitAnnotation.kt

@@ -0,0 +1,11 @@
+package com.autoever.everp.common.annotation
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class AuthRetrofit
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class NormalRetrofit

app/src/main/java/com/autoever/everp/data/datasource/local/AuthLocalDataSource.kt

@@ -0,0 +1,12 @@
+package com.autoever.everp.data.datasource.local
+
+import com.autoever.everp.domain.model.auth.AccessToken
+import kotlinx.coroutines.flow.Flow
+
+interface AuthLocalDataSource {
+    // === Access Token ===
+    val accessTokenFlow: Flow<String?>
+    suspend fun getAccessToken(): String?
+    suspend fun saveAccessToken(token: AccessToken)
+    suspend fun clearAccessToken()
+}

app/src/main/java/com/autoever/everp/data/datasource/local/DashboardLocalDataSource.kt

@@ -0,0 +1,11 @@
+package com.autoever.everp.data.datasource.local
+
+import com.autoever.everp.domain.model.dashboard.DashboardWorkflows
+import kotlinx.coroutines.flow.Flow
+
+interface DashboardLocalDataSource {
+    fun observeWorkflows(): Flow<DashboardWorkflows?>
+    suspend fun setWorkflows(workflows: DashboardWorkflows)
+    suspend fun clear()
+}
+

app/src/main/java/com/autoever/everp/data/datasource/local/ImLocalDataSource.kt

@@ -0,0 +1,12 @@
+package com.autoever.everp.data.datasource.local
+
+import com.autoever.everp.domain.model.inventory.InventoryItemToggle
+import kotlinx.coroutines.flow.Flow
+
+interface ImLocalDataSource {
+    fun observeItemToggleList(): Flow<List<InventoryItemToggle>>
+    suspend fun setItemToggleList(items: List<InventoryItemToggle>)
+    suspend fun clear()
+}
+
+

app/src/main/java/com/autoever/everp/data/datasource/local/ProfileLocalDataSource.kt

@@ -0,0 +1,11 @@
+package com.autoever.everp.data.datasource.local
+
+import com.autoever.everp.domain.model.profile.Profile
+import kotlinx.coroutines.flow.Flow
+
+interface ProfileLocalDataSource {
+    fun observeProfile(): Flow<Profile?>
+    suspend fun setProfile(profile: Profile)
+    suspend fun clear()
+}
+

app/src/main/java/com/autoever/everp/data/datasource/local/TokenLocalDataSource.kt

@@ -0,0 +1,20 @@
+package com.autoever.everp.data.datasource.local
+
+import kotlinx.coroutines.flow.Flow
+
+interface TokenLocalDataSource {
+    // === Access Token ===
+    val accessTokenFlow: Flow<String?>
+    suspend fun getAccessToken(): String?
+    suspend fun saveAccessToken(token: String)
+    suspend fun clearAccessToken()
+
+    // === FCM Token ===
+    val fcmTokenFlow: Flow<String?>
+    suspend fun getFcmToken(): String?
+    suspend fun saveFcmToken(token: String)
+    suspend fun clearFcmToken()
+
+    // === Utilities ===
+    suspend fun clearAll()
+}

app/src/main/java/com/autoever/everp/data/datasource/local/datastore/AuthDataStoreLocalDataSourceImpl.kt

@@ -0,0 +1,80 @@
+package com.autoever.everp.data.datasource.local.datastore
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.emptyPreferences
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import com.autoever.everp.common.annotation.ApplicationScope
+import com.autoever.everp.data.datasource.local.AuthLocalDataSource
+import com.autoever.everp.domain.model.auth.AccessToken
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import javax.inject.Inject
+
+class AuthDataStoreLocalDataSourceImpl @Inject constructor(
+    @ApplicationContext private val appContext: Context,
+    @ApplicationScope private val appScope: CoroutineScope,
+) : AuthLocalDataSource {
+
+    companion object {
+        private const val STORE_NAME = "everp_tokens"
+        private val KEY_ACCESS_TOKEN = stringPreferencesKey("access_token")
+        private val KEY_ACCESS_TOKEN_TYPE = stringPreferencesKey("access_token_type")
+        private val KEY_ACCESS_TOKEN_EXPIRES_IN = stringPreferencesKey("access_token_expires_in")
+    }
+
+    private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = STORE_NAME)
+
+    override val accessTokenFlow: Flow<String?> = appContext.dataStore.data
+        .catch { emit(emptyPreferences()) }
+        .map { prefs -> prefs[KEY_ACCESS_TOKEN] }
+        .flowOn(Dispatchers.IO)
+
+
+    override suspend fun getAccessToken(): String? = accessTokenFlow.first()
+
+    suspend fun getAccessTokenWithType(): String? {
+        // 1. dataStore에서 Preferences를 한 번만 읽어옵니다.
+        val prefs = appContext.dataStore.data
+            .catch { emit(emptyPreferences()) }
+            .first()
+
+        // 2. 읽어온 Preferences 객체에서 필요한 값을 모두 꺼냅니다.
+        val token = prefs[KEY_ACCESS_TOKEN]
+        val type = prefs[KEY_ACCESS_TOKEN_TYPE]
+
+        return if (token != null && type != null) {
+            "$type $token"
+        } else {
+            null
+        }
+    }
+
+    override suspend fun saveAccessToken(token: AccessToken) {
+        appContext.dataStore.edit { prefs ->
+            prefs[KEY_ACCESS_TOKEN] = token.token
+            prefs[KEY_ACCESS_TOKEN_TYPE] = token.type
+            prefs[KEY_ACCESS_TOKEN_EXPIRES_IN] = token.expiresIn.toString()
+        }
+    }
+
+    override suspend fun clearAccessToken() {
+        appContext.dataStore.edit { prefs ->
+            prefs.remove(KEY_ACCESS_TOKEN)
+            prefs.remove(KEY_ACCESS_TOKEN_TYPE)
+            prefs.remove(KEY_ACCESS_TOKEN_EXPIRES_IN)
+            // prefs.clear()
+        }
+    }
+
+}