added auth interceptor and token manager

isiahpwilliams · isiahpwilliams · commit 99d0c93b2d9b · 2026-03-12T12:45:18.000-04:00
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/AuthInterceptor.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/AuthInterceptor.kt
@@ -0,0 +1,21 @@
+package com.cornellappdev.uplift.data.repositories
+
+import okhttp3.Interceptor
+import okhttp3.Response
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AuthInterceptor @Inject constructor(
+    private val tokenManager: TokenManager
+) : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val token = tokenManager.getAccessToken()
+        val request = chain.request().newBuilder().apply {
+            if (token != null) {
+                addHeader("Authorization", "Bearer $token")
+            }
+        }.build()
+        return chain.proceed(request)
+    }
+}
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/TokenManager.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/TokenManager.kt
@@ -1,26 +1,43 @@
 package com.cornellappdev.uplift.data.repositories
 
 import android.content.Context
+import android.content.SharedPreferences
+import android.util.Log
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
 import androidx.core.content.edit
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
 
-class TokenManager(context: Context) {
+@Singleton
+class TokenManager @Inject constructor(@ApplicationContext private val context: Context) {
     private val fileName = "encrypted_tokens"
 
-    // 1. Create or retrieve the Master Key for encryption
-    private val masterKey = MasterKey.Builder(context)
-        .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
-        .build()
+    // Initialize EncryptedSharedPreferences
+    private val sharedPreferences: SharedPreferences by lazy {
+        try {
+            createEncryptedPrefs()
+        } catch (e: Exception) {
+            Log.e("TokenManager", "Failed to initialize EncryptedSharedPreferences", e)
+            context.deleteSharedPreferences(fileName)
+            context.getSharedPreferences(fileName, Context.MODE_PRIVATE)
+        }
+    }
 
-    // 2. Initialize EncryptedSharedPreferences
-    private val sharedPreferences = EncryptedSharedPreferences.create(
-        context,
-        fileName,
-        masterKey,
-        EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-        EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-    )
+    private fun createEncryptedPrefs(): SharedPreferences {
+        val masterKey = MasterKey.Builder(context)
+            .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+            .build()
+
+        return EncryptedSharedPreferences.create(
+            context,
+            fileName,
+            masterKey,
+            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+        )
+    }
 
     fun saveTokens(accessToken: String, refreshToken: String) {
         sharedPreferences.edit().apply {
@@ -37,4 +54,4 @@ class TokenManager(context: Context) {
     fun clearTokens() {
         sharedPreferences.edit { clear() }
     }
-}
+}
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
@@ -8,6 +8,7 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.Preferences
 import com.apollographql.apollo.ApolloClient
 import com.cornellappdev.uplift.CreateUserMutation
+import com.cornellappdev.uplift.DeleteUserMutation
 import com.cornellappdev.uplift.GetUserByNetIdQuery
 import com.cornellappdev.uplift.LoginUserMutation
 import com.cornellappdev.uplift.SetWorkoutGoalsMutation
@@ -57,7 +58,12 @@ class UserInfoRepository @Inject constructor(
             tokenManager.saveTokens(accessToken, refreshToken)
             if (!skip) {
                 val numericId = id.toIntOrNull()
-                uploadGoal(numericId, goal)
+                if (!uploadGoal(numericId, goal)) {
+                    return false
+                }
+            }
+            else {
+                Log.d("UserInfoRepository", "Skipping goal upload")
             }
             storeUserFields(id, name, netId, email, skip, accessToken, refreshToken, goal)
             Log.d("UserInfoRepositoryImpl", "User created successfully")
@@ -79,13 +85,12 @@ class UserInfoRepository @Inject constructor(
                 workoutGoal = goal
             )
         )
-            // Change so that it uses auth interceptor
-            .addHttpHeader("Authorization", "Bearer ${tokenManager.getAccessToken()}")
             .execute()
         if (goalResponse.hasErrors()) {
             Log.e("UserInfoRepository", "Failed to set goal: ${goalResponse.errors}")
             return false
         }
+        Log.d("UserInfoRepository", "Goal set successfully: $goal")
         return true
     }
 
diff --git a/app/src/main/java/com/cornellappdev/uplift/di/AppModule.kt b/app/src/main/java/com/cornellappdev/uplift/di/AppModule.kt
@@ -1,11 +1,14 @@
 package com.cornellappdev.uplift.di
 
 import com.apollographql.apollo.ApolloClient
+import com.apollographql.apollo.network.okHttpClient
 import com.cornellappdev.uplift.BuildConfig
+import com.cornellappdev.uplift.data.repositories.AuthInterceptor
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import okhttp3.OkHttpClient
 import javax.inject.Singleton
 
 
@@ -15,10 +18,19 @@ object AppModule {
 
     @Provides
     @Singleton
-    fun provideApolloClient(): ApolloClient {
+    fun provideOkHttpClient(authInterceptor: AuthInterceptor): OkHttpClient {
+        return OkHttpClient.Builder()
+            .addInterceptor(authInterceptor)
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideApolloClient(okHttpClient: OkHttpClient): ApolloClient {
         return ApolloClient.Builder()
             .serverUrl(BuildConfig.BACKEND_URL)
+            .okHttpClient(okHttpClient)
             .build()
     }
 
-}
+}
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt b/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt
@@ -46,7 +46,7 @@ import com.cornellappdev.uplift.ui.screens.profile.ProfileScreen
 import com.cornellappdev.uplift.ui.screens.profile.SettingsScreen
 import com.cornellappdev.uplift.ui.screens.reminders.CapacityReminderScreen
 import com.cornellappdev.uplift.ui.screens.reminders.MainReminderScreen
-import com.cornellappdev.uplift.ui.screens.reminders.WorkoutReminderOnboardingScreen
+import com.cornellappdev.uplift.ui.screens.onboarding.WorkoutReminderOnboardingScreen
 import com.cornellappdev.uplift.ui.screens.report.ReportIssueScreen
 import com.cornellappdev.uplift.ui.screens.report.ReportSubmittedScreen
 import com.cornellappdev.uplift.ui.viewmodels.classes.ClassDetailViewModel
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/screens/onboarding/GoalOnboardingScreen.kt b/app/src/main/java/com/cornellappdev/uplift/ui/screens/onboarding/GoalOnboardingScreen.kt
@@ -0,0 +1,25 @@
+package com.cornellappdev.uplift.ui.screens.onboarding
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.cornellappdev.uplift.ui.screens.reminders.WorkoutReminderScreen
+import com.cornellappdev.uplift.ui.viewmodels.onboarding.ProfileCreationViewModel
+
+@Composable
+fun WorkoutReminderOnboardingScreen(
+    viewModel: ProfileCreationViewModel = hiltViewModel(),
+) {
+    val uiState by viewModel.uiStateFlow.collectAsStateWithLifecycle()
+    val goalValue = uiState.goal
+
+    WorkoutReminderScreen(
+        goalValue = goalValue,
+        isOnboarding = true,
+        onGoalValueChange = { viewModel.updateGoals(it) },
+        onBackClick = { viewModel.onBackClick() },
+        onNext = { viewModel.onNext() },
+        onSkip = { viewModel.onSkip() },
+    )
+}
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/screens/reminders/WorkoutReminderScreen.kt b/app/src/main/java/com/cornellappdev/uplift/ui/screens/reminders/WorkoutReminderScreen.kt
@@ -47,23 +47,6 @@ data class Reminder(
     val enabled: Boolean
 )
 
-@Composable
-fun WorkoutReminderOnboardingScreen(
-    viewModel: ProfileCreationViewModel = hiltViewModel(),
-) {
-    val uiState by viewModel.uiStateFlow.collectAsStateWithLifecycle()
-    val goalValue = uiState.goal
-
-    WorkoutReminderScreen(
-        goalValue = goalValue,
-        isOnboarding = true,
-        onGoalValueChange = { viewModel.updateGoals(it.toInt()) },
-        onBackClick = { viewModel.onBackClick() },
-        onNext = { viewModel.onNext() },
-        onSkip = { viewModel.onSkip() },
-    )
-}
-
 @Composable
 fun WorkoutReminderSettingsScreen(
     viewModel: SettingsViewModel = hiltViewModel(),
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/onboarding/ProfileCreationViewModel.kt b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/onboarding/ProfileCreationViewModel.kt
@@ -7,11 +7,13 @@ import com.cornellappdev.uplift.data.repositories.UserInfoRepository
 import com.cornellappdev.uplift.ui.UpliftRootRoute
 import com.cornellappdev.uplift.ui.nav.RootNavigationRepository
 import com.cornellappdev.uplift.ui.viewmodels.UpliftViewModel
+import com.google.firebase.auth.FirebaseUser
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 data class ProfileCreationUiState(
+    val user: FirebaseUser? = null,
     val name: String = "",
     val imageUri: Uri? = null,
     val isGoalSkipped: Boolean = false,
@@ -29,13 +31,14 @@ class ProfileCreationViewModel @Inject constructor(
             val user = userInfoRepository.getFirebaseUser()
             val name = user?.displayName ?: ""
             applyMutation {
-                copy(name = name)
+                copy(user = user, name = name)
             }
         }
     }
 
     private fun createUser() = viewModelScope.launch {
-        val user = userInfoRepository.getFirebaseUser()
+        val state = getStateValue()
+        val user = state.user
         val name = user?.displayName ?: ""
         val email = user?.email
         if (email.isNullOrBlank()) {
@@ -45,11 +48,8 @@ class ProfileCreationViewModel @Inject constructor(
         }
 
         val netId = email.substringBefore("@")
-        val isSkipped = getStateValue().isGoalSkipped
-        var goal = 0
-        if (!isSkipped) {
-            goal = getStateValue().goal.toInt()
-        }
+        val isSkipped = state.isGoalSkipped
+        val goal = if (isSkipped) 0 else state.goal.toInt()
         if (userInfoRepository.createUser(email, name, netId, isSkipped, goal)) {
             navigateToHome()
         } else {
@@ -70,9 +70,9 @@ class ProfileCreationViewModel @Inject constructor(
         rootNavigationRepository.navigateUp()
     }
 
-    fun updateGoals(newGoal: Int) {
+    fun updateGoals(newGoal: Float) {
         applyMutation {
-            copy(goal = newGoal.toFloat())
+            copy(goal = newGoal)
         }
     }
 
