Tidy up trakt-auth modules

api/trakt/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
     implementation(projects.core.base)
 
     api(libs.trakt.api)
-    api(projects.api.traktAuth.api)
+    api(projects.data.traktauth)
     implementation(libs.ktor.client.core)
     implementation(libs.ktor.client.okhttp)
     implementation(libs.ktor.client.auth)

api/trakt/src/main/java/app/tivi/trakt/TraktComponent.kt

@@ -24,8 +24,10 @@ import app.moviebase.trakt.api.TraktSeasonsApi
 import app.moviebase.trakt.api.TraktShowsApi
 import app.moviebase.trakt.api.TraktSyncApi
 import app.moviebase.trakt.api.TraktUsersApi
+import app.tivi.data.traktauth.RefreshTraktTokensInteractor
+import app.tivi.data.traktauth.TraktOAuthInfo
+import app.tivi.data.traktauth.store.AuthStore
 import app.tivi.inject.ApplicationScope
-import app.tivi.trakt.store.AuthStore
 import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.plugins.auth.Auth
 import io.ktor.client.plugins.auth.providers.BearerTokens
@@ -41,6 +43,7 @@ interface TraktComponent {
         client: OkHttpClient,
         authStore: AuthStore,
         oauthInfo: TraktOAuthInfo,
+        refreshTokens: Lazy<RefreshTraktTokensInteractor>,
     ): Trakt = Trakt {
         traktApiKey = oauthInfo.clientId
         maxRetriesOnException = 3
@@ -59,7 +62,11 @@ interface TraktComponent {
                         }
                     }
 
