Use graphql directive for auth handling (#1671)

2026-07-04 11:24:35 -05:00 · 2025-09-29 17:24:19 +02:00
parent 5e48b05270
commit 5c79672d84
35 changed files with 297 additions and 555 deletions
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/BackupQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/BackupQuery.kt
@@ -1,15 +1,11 @@
 package suwayomi.tachidesk.graphql.queries

-import graphql.schema.DataFetchingEnvironment
 import io.javalin.http.UploadedFile
-import suwayomi.tachidesk.graphql.server.getAttribute
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.BackupRestoreStatus
 import suwayomi.tachidesk.graphql.types.toStatus
 import suwayomi.tachidesk.manga.impl.backup.proto.ProtoBackupImport
 import suwayomi.tachidesk.manga.impl.backup.proto.ProtoBackupValidator
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser

 class BackupQuery {
    data class ValidateBackupInput(
@@ -30,11 +26,8 @@ class BackupQuery {
        val missingTrackers: List<ValidateBackupTracker>,
    )

-    fun validateBackup(
-        dataFetchingEnvironment: DataFetchingEnvironment,
-        input: ValidateBackupInput,
-    ): ValidateBackupResult {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
+    @RequireAuth
+    fun validateBackup(input: ValidateBackupInput): ValidateBackupResult {
        val result = ProtoBackupValidator.validate(input.backup.content())
        return ValidateBackupResult(
            result.missingSourceIds.map { ValidateBackupSource(it.first, it.second) },
@@ -42,11 +35,6 @@ class BackupQuery {
        )
    }

-    fun restoreStatus(
-        dataFetchingEnvironment: DataFetchingEnvironment,
-        id: String,
-    ): BackupRestoreStatus? {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
-        return ProtoBackupImport.getRestoreState(id)?.toStatus()
-    }
+    @RequireAuth
+    fun restoreStatus(id: String): BackupRestoreStatus? = ProtoBackupImport.getRestoreState(id)?.toStatus()
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt
@@ -17,6 +17,7 @@ import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
@@ -27,7 +28,6 @@ import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.getAttribute
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Order
 import suwayomi.tachidesk.graphql.server.primitives.OrderBy
@@ -40,19 +40,14 @@ import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
 import suwayomi.tachidesk.graphql.types.CategoryNodeList
 import suwayomi.tachidesk.graphql.types.CategoryType
 import suwayomi.tachidesk.manga.model.table.CategoryTable
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser
 import java.util.concurrent.CompletableFuture

 class CategoryQuery {
+    @RequireAuth
    fun category(
        dataFetchingEnvironment: DataFetchingEnvironment,
        id: Int,
-    ): CompletableFuture<CategoryType> {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
-        return dataFetchingEnvironment.getValueFromDataLoader("CategoryDataLoader", id)
-    }
+    ): CompletableFuture<CategoryType> = dataFetchingEnvironment.getValueFromDataLoader("CategoryDataLoader", id)

    enum class CategoryOrderBy(
        override val column: Column<*>,
@@ -127,8 +122,8 @@ class CategoryQuery {
            )
    }

+    @RequireAuth
    fun categories(
-        dataFetchingEnvironment: DataFetchingEnvironment,
        condition: CategoryCondition? = null,
        filter: CategoryFilter? = null,
        @GraphQLDeprecated(
@@ -148,7 +143,6 @@ class CategoryQuery {
        last: Int? = null,
        offset: Int? = null,
    ): CategoryNodeList {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
        val queryResults =
            transaction {
                val res = CategoryTable.selectAll()
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt
@@ -18,6 +18,7 @@ import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
 import org.jetbrains.exposed.sql.andWhere
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.FloatFilter
@@ -30,7 +31,6 @@ import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.getAttribute
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Order
 import suwayomi.tachidesk.graphql.server.primitives.OrderBy
@@ -44,9 +44,6 @@ import suwayomi.tachidesk.graphql.types.ChapterNodeList
 import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser
 import java.util.concurrent.CompletableFuture

 /**
@@ -55,6 +52,7 @@ import java.util.concurrent.CompletableFuture
 * - Get page list?
 */
 class ChapterQuery {
+    @RequireAuth
    fun chapter(
        dataFetchingEnvironment: DataFetchingEnvironment,
        id: Int,
@@ -200,8 +198,8 @@ class ChapterQuery {
        fun getLibraryOp() = andFilterWithCompare(MangaTable.inLibrary, inLibrary)
    }

+    @RequireAuth
    fun chapters(
-        dataFetchingEnvironment: DataFetchingEnvironment,
        condition: ChapterCondition? = null,
        filter: ChapterFilter? = null,
        @GraphQLDeprecated(
@@ -221,7 +219,6 @@ class ChapterQuery {
        last: Int? = null,
        offset: Int? = null,
    ): ChapterNodeList {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
        val queryResults =
            transaction {
                val res = ChapterTable.selectAll()
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/DownloadQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/DownloadQuery.kt
@@ -1,19 +1,15 @@
 package suwayomi.tachidesk.graphql.queries

-import graphql.schema.DataFetchingEnvironment
-import suwayomi.tachidesk.graphql.server.getAttribute
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.DownloadStatus
 import suwayomi.tachidesk.manga.impl.download.DownloadManager
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
 import suwayomi.tachidesk.server.JavalinSetup.future
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser
 import java.util.concurrent.CompletableFuture

 class DownloadQuery {
-    fun downloadStatus(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<DownloadStatus> =
+    @RequireAuth
+    fun downloadStatus(): CompletableFuture<DownloadStatus> =
        future {
-            dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
            DownloadStatus(DownloadManager.getStatus())
        }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
@@ -19,6 +19,7 @@ import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
@@ -28,7 +29,6 @@ import suwayomi.tachidesk.graphql.queries.filter.StringFilter
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.getAttribute
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Order
 import suwayomi.tachidesk.graphql.server.primitives.OrderBy
@@ -41,19 +41,14 @@ import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
 import suwayomi.tachidesk.graphql.types.ExtensionNodeList
 import suwayomi.tachidesk.graphql.types.ExtensionType
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser
 import java.util.concurrent.CompletableFuture

 class ExtensionQuery {
+    @RequireAuth
    fun extension(
        dataFetchingEnvironment: DataFetchingEnvironment,
        pkgName: String,
-    ): CompletableFuture<ExtensionType> {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
-        return dataFetchingEnvironment.getValueFromDataLoader("ExtensionDataLoader", pkgName)
-    }
+    ): CompletableFuture<ExtensionType> = dataFetchingEnvironment.getValueFromDataLoader("ExtensionDataLoader", pkgName)

    enum class ExtensionOrderBy(
        override val column: Column<*>,
@@ -159,8 +154,8 @@ class ExtensionQuery {
            )
    }

+    @RequireAuth
    fun extensions(
-        dataFetchingEnvironment: DataFetchingEnvironment,
        condition: ExtensionCondition? = null,
        filter: ExtensionFilter? = null,
        @GraphQLDeprecated(
@@ -180,7 +175,6 @@ class ExtensionQuery {
        last: Int? = null,
        offset: Int? = null,
    ): ExtensionNodeList {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
        val queryResults =
            transaction {
                val res = ExtensionTable.selectAll()
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/InfoQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/InfoQuery.kt
@@ -1,19 +1,15 @@
 package suwayomi.tachidesk.graphql.queries

 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
-import graphql.schema.DataFetchingEnvironment
 import suwayomi.tachidesk.global.impl.AppUpdate
-import suwayomi.tachidesk.graphql.server.getAttribute
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.AboutWebUI
 import suwayomi.tachidesk.graphql.types.WebUIFlavor
 import suwayomi.tachidesk.graphql.types.WebUIUpdateCheck
 import suwayomi.tachidesk.graphql.types.WebUIUpdateStatus
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
 import suwayomi.tachidesk.server.JavalinSetup.future
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
 import suwayomi.tachidesk.server.generated.BuildConfig
 import suwayomi.tachidesk.server.serverConfig
-import suwayomi.tachidesk.server.user.requireUser
 import suwayomi.tachidesk.server.util.WebInterfaceManager
 import java.util.concurrent.CompletableFuture

@@ -47,9 +43,9 @@ class InfoQuery {
        val url: String,
    )

-    fun checkForServerUpdates(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<List<CheckForServerUpdatesPayload>> =
+    @RequireAuth
+    fun checkForServerUpdates(): CompletableFuture<List<CheckForServerUpdatesPayload>> =
        future {
-            dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
            AppUpdate.checkUpdate().map {
                CheckForServerUpdatesPayload(
                    channel = it.channel,
@@ -59,15 +55,15 @@ class InfoQuery {
            }
        }

-    fun aboutWebUI(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<AboutWebUI> =
+    @RequireAuth
+    fun aboutWebUI(): CompletableFuture<AboutWebUI> =
        future {
-            dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
            WebInterfaceManager.getAboutInfo()
        }

-    fun checkForWebUIUpdate(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<WebUIUpdateCheck> =
+    @RequireAuth
+    fun checkForWebUIUpdate(): CompletableFuture<WebUIUpdateCheck> =
        future {
-            dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
            val (version, updateAvailable) = WebInterfaceManager.isUpdateAvailable(WebUIFlavor.current, raiseError = true)
            WebUIUpdateCheck(
                channel = serverConfig.webUIChannel.value,
@@ -76,8 +72,6 @@ class InfoQuery {
            )
        }

-    fun getWebUIUpdateStatus(dataFetchingEnvironment: DataFetchingEnvironment): WebUIUpdateStatus {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
-        return WebInterfaceManager.status.value
-    }
+    @RequireAuth
+    fun getWebUIUpdateStatus(): WebUIUpdateStatus = WebInterfaceManager.status.value
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/KoreaderSyncQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/KoreaderSyncQuery.kt
@@ -1,19 +1,15 @@
 package suwayomi.tachidesk.graphql.queries

-import graphql.schema.DataFetchingEnvironment
-import suwayomi.tachidesk.graphql.server.getAttribute
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.KoSyncStatusPayload
 import suwayomi.tachidesk.manga.impl.sync.KoreaderSyncService
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
 import suwayomi.tachidesk.server.JavalinSetup.future
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser
 import java.util.concurrent.CompletableFuture

 class KoreaderSyncQuery {
-    fun koSyncStatus(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<KoSyncStatusPayload> =
+    @RequireAuth
+    fun koSyncStatus(): CompletableFuture<KoSyncStatusPayload> =
        future {
-            dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
            KoreaderSyncService.getStatus()
        }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt
@@ -16,6 +16,7 @@ import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.ComparableScalarFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
@@ -28,7 +29,6 @@ import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.getAttribute
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Order
 import suwayomi.tachidesk.graphql.server.primitives.OrderBy
@@ -43,19 +43,14 @@ import suwayomi.tachidesk.graphql.types.MangaType
 import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.MangaStatus
 import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser
 import java.util.concurrent.CompletableFuture

 class MangaQuery {
+    @RequireAuth
    fun manga(
        dataFetchingEnvironment: DataFetchingEnvironment,
        id: Int,
-    ): CompletableFuture<MangaType> {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
-        return dataFetchingEnvironment.getValueFromDataLoader("MangaDataLoader", id)
-    }
+    ): CompletableFuture<MangaType> = dataFetchingEnvironment.getValueFromDataLoader("MangaDataLoader", id)

    enum class MangaOrderBy(
        override val column: Column<*>,
@@ -222,8 +217,8 @@ class MangaQuery {
            )
    }

+    @RequireAuth
    fun mangas(
-        dataFetchingEnvironment: DataFetchingEnvironment,
        condition: MangaCondition? = null,
        filter: MangaFilter? = null,
        @GraphQLDeprecated(
@@ -243,7 +238,6 @@ class MangaQuery {
        last: Int? = null,
        offset: Int? = null,
    ): MangaNodeList {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
        val queryResults =
            transaction {
                val res =
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt
@@ -18,13 +18,13 @@ import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
 import suwayomi.tachidesk.graphql.queries.filter.OpAnd
 import suwayomi.tachidesk.graphql.queries.filter.StringFilter
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.getAttribute
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Order
 import suwayomi.tachidesk.graphql.server.primitives.OrderBy
@@ -36,19 +36,14 @@ import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
 import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
 import suwayomi.tachidesk.graphql.types.GlobalMetaNodeList
 import suwayomi.tachidesk.graphql.types.GlobalMetaType
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser
 import java.util.concurrent.CompletableFuture

 class MetaQuery {
+    @RequireAuth
    fun meta(
        dataFetchingEnvironment: DataFetchingEnvironment,
        key: String,
-    ): CompletableFuture<GlobalMetaType> {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
-        return dataFetchingEnvironment.getValueFromDataLoader("GlobalMetaDataLoader", key)
-    }
+    ): CompletableFuture<GlobalMetaType> = dataFetchingEnvironment.getValueFromDataLoader("GlobalMetaDataLoader", key)

    enum class MetaOrderBy(
        override val column: Column<*>,
@@ -111,8 +106,8 @@ class MetaQuery {
            )
    }

+    @RequireAuth
    fun metas(
-        dataFetchingEnvironment: DataFetchingEnvironment,
        condition: MetaCondition? = null,
        filter: MetaFilter? = null,
        @GraphQLDeprecated(
@@ -132,7 +127,6 @@ class MetaQuery {
        last: Int? = null,
        offset: Int? = null,
    ): GlobalMetaNodeList {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
        val queryResults =
            transaction {
                val res = GlobalMetaTable.selectAll()
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SettingsQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SettingsQuery.kt
@@ -1,15 +1,9 @@
 package suwayomi.tachidesk.graphql.queries

-import graphql.schema.DataFetchingEnvironment
-import suwayomi.tachidesk.graphql.server.getAttribute
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.SettingsType
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser

 class SettingsQuery {
-    fun settings(dataFetchingEnvironment: DataFetchingEnvironment): SettingsType {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
-        return SettingsType()
-    }
+    @RequireAuth
+    fun settings(): SettingsType = SettingsType()
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
@@ -17,6 +17,7 @@ import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
@@ -27,7 +28,6 @@ import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.getAttribute
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Order
 import suwayomi.tachidesk.graphql.server.primitives.OrderBy
@@ -40,19 +40,14 @@ import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
 import suwayomi.tachidesk.graphql.types.SourceNodeList
 import suwayomi.tachidesk.graphql.types.SourceType
 import suwayomi.tachidesk.manga.model.table.SourceTable
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser
 import java.util.concurrent.CompletableFuture

 class SourceQuery {
+    @RequireAuth
    fun source(
        dataFetchingEnvironment: DataFetchingEnvironment,
        id: Long,
-    ): CompletableFuture<SourceType> {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
-        return dataFetchingEnvironment.getValueFromDataLoader("SourceDataLoader", id)
-    }
+    ): CompletableFuture<SourceType> = dataFetchingEnvironment.getValueFromDataLoader("SourceDataLoader", id)

    enum class SourceOrderBy(
        override val column: Column<*>,
@@ -127,8 +122,8 @@ class SourceQuery {
            )
    }

+    @RequireAuth
    fun sources(
-        dataFetchingEnvironment: DataFetchingEnvironment,
        condition: SourceCondition? = null,
        filter: SourceFilter? = null,
        @GraphQLDeprecated(
@@ -148,7 +143,6 @@ class SourceQuery {
        last: Int? = null,
        offset: Int? = null,
    ): SourceNodeList {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
        val (queryResults, resultsAsType) =
            transaction {
                val res = SourceTable.selectAll()
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt
@@ -10,6 +10,7 @@ import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.DoubleFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
@@ -22,7 +23,6 @@ import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.getAttribute
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Order
 import suwayomi.tachidesk.graphql.server.primitives.OrderBy
@@ -40,20 +40,15 @@ import suwayomi.tachidesk.graphql.types.TrackerType
 import suwayomi.tachidesk.manga.impl.track.tracker.TrackerManager
 import suwayomi.tachidesk.manga.model.table.TrackRecordTable
 import suwayomi.tachidesk.manga.model.table.insertAll
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
 import suwayomi.tachidesk.server.JavalinSetup.future
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser
 import java.util.concurrent.CompletableFuture

 class TrackQuery {
+    @RequireAuth
    fun tracker(
        dataFetchingEnvironment: DataFetchingEnvironment,
        id: Int,
-    ): CompletableFuture<TrackerType> {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, TrackerType>("TrackerDataLoader", id)
-    }
+    ): CompletableFuture<TrackerType> = dataFetchingEnvironment.getValueFromDataLoader<Int, TrackerType>("TrackerDataLoader", id)

    enum class TrackerOrderBy {
        ID,
@@ -121,8 +116,8 @@ class TrackQuery {
        val not: TrackerFilter? = null,
    )

+    @RequireAuth
    fun trackers(
-        dataFetchingEnvironment: DataFetchingEnvironment,
        condition: TrackerCondition? = null,
        @GraphQLDeprecated(
            "Replaced with order",
@@ -141,7 +136,6 @@ class TrackQuery {
        last: Int? = null,
        offset: Int? = null,
    ): TrackerNodeList {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
        val (queryResults, resultsAsType) =
            run {
                var res = TrackerManager.services.map { TrackerType(it) }
@@ -246,13 +240,12 @@ class TrackQuery {
        )
    }

+    @RequireAuth
    fun trackRecord(
        dataFetchingEnvironment: DataFetchingEnvironment,
        id: Int,
-    ): CompletableFuture<TrackRecordType> {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, TrackRecordType>("TrackRecordDataLoader", id)
-    }
+    ): CompletableFuture<TrackRecordType> =
+        dataFetchingEnvironment.getValueFromDataLoader<Int, TrackRecordType>("TrackRecordDataLoader", id)

    enum class TrackRecordOrderBy(
        override val column: Column<*>,
@@ -399,8 +392,8 @@ class TrackQuery {
            )
    }

+    @RequireAuth
    fun trackRecords(
-        dataFetchingEnvironment: DataFetchingEnvironment,
        condition: TrackRecordCondition? = null,
        filter: TrackRecordFilter? = null,
        @GraphQLDeprecated(
@@ -420,7 +413,6 @@ class TrackQuery {
        last: Int? = null,
        offset: Int? = null,
    ): TrackRecordNodeList {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
        val queryResults =
            transaction {
                val res = TrackRecordTable.selectAll()
@@ -503,12 +495,9 @@ class TrackQuery {
        val trackSearches: List<TrackSearchType>,
    )

-    fun searchTracker(
-        dataFetchingEnvironment: DataFetchingEnvironment,
-        input: SearchTrackerInput,
-    ): CompletableFuture<SearchTrackerPayload> =
+    @RequireAuth
+    fun searchTracker(input: SearchTrackerInput): CompletableFuture<SearchTrackerPayload> =
        future {
-            dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
            val tracker =
                requireNotNull(TrackerManager.getTracker(input.trackerId)) {
                    "Tracker not found"
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/UpdateQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/UpdateQuery.kt
@@ -1,16 +1,12 @@
 package suwayomi.tachidesk.graphql.queries

 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
-import graphql.schema.DataFetchingEnvironment
 import kotlinx.coroutines.flow.first
-import suwayomi.tachidesk.graphql.server.getAttribute
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.LibraryUpdateStatus
 import suwayomi.tachidesk.graphql.types.UpdateStatus
 import suwayomi.tachidesk.manga.impl.update.IUpdater
-import suwayomi.tachidesk.server.JavalinSetup.Attribute
 import suwayomi.tachidesk.server.JavalinSetup.future
-import suwayomi.tachidesk.server.JavalinSetup.getAttribute
-import suwayomi.tachidesk.server.user.requireUser
 import uy.kohesive.injekt.injectLazy
 import java.util.concurrent.CompletableFuture

@@ -18,15 +14,15 @@ class UpdateQuery {
    private val updater: IUpdater by injectLazy()

    @GraphQLDeprecated("Replaced with libraryUpdateStatus", ReplaceWith("libraryUpdateStatus"))
-    fun updateStatus(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<UpdateStatus> =
+    @RequireAuth
+    fun updateStatus(): CompletableFuture<UpdateStatus> =
        future {
-            dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
            UpdateStatus(updater.status.first())
        }

-    fun libraryUpdateStatus(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<LibraryUpdateStatus> =
+    @RequireAuth
+    fun libraryUpdateStatus(): CompletableFuture<LibraryUpdateStatus> =
        future {
-            dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
            LibraryUpdateStatus(updater.getStatus())
        }

@@ -34,8 +30,6 @@ class UpdateQuery {
        val timestamp: Long,
    )

-    fun lastUpdateTimestamp(dataFetchingEnvironment: DataFetchingEnvironment): LastUpdateTimestampPayload {
-        dataFetchingEnvironment.getAttribute(Attribute.TachideskUser).requireUser()
-        return LastUpdateTimestampPayload(updater.getLastUpdateTimestamp())
-    }
+    @RequireAuth
+    fun lastUpdateTimestamp(): LastUpdateTimestampPayload = LastUpdateTimestampPayload(updater.getLastUpdateTimestamp())
 }