temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-06-30 17:34:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix/remove koreader-sync credentials from server config (#1758)

Browse Source 
* Remove koreader-sync credentials from config

These are supposed to be set via the login/logout mutations and are not meant to be set manually by the user. Thus, they are not really settings and do not belong to the config

* Reduce log levels of KoreaderSyncService
This commit is contained in:
schroda
2025-11-01 19:31:07 +01:00
committed by GitHub
parent 53c4659044
commit 4dbd9d70d2
5 changed files with 100 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/server-config/build.gradle.kts
View File

@@ -34,12 +34,16 @@ dependencies {
// GraphQL types used in ServerConfig
implementation(libs.graphql.kotlin.scheme)
// Dependency Injection
implementation(libs.injekt)
// AndroidCompat for SystemPropertyOverridableConfigModule
implementation(projects.androidCompat.config)
// Serialization
implementation(libs.serialization.json)
implementation(libs.serialization.protobuf)
implementation(project(":AndroidCompat"))
}

39
server/server-config/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
View File

@@ -7,6 +7,8 @@ package suwayomi.tachidesk.server
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
import android.app.Application
import android.content.Context
import com.typesafe.config.Config
import io.github.config4k.toConfig
import kotlinx.coroutines.CoroutineScope
@@ -55,11 +57,13 @@ import suwayomi.tachidesk.server.settings.StringSetting
import xyz.nulldev.ts.config.GlobalConfigManager
import xyz.nulldev.ts.config.SystemPropertyOverridableConfigModule
import kotlin.collections.associate
import kotlin.getValue
import kotlin.time.Duration
import kotlin.time.Duration.Companion.days
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.minutes
import kotlin.time.Duration.Companion.seconds
import uy.kohesive.injekt.injectLazy
val mutableConfigValueScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
@@ -67,6 +71,8 @@ const val SERVER_CONFIG_MODULE_NAME = "server"
val serverConfig: ServerConfig by lazy { GlobalConfigManager.module() }
private val application: Application by injectLazy()
// Settings are ordered by "protoNumber".
class ServerConfig(
getConfig: () -> Config,
@@ -604,24 +610,57 @@ class ServerConfig(
description = "KOReader Sync Server URL. Public alternative: https://kosync.ak-team.com:3042/",
)
@Deprecated("Moved to preference store. User is supposed to use a login/logout mutation")
val koreaderSyncUsername: MutableStateFlow<String> by StringSetting(
protoNumber = 60,
group = SettingGroup.KOREADER_SYNC,
defaultValue = "",
excludeFromBackup = true,
deprecated = SettingsRegistry.SettingDeprecated(
replaceWith = "MOVE TO PREFERENCES",
message = "Moved to preference store. User is supposed to use a login/logout mutation",
migrateConfig = { value, config ->
val koreaderPreferences = application.getSharedPreferences("koreader_sync", Context.MODE_PRIVATE)
koreaderPreferences.edit().putString("username", value.unwrapped() as? String).apply()
config
}
),
)
@Deprecated("Moved to preference store. User is supposed to use a login/logout mutation")
val koreaderSyncUserkey: MutableStateFlow<String> by StringSetting(
protoNumber = 61,
group = SettingGroup.KOREADER_SYNC,
defaultValue = "",
excludeFromBackup = true,
deprecated = SettingsRegistry.SettingDeprecated(
replaceWith = "MOVE TO PREFERENCES",
message = "Moved to preference store. User is supposed to use a login/logout mutation",
migrateConfig = { value, config ->
val koreaderPreferences = application.getSharedPreferences("koreader_sync", Context.MODE_PRIVATE)
koreaderPreferences.edit().putString("user_key", value.unwrapped() as? String).apply()
config
}
),
)
@Deprecated("Moved to preference store. Is supposed to be random and gets auto generated")
val koreaderSyncDeviceId: MutableStateFlow<String> by StringSetting(
protoNumber = 62,
group = SettingGroup.KOREADER_SYNC,
defaultValue = "",
deprecated = SettingsRegistry.SettingDeprecated(
replaceWith = "MOVE TO PREFERENCES",
message = "Moved to preference store. Is supposed to be random and gets auto generated",
migrateConfig = { value, config ->
val koreaderPreferences = application.getSharedPreferences("koreader_sync", Context.MODE_PRIVATE)
koreaderPreferences.edit().putString("device_id", value.unwrapped() as? String).apply()
config
}
),
)
val koreaderSyncChecksumMethod: MutableStateFlow<KoreaderSyncChecksumMethod> by EnumSetting(