-                    // FIXME: Need to implement refreshTokens {}
+                    refreshTokens {
+                        refreshTokens.value.invoke()?.let {
+                            BearerTokens(it.accessToken, it.refreshToken)
+                        }
+                    }
 
                     sendWithoutRequest { request ->
                         request.url.host == "api.trakt.tv"

app/build.gradle.kts

@@ -167,7 +167,6 @@ dependencies {
     implementation(projects.common.ui.compose)
     implementation(projects.data.dbRoom)
     implementation(projects.api.trakt)
-    implementation(projects.api.traktAuth.android)
     implementation(projects.api.tmdb)
     implementation(projects.domain)
     implementation(projects.tasks.android)

app/src/main/java/app/tivi/home/MainActivity.kt

@@ -41,6 +41,8 @@ import app.tivi.common.compose.shouldUseDarkColors
 import app.tivi.common.compose.shouldUseDynamicColors
 import app.tivi.common.compose.theme.TiviTheme
 import app.tivi.core.analytics.Analytics
+import app.tivi.data.traktauth.LoginToTraktInteractor
+import app.tivi.data.traktauth.TraktAuthActivityComponent
 import app.tivi.extensions.unsafeLazy
 import app.tivi.inject.ActivityComponent
 import app.tivi.inject.ActivityScope
@@ -83,6 +85,9 @@ class MainActivity : TiviActivity() {
         // Copied from setContent {} ext-fun
         setOwners()
 
+        // Register for Login activity results
+        component.login.register()
+
         component.contentViewSetter.setContentView(this, composeView)
     }
 
@@ -115,13 +120,15 @@ class MainActivity : TiviActivity() {
 abstract class MainActivityComponent(
     @get:Provides val activity: Activity,
     @Component val applicationComponent: ApplicationComponent = ApplicationComponent.from(activity),
-) : ActivityComponent {
+) : ActivityComponent,
+    TraktAuthActivityComponent {
     abstract val tiviDateFormatter: TiviDateFormatter
     abstract val textCreator: TiviTextCreator
     abstract val preferences: TiviPreferences
     abstract val analytics: Analytics
     abstract val contentViewSetter: ContentViewSetter
     abstract val screens: ComposeScreens
+    abstract val login: LoginToTraktInteractor
     abstract val viewModel: () -> MainActivityViewModel
 }
 

app/src/main/java/app/tivi/home/MainActivityViewModel.kt

@@ -18,12 +18,12 @@ package app.tivi.home
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import app.tivi.data.traktauth.TraktAuthState
 import app.tivi.domain.executeSync
 import app.tivi.domain.interactors.ClearTraktAuthState
 import app.tivi.domain.interactors.UpdateUserDetails
 import app.tivi.domain.observers.ObserveTraktAuthState
 import app.tivi.domain.observers.ObserveUserDetails
-import app.tivi.trakt.TraktAuthState
 import app.tivi.util.Logger
 import io.ktor.client.plugins.ResponseException
 import io.ktor.http.HttpStatusCode

app/src/main/java/app/tivi/inject/AppComponent.kt

@@ -24,9 +24,8 @@ import app.tivi.appinitializers.EmojiInitializer
 import app.tivi.appinitializers.PreferencesInitializer
 import app.tivi.appinitializers.TimberInitializer
 import app.tivi.appinitializers.TmdbInitializer
+import app.tivi.data.traktauth.TraktOAuthInfo
 import app.tivi.tmdb.TmdbOAuthInfo
-import app.tivi.trakt.TraktConstants
-import app.tivi.trakt.TraktOAuthInfo
 import app.tivi.util.AppCoroutineDispatchers
 import kotlinx.coroutines.Dispatchers
 import me.tatarka.inject.annotations.IntoSet
@@ -58,7 +57,7 @@ interface AppComponent {
     ): TraktOAuthInfo = TraktOAuthInfo(
         clientId = BuildConfig.TRAKT_CLIENT_ID,
         clientSecret = BuildConfig.TRAKT_CLIENT_SECRET,
-        redirectUri = "${appInfo.packageName}://${TraktConstants.URI_AUTH_CALLBACK_PATH}",
+        redirectUri = "${appInfo.packageName}://auth/oauth2callback",
     )
 
     @Provides

app/src/main/java/app/tivi/inject/ApplicationComponent.kt

@@ -27,10 +27,11 @@ import app.tivi.data.episodes.EpisodeBinds
 import app.tivi.data.followedshows.FollowedShowsBinds
 import app.tivi.data.popularshows.PopularShowsBinds
 import app.tivi.data.recommendedshows.RecommendedShowsBinds
-import app.tivi.data.relatedshows.RelatedShowsBinds
 import app.tivi.data.search.SearchBinds
 import app.tivi.data.showimages.ShowImagesBinds
 import app.tivi.data.shows.ShowsBinds
+import app.tivi.data.traktauth.RelatedShowsBinds
+import app.tivi.data.traktauth.TraktAuthComponent
 import app.tivi.data.traktusers.TraktUsersBinds
 import app.tivi.data.trendingshows.TrendingShowsBinds
 import app.tivi.data.watchedshows.WatchedShowsBinds
@@ -39,7 +40,6 @@ import app.tivi.settings.PreferencesComponent
 import app.tivi.tasks.TasksComponent
 import app.tivi.tasks.TiviWorkerFactory
 import app.tivi.tmdb.TmdbComponent
-import app.tivi.trakt.TraktAuthComponent
 import app.tivi.trakt.TraktComponent
 import app.tivi.util.LoggerComponent
 import app.tivi.util.PowerControllerComponent

data/episodes/build.gradle.kts

@@ -23,11 +23,11 @@ plugins {
 
 dependencies {
     api(projects.data.models)
+    api(projects.data.traktauth)
     implementation(projects.data.db)
     implementation(projects.data.legacy) // remove this eventually
 
     api(projects.api.trakt)
-    api(projects.api.traktAuth.api)
     api(projects.api.tmdb)
 
     implementation(libs.kotlininject.runtime)

data/episodes/src/main/java/app/tivi/data/episodes/SeasonsEpisodesRepository.kt

@@ -26,11 +26,11 @@ import app.tivi.data.models.Episode
 import app.tivi.data.models.EpisodeWatchEntry
 import app.tivi.data.models.PendingAction
 import app.tivi.data.models.Season
+import app.tivi.data.traktauth.TraktAuthRepository
+import app.tivi.data.traktauth.TraktAuthState
 import app.tivi.data.util.inPast
 import app.tivi.data.util.syncerForEntity
 import app.tivi.inject.ApplicationScope
-import app.tivi.trakt.TraktAuthState
-import app.tivi.trakt.TraktManager
 import app.tivi.util.Logger
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.hours
@@ -55,7 +55,7 @@ class SeasonsEpisodesRepository(
     private val traktSeasonsDataSource: SeasonsEpisodesDataSource,
     private val traktEpisodeDataSource: TraktEpisodeDataSource,
     private val tmdbEpisodeDataSource: TmdbEpisodeDataSource,
-    private val traktManager: TraktManager,
+    private val traktAuthRepository: TraktAuthRepository,
     logger: Logger,
 ) {
     private val seasonSyncer = syncerForEntity(
@@ -194,7 +194,7 @@ class SeasonsEpisodesRepository(
             it.isNotEmpty() && processPendingAdditions(it)
         }
 
-        if (traktManager.state.value == TraktAuthState.LOGGED_IN) {
+        if (traktAuthRepository.state.value == TraktAuthState.LOGGED_IN) {
             updateShowEpisodeWatches(showId)
         }
     }
@@ -312,13 +312,13 @@ class SeasonsEpisodesRepository(
             needUpdate = true
         }
 
-        if (needUpdate && traktManager.state.value == TraktAuthState.LOGGED_IN) {
+        if (needUpdate && traktAuthRepository.state.value == TraktAuthState.LOGGED_IN) {
             fetchEpisodeWatchesFromRemote(episodeId)
         }
     }
 
     suspend fun updateShowEpisodeWatches(showId: Long) {
-        if (traktManager.state.value != TraktAuthState.LOGGED_IN) return
+        if (traktAuthRepository.state.value != TraktAuthState.LOGGED_IN) return
 
         val response = traktSeasonsDataSource.getShowEpisodeWatches(showId)
 
@@ -343,7 +343,7 @@ class SeasonsEpisodesRepository(
      * @return true if a network service was updated
      */
     private suspend fun processPendingDeletes(entries: List<EpisodeWatchEntry>): Boolean {
-        if (traktManager.state.value == TraktAuthState.LOGGED_IN) {
+        if (traktAuthRepository.state.value == TraktAuthState.LOGGED_IN) {
             val localOnlyDeletes = entries.filter { it.traktId == null }
             // If we've got deletes which are local only, just remove them from the DB
             if (localOnlyDeletes.isNotEmpty()) {
@@ -370,7 +370,7 @@ class SeasonsEpisodesRepository(
      * @return true if a network service was updated
      */
     private suspend fun processPendingAdditions(entries: List<EpisodeWatchEntry>): Boolean {
-        if (traktManager.state.value == TraktAuthState.LOGGED_IN) {
+        if (traktAuthRepository.state.value == TraktAuthState.LOGGED_IN) {
             traktSeasonsDataSource.addEpisodeWatches(entries)
             // Now update the database
             episodeWatchStore.updateEntriesWithAction(entries.map { it.id }, PendingAction.NOTHING)

data/followedshows/build.gradle.kts

@@ -23,11 +23,11 @@ plugins {
 
 dependencies {
     api(projects.data.models)
+    api(projects.data.traktauth)
     implementation(projects.data.db)
     implementation(projects.data.legacy) // remove this eventually
 
     api(projects.api.trakt)
-    api(projects.api.traktAuth.api)
     api(projects.api.tmdb)
 
     api(libs.store)

data/followedshows/src/main/java/app/tivi/data/followedshows/FollowedShowsRepository.kt

@@ -22,13 +22,13 @@ import app.tivi.data.daos.TiviShowDao
 import app.tivi.data.daos.getIdOrSavePlaceholder
 import app.tivi.data.models.FollowedShowEntry
 import app.tivi.data.models.PendingAction
+import app.tivi.data.traktauth.TraktAuthRepository
+import app.tivi.data.traktauth.TraktAuthState
 import app.tivi.data.util.ItemSyncerResult
 import app.tivi.data.util.inPast
 import app.tivi.data.util.syncerForEntity
 import app.tivi.data.views.FollowedShowsWatchStats
 import app.tivi.inject.ApplicationScope
-import app.tivi.trakt.TraktAuthState
-import app.tivi.trakt.TraktManager
 import app.tivi.util.Logger
 import kotlin.time.Duration.Companion.hours
 import kotlinx.coroutines.flow.Flow
@@ -43,7 +43,7 @@ class FollowedShowsRepository(
     private val followedShowsDao: FollowedShowsDao,
     private val followedShowsLastRequestStore: FollowedShowsLastRequestStore,
     private val dataSource: FollowedShowsDataSource,
-    private val traktManager: TraktManager,
+    private val traktAuthRepository: TraktAuthRepository,
     private val logger: Logger,
     private val showDao: TiviShowDao,
 ) {
@@ -109,7 +109,7 @@ class FollowedShowsRepository(
     }
 
     suspend fun syncFollowedShows(): ItemSyncerResult<FollowedShowEntry> {
-        val listId = when (traktManager.state.value) {
+        val listId = when (traktAuthRepository.state.value) {
             TraktAuthState.LOGGED_IN -> getFollowedTraktListId()
             else -> null
         }
@@ -149,7 +149,7 @@ class FollowedShowsRepository(
             return
         }
 
-        if (listId != null && traktManager.state.value == TraktAuthState.LOGGED_IN) {
+        if (listId != null && traktAuthRepository.state.value == TraktAuthState.LOGGED_IN) {
             val shows = pending.mapNotNull { showDao.getShowWithId(it.showId) }
             logger.v("processPendingAdditions. Entries mapped: %s", shows)
 
@@ -178,7 +178,7 @@ class FollowedShowsRepository(
             return
         }
 
-        if (listId != null && traktManager.state.value == TraktAuthState.LOGGED_IN) {
+        if (listId != null && traktAuthRepository.state.value == TraktAuthState.LOGGED_IN) {
             val shows = pending.mapNotNull { showDao.getShowWithId(it.showId) }
             logger.v("processPendingDelete. Entries mapped: %s", shows)
 

data/relatedshows/src/main/java/app/tivi/data/relatedshows/RelatedShowsBinds.kt → data/relatedshows/src/main/java/app/tivi/data/traktauth/RelatedShowsBinds.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package app.tivi.data.relatedshows
+package app.tivi.data.traktauth
 
 import app.tivi.inject.ApplicationScope
 import me.tatarka.inject.annotations.Provides

data/relatedshows/src/main/java/app/tivi/data/relatedshows/RelatedShowsDataSource.kt → data/relatedshows/src/main/java/app/tivi/data/traktauth/RelatedShowsDataSource.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package app.tivi.data.relatedshows
+package app.tivi.data.traktauth
 
 import app.tivi.data.models.RelatedShowEntry
 import app.tivi.data.models.TiviShow

data/relatedshows/src/main/java/app/tivi/data/relatedshows/RelatedShowsLastRequestStore.kt → data/relatedshows/src/main/java/app/tivi/data/traktauth/RelatedShowsLastRequestStore.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package app.tivi.data.relatedshows
+package app.tivi.data.traktauth
 
 import app.tivi.data.daos.LastRequestDao
 import app.tivi.data.lastrequests.EntityLastRequestStore

data/relatedshows/src/main/java/app/tivi/data/relatedshows/RelatedShowsStore.kt → data/relatedshows/src/main/java/app/tivi/data/traktauth/RelatedShowsStore.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package app.tivi.data.relatedshows
+package app.tivi.data.traktauth
 
 import app.tivi.data.daos.RelatedShowsDao
 import app.tivi.data.daos.TiviShowDao

data/relatedshows/src/main/java/app/tivi/data/relatedshows/TmdbRelatedShowsDataSourceImpl.kt → data/relatedshows/src/main/java/app/tivi/data/traktauth/TmdbRelatedShowsDataSourceImpl.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package app.tivi.data.relatedshows
+package app.tivi.data.traktauth
 
 import app.moviebase.tmdb.Tmdb3
 import app.moviebase.tmdb.model.TmdbShow