diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b5d33823..0424db27 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,7 +9,7 @@ plugins { // 支持通过 -PVERSION_NAME / -PVERSION_CODE 显式传入版本信息。 // 未显式传入 VERSION_NAME 时,默认把最后一段 patch 替换为 BUILD_NUMBER。 -val baseAppVersionName = "2.17.0" +val baseAppVersionName = "2.18.0" fun String?.nonBlankOrNull(): String? = this?.trim()?.takeIf { it.isNotBlank() } diff --git a/app/src/main/kotlin/com/miruplay/tv/di/AppModule.kt b/app/src/main/kotlin/com/miruplay/tv/di/AppModule.kt index e21f625a..7b71d570 100644 --- a/app/src/main/kotlin/com/miruplay/tv/di/AppModule.kt +++ b/app/src/main/kotlin/com/miruplay/tv/di/AppModule.kt @@ -3,13 +3,23 @@ package com.miruplay.tv.di import android.content.Context import androidx.room.Room import androidx.room.migration.Migration +import com.miruplay.tv.BuildConfig import com.miruplay.tv.audiomeasure.AudioMeasureController import com.miruplay.tv.data.db.MiruPlayDatabase +import com.miruplay.tv.repository.AppCredentialStore +import com.miruplay.tv.repository.CloudDriveAutomationRepository +import com.miruplay.tv.scraper.core.BangumiHttpProxyConfig +import com.miruplay.tv.scraper.core.BangumiOAuthClient +import com.miruplay.tv.scraper.core.toBangumiHttpProxyConfig +import com.miruplay.tv.sync.BangumiOAuthCoordinator import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import java.util.concurrent.TimeUnit @@ -56,6 +66,27 @@ object AppModule { fun provideToppingController(@ApplicationContext context: Context): com.miruplay.tv.topping.ToppingController { return com.miruplay.tv.topping.ToppingController(com.miruplay.tv.topping.ToppingUsb(context)) } + + @Provides + @Singleton + fun provideBangumiOAuthCoordinator( + credentials: AppCredentialStore, + cloudDriveRepository: CloudDriveAutomationRepository, + ): BangumiOAuthCoordinator { + val client = BangumiOAuthClient( + clientId = BuildConfig.BANGUMI_CLIENT_ID, + clientSecret = BuildConfig.BANGUMI_CLIENT_SECRET, + ) + return BangumiOAuthCoordinator( + credentials = credentials, + client = client.takeIf { it.isConfigured }, + scope = CoroutineScope(SupervisorJob() + Dispatchers.Default), + proxyConfig = { + cloudDriveRepository.getConfig().getOrNull()?.toBangumiHttpProxyConfig() + ?: BangumiHttpProxyConfig.Disabled + }, + ) + } } internal fun miruPlayDatabaseMigrations(): Array = diff --git a/core/model/src/main/kotlin/com/miruplay/tv/model/SettingsSectionDisplayConventions.kt b/core/model/src/main/kotlin/com/miruplay/tv/model/SettingsSectionDisplayConventions.kt index 4b38abfe..6471db52 100644 --- a/core/model/src/main/kotlin/com/miruplay/tv/model/SettingsSectionDisplayConventions.kt +++ b/core/model/src/main/kotlin/com/miruplay/tv/model/SettingsSectionDisplayConventions.kt @@ -631,6 +631,47 @@ fun metadataBangumiTokenEmptyMessage(): UiText = fun metadataBangumiTokenClearedMessage(): UiText = uiText("settings_metadata_bangumi_cleared_msg", "Bangumi Access Token 已清除。") +fun metadataBangumiOAuthNotConfiguredMessage(): UiText = + uiText("settings_metadata_bangumi_oauth_unconfigured", "未配置 Bangumi OAuth 应用信息,无法登录。") + +fun metadataBangumiOAuthFailedMessage(detail: String = ""): UiText = + if (detail.isBlank()) { + uiText("settings_metadata_bangumi_oauth_failed", "Bangumi 登录失败。") + } else { + UiText("settings_metadata_bangumi_oauth_failed_detail", listOf(detail), "Bangumi 登录失败:$detail") + } + +fun metadataBangumiOAuthSuccessMessage(): UiText = + uiText("settings_metadata_bangumi_oauth_success", "Bangumi 登录成功。") + +fun metadataBangumiOAuthExchangingMessage(): UiText = + uiText("settings_metadata_bangumi_oauth_exchanging", "正在与 Bangumi 交换令牌…") + +fun metadataBangumiOAuthLoginActionLabel(): UiText = + uiText("settings_metadata_bangumi_oauth_login", "使用 Bangumi 登录") + +fun metadataBangumiOAuthDialogTitle(): UiText = + uiText("settings_metadata_bangumi_oauth_title", "Bangumi 登录") + +fun metadataBangumiOAuthExternalBrowserActionLabel(): UiText = + uiText("settings_metadata_bangumi_oauth_external", "用外部浏览器打开") + +fun metadataBangumiOAuthCancelActionLabel(): UiText = + uiText("settings_metadata_bangumi_oauth_cancel", "取消") + +fun metadataBangumiOAuthLogoutActionLabel(): UiText = + uiText("settings_metadata_bangumi_oauth_logout", "退出登录") + +fun metadataBangumiOAuthValidUntilMessage(expiresAtMillis: Long): UiText { + val text = if (expiresAtMillis > 0L) { + java.text.SimpleDateFormat("yyyy-MM-dd HH:mm", java.util.Locale.getDefault()) + .format(java.util.Date(expiresAtMillis)) + } else { + "" + } + return UiText("settings_metadata_bangumi_oauth_valid_until", listOf(text), "有效期至 $text") +} + fun metadataTmdbTokenSavedMessage(): UiText = uiText("settings_metadata_tmdb_saved_msg", "TMDB Token 已保存。") diff --git a/data/src/main/kotlin/com/miruplay/tv/data/secure/SecurePreferencesManager.kt b/data/src/main/kotlin/com/miruplay/tv/data/secure/SecurePreferencesManager.kt index aeb2d93d..e758ec19 100644 --- a/data/src/main/kotlin/com/miruplay/tv/data/secure/SecurePreferencesManager.kt +++ b/data/src/main/kotlin/com/miruplay/tv/data/secure/SecurePreferencesManager.kt @@ -57,6 +57,18 @@ class SecurePreferencesManager @Inject constructor( securePrefs.edit().putString(KEY_BANGUMI_TOKEN, value).apply() } + override var bangumiRefreshToken: String? + get() = securePrefs.getString(KEY_BANGUMI_REFRESH_TOKEN, null) + set(value) { + securePrefs.edit().putString(KEY_BANGUMI_REFRESH_TOKEN, value).apply() + } + + override var bangumiTokenExpiresAtMillis: Long + get() = securePrefs.getLong(KEY_BANGUMI_TOKEN_EXPIRES_AT, 0L) + set(value) { + securePrefs.edit().putLong(KEY_BANGUMI_TOKEN_EXPIRES_AT, value).apply() + } + override var tmdbAccessToken: String? get() = securePrefs.getString(KEY_TMDB_TOKEN, null) set(value) { @@ -128,7 +140,11 @@ class SecurePreferencesManager @Inject constructor( } override fun clearBangumiToken() { - securePrefs.edit().remove(KEY_BANGUMI_TOKEN).apply() + securePrefs.edit() + .remove(KEY_BANGUMI_TOKEN) + .remove(KEY_BANGUMI_REFRESH_TOKEN) + .remove(KEY_BANGUMI_TOKEN_EXPIRES_AT) + .apply() } override fun clearTmdbToken() { @@ -157,6 +173,8 @@ class SecurePreferencesManager @Inject constructor( private const val SECURE_PREFERENCES_NAME = "miruplay_secure_prefs" private const val COMPATIBILITY_PREFERENCES_NAME = "miruplay_secure_prefs_compat" private const val KEY_BANGUMI_TOKEN = "bangumi_access_token" + private const val KEY_BANGUMI_REFRESH_TOKEN = "bangumi_refresh_token" + private const val KEY_BANGUMI_TOKEN_EXPIRES_AT = "bangumi_token_expires_at" private const val KEY_TMDB_TOKEN = "tmdb_access_token" private const val KEY_TMDB_API_BASE_URL_OVERRIDE = "tmdb_api_base_url_override" private const val KEY_CLOUD_DRIVE_TOKEN = "cloud_drive_token" diff --git a/data/src/test/kotlin/com/miruplay/tv/data/logging/LogUploadRepositoryImplTest.kt b/data/src/test/kotlin/com/miruplay/tv/data/logging/LogUploadRepositoryImplTest.kt index 58ad18c7..38c799db 100644 --- a/data/src/test/kotlin/com/miruplay/tv/data/logging/LogUploadRepositoryImplTest.kt +++ b/data/src/test/kotlin/com/miruplay/tv/data/logging/LogUploadRepositoryImplTest.kt @@ -195,6 +195,8 @@ class LogUploadRepositoryImplTest { private class FakeCredentialStore : AppCredentialStore { override var bangumiAccessToken: String? = null + override var bangumiRefreshToken: String? = null + override var bangumiTokenExpiresAtMillis: Long = 0L override var tmdbAccessToken: String? = null override var tmdbApiBaseUrlOverride: String? = null override var otlpAccessToken: String? = null diff --git a/docs/agents/pre-pr-checklist.md b/docs/agents/pre-pr-checklist.md index 0fe32143..c62b1f82 100644 --- a/docs/agents/pre-pr-checklist.md +++ b/docs/agents/pre-pr-checklist.md @@ -234,3 +234,36 @@ Cross-checks: New failure class (section 1 candidate): - **Probe-gates-playback on unreachable networks** — a pre-playback metadata probe using a non-proxy transport (platform MediaExtractor, raw HttpURLConnection) hangs instead of failing fast, blocking the player start behind it with zero log signal. Check: every pre-playback network access must either share the playback transport/proxy config or have a hard timeout + skip path; verify on device with the origin blocked (direct connection must fail fast, proxy path must play). + +### Bangumi OAuth 直连登录(回环回调 + 7 天轮换)(v2.18) + +Own checks (unit-tested + 真机闭环已验证,HK1 @ 2026-10-20): + +- 未配置 client id/secret 时构建照常通过,设置页显示"未配置"状态而非崩溃(BuildConfig 空字符串兜底;CI 同仓库 PR 带 secret,fork PR 为空) +- 回调 `state` 对不上直接拒绝,不触发换 token;换 token 失败停留在 Failed 状态,可重试/取消 +- 刷新逻辑:有效期内直接返回现有 token;临期(24h)自动 refresh 并持久化新 pair;refresh 失败但旧 token 未过期则继续用旧 token,不把用户踢下线 +- `submitCallbackUrl` 的换 token 跑在新协程里,不占回环监听线程(izuko 踩过的坑:监听线程自取消会导致换 token 请求夭折) +- full `./gradlew assembleDebug test lint` green;新单测:OAuthClient 授权 URL/换 token/刷新/错误映射/MockWebServer、coordinator 状态机/去重/刷新边际/登出、SettingsViewModel 接线 +- [真机] WebView 授权页加载 → 账号登录并授权 → 自动跳回:显示"Token 已保存在加密存储中。"+"有效期至 2026-10-27 20:57"(7 天 TTL 与 bgm access_token 一致,证明换 token 解析与落库正确)+ 退出登录按钮 + 左侧"元数据 已设置 1 项" +- [真机] 到达成功态本身即证明全链:授权 URL 三件正确 → 回环接住 code → token 端点 200 → 加密持久化 → UI 状态刷新 +- [真机] force-stop 冷启动后登录态仍在,无崩溃;操作全程 logcat 无 AndroidRuntime:E + +Cross-checks: + +- 手动贴 Token 链路原样保留(coordinator 只读写同一套 SecurePreferences 键,互不覆盖语义外行为);现有 Bangumi 搜索/收藏/同步走 `tokenProvider` 读到的仍是同一份 access token +- WebAPI/WebUI 刻意不同步 OAuth 流程:回环回调 + WebView + 外部浏览器都是设备本地能力,Web 端已有手动 token 读写端点覆盖管理面;TV 设置页为唯一入口(surface-specific,见 parity 表) +- 新增 i18n key 四地对齐 + UiTextResolver 映射(lint MissingTranslation 通过) +- [真机] 同步全部 Bangumi 进度在空媒体库下点按无可见变化——符合设计(`animeCount > 0` 才显示结果行,`syncAllBangumi()` 空库直接返回零统计且不联网),不是 bug + +Not device-verified (to be covered by follow-ups, reason recorded): + +- 外部浏览器路径(回环监听在外部浏览器回调下的存活)——当时设备无可用系统浏览器做对照,且 WebView 路径已证明回环有效 +- 退出登录清理 —— 会登出用户刚登录的真实账号,需用户授权后再测 +- 临期自动刷新 —— 需改系统时间或等 6 天窗口,单测已覆盖分支 +- 无网络/代理未配失败态 —— 墙内直连 bgm.tv 本就超时,失败重试分支走单测 + +New findings (section 1 candidates / product constraints): + +- **WebView 不走应用代理,只认系统全局代理**:墙内网络下没有系统代理的盒子连授权页都打不开(ERR_CONNECTION_TIMED_OUT),OAuth 登录页加载完全不受 App 代理配置保护;只有 token 交换(OkHttp)走应用代理。面向墙内用户的登录方案必须把系统代理写进前置条件,或做二维码等不依赖 TV 出站的替代路径 +- **bgm 验证码是自动化天敌**:可疑 IP(代理出口)下几乎必弹验证码,自动化连错 4 次后停手(锁号风险);TV 端遥控器输验证码同样痛苦。验证码环节建议只做人走查,不进自动化 +- **Composed-path divergence(沿用 v2.16 条目)**:本次同样先 unit-test 后真机,设备行为与单测一致,未复现发散 diff --git a/docs/agents/settings-web-control-parity-checklist.md b/docs/agents/settings-web-control-parity-checklist.md index 30307eb3..899e9164 100644 --- a/docs/agents/settings-web-control-parity-checklist.md +++ b/docs/agents/settings-web-control-parity-checklist.md @@ -80,6 +80,7 @@ Suggested scope for the subagent: | Feature | TV settings | WebAPI | WebUI | Notes | |---|---|---|---|---| | Topping DAC 控制(toppingctl 协议) | ✅ AUDIO_DSP 区内 `ToppingDacControls` | ✅ `/api/topping/{status,volume,preset,flat,gain,power,preamp,usb-permission}` | ✅ 音频 DSP 视图 Topping DAC 卡片 | 音量仅 DX5 II(音量不在 HID 上的型号禁用输入);> −10 dB 需确认;未 confirmed 型号拒写 | +| Bangumi OAuth 直连登录(回环回调) | ✅ 元数据区登录按钮 + WebView 对话框 + 外部浏览器入口 | ➖ 刻意不同步(回环回调/鉴权全在设备本地;token 管理沿用已有 bangumi-token 端点) | ➖ 同左(手动贴 token 链路不变) | surface-specific:Web 侧无法完成 127.0.0.1 回调;有效期/状态仅 TV 展示 | ## Fast File Pointers - TV settings UI: `ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/` diff --git a/repository-api/src/main/kotlin/com/miruplay/tv/repository/CredentialStores.kt b/repository-api/src/main/kotlin/com/miruplay/tv/repository/CredentialStores.kt index bf308330..6f590a00 100644 --- a/repository-api/src/main/kotlin/com/miruplay/tv/repository/CredentialStores.kt +++ b/repository-api/src/main/kotlin/com/miruplay/tv/repository/CredentialStores.kt @@ -8,6 +8,8 @@ interface CloudDriveCredentialStore { interface AppCredentialStore : CloudDriveCredentialStore { var bangumiAccessToken: String? + var bangumiRefreshToken: String? + var bangumiTokenExpiresAtMillis: Long var tmdbAccessToken: String? var tmdbApiBaseUrlOverride: String? var otlpAccessToken: String? diff --git a/scraper-core/src/main/kotlin/com/miruplay/tv/scraper/core/BangumiOAuthClient.kt b/scraper-core/src/main/kotlin/com/miruplay/tv/scraper/core/BangumiOAuthClient.kt new file mode 100644 index 00000000..a67fcc53 --- /dev/null +++ b/scraper-core/src/main/kotlin/com/miruplay/tv/scraper/core/BangumiOAuthClient.kt @@ -0,0 +1,178 @@ +package com.miruplay.tv.scraper.core + +import com.miruplay.tv.core.common.AppError +import com.miruplay.tv.core.common.Result +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.Json +import okhttp3.FormBody +import okhttp3.OkHttpClient +import okhttp3.Request +import java.net.URLEncoder +import java.util.concurrent.TimeUnit + +object BangumiOAuthConstants { + const val AUTHORIZE_URL = "https://bgm.tv/oauth/authorize" + const val TOKEN_URL = "https://bgm.tv/oauth/access_token" + + const val CALLBACK_PORT = 13712 + const val CALLBACK_PATH = "/callback" + const val CALLBACK_URL = "http://127.0.0.1:$CALLBACK_PORT$CALLBACK_PATH" + + fun authorizeUrl( + clientId: String, + state: String, + callbackUrl: String = CALLBACK_URL, + ): String = + "$AUTHORIZE_URL?client_id=${clientId.urlEncode()}" + + "&response_type=code" + + "&state=${state.urlEncode()}" + + "&redirect_uri=${callbackUrl.urlEncode()}" + + private fun String.urlEncode(): String = + URLEncoder.encode(this, Charsets.UTF_8.name()) +} + +@Serializable +data class BangumiOAuthTokenResponse( + @SerialName("access_token") val accessToken: String = "", + @SerialName("expires_in") val expiresInSeconds: Long = 0L, + @SerialName("token_type") val tokenType: String = "", + @SerialName("refresh_token") val refreshToken: String = "", + @SerialName("user_id") val userId: Long = 0L, +) + +data class BangumiOAuthTokens( + val accessToken: String, + val refreshToken: String, + /** Epoch millis at which the access token expires. */ + val expiresAtMillis: Long, + val userId: Long = 0L, +) + +interface BangumiOAuthClientApi { + val isConfigured: Boolean + val clientId: String + fun configureProxy(proxyConfig: BangumiHttpProxyConfig) + suspend fun exchangeCode( + code: String, + callbackUrl: String = BangumiOAuthConstants.CALLBACK_URL, + ): Result + + suspend fun refresh( + refreshToken: String, + callbackUrl: String = BangumiOAuthConstants.CALLBACK_URL, + ): Result +} + +/** + * Direct OAuth2 client for Bangumi (no third-party relay involved). + * + * Flow: open [BangumiOAuthConstants.authorizeUrl] in a browser/WebView, Bangumi + * redirects to the loopback [BangumiOAuthConstants.CALLBACK_URL] with + * `?code=..&state=..`, then [exchangeCode] swaps the code for tokens. + * Access tokens live 7 days (`expires_in` 604800); use [refresh] to rotate. + */ +class BangumiOAuthClient( + override val clientId: String, + private val clientSecret: String, + httpClient: OkHttpClient? = null, + private val tokenUrl: String = BangumiOAuthConstants.TOKEN_URL, + private val clockMillis: () -> Long = System::currentTimeMillis, +) : BangumiOAuthClientApi { + private val proxyClient = BangumiProxyAwareOkHttpClient( + httpClient ?: defaultClient(), + ) + private val json = Json { ignoreUnknownKeys = true } + + override val isConfigured: Boolean + get() = clientId.isNotBlank() && clientSecret.isNotBlank() + + override fun configureProxy(proxyConfig: BangumiHttpProxyConfig) { + proxyClient.configureProxy(proxyConfig) + } + + override suspend fun exchangeCode( + code: String, + callbackUrl: String, + ): Result = requestToken( + grantType = "authorization_code", + callbackUrl = callbackUrl, + ) { + add("code", code) + } + + override suspend fun refresh( + refreshToken: String, + callbackUrl: String, + ): Result = requestToken( + grantType = "refresh_token", + callbackUrl = callbackUrl, + ) { + add("refresh_token", refreshToken) + } + + private suspend fun requestToken( + grantType: String, + callbackUrl: String, + extra: FormBody.Builder.() -> Unit, + ): Result = withContext(Dispatchers.IO) { + try { + if (!isConfigured) { + return@withContext Result.failure( + AppError.ScrapingError.ApiError(SOURCE_NAME, "Bangumi OAuth 未配置 client_id/secret"), + ) + } + val body = FormBody.Builder() + .add("grant_type", grantType) + .add("client_id", clientId) + .add("client_secret", clientSecret) + .add("redirect_uri", callbackUrl) + .apply(extra) + .build() + val request = Request.Builder() + .url(tokenUrl) + .post(body) + .addHeader("User-Agent", DEFAULT_USER_AGENT) + .addHeader("Accept", "application/json") + .build() + proxyClient.newCall(request).execute().use { response -> + val text = response.body?.string().orEmpty() + if (!response.isSuccessful) { + return@withContext Result.failure( + AppError.NetworkError.HttpError(response.code, text.ifBlank { response.message }), + ) + } + val parsed = json.decodeFromString(text) + if (parsed.accessToken.isBlank()) { + return@withContext Result.failure( + AppError.ScrapingError.ApiError(SOURCE_NAME, "Bangumi 换 token 响应缺 access_token"), + ) + } + Result.success( + BangumiOAuthTokens( + accessToken = parsed.accessToken, + refreshToken = parsed.refreshToken, + expiresAtMillis = clockMillis() + parsed.expiresInSeconds * 1000L, + userId = parsed.userId, + ) + ) + } + } catch (error: Exception) { + Result.failure(AppError.NetworkError.ServerUnreachable(tokenUrl)) + } + } + + companion object { + const val SOURCE_NAME = "Bangumi" + private const val DEFAULT_USER_AGENT = "ModerRAS/MiruPlay/0.1.0 (Android TV) (https://github.com/ModerRAS/MiruPlay)" + + private fun defaultClient(): OkHttpClient = + OkHttpClient.Builder() + .connectTimeout(30, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .build() + } +} diff --git a/scraper-core/src/test/kotlin/com/miruplay/tv/scraper/core/BangumiOAuthClientTest.kt b/scraper-core/src/test/kotlin/com/miruplay/tv/scraper/core/BangumiOAuthClientTest.kt new file mode 100644 index 00000000..a7e6fe50 --- /dev/null +++ b/scraper-core/src/test/kotlin/com/miruplay/tv/scraper/core/BangumiOAuthClientTest.kt @@ -0,0 +1,110 @@ +package com.miruplay.tv.scraper.core + +import com.miruplay.tv.core.common.Result +import kotlinx.coroutines.runBlocking +import okhttp3.mockwebserver.MockResponse +import okhttp3.mockwebserver.MockWebServer +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class BangumiOAuthClientTest { + @Test + fun `authorizeUrl contains client state and loopback redirect`() { + val url = BangumiOAuthConstants.authorizeUrl( + clientId = "test-id", + state = "state-123", + ) + + assertTrue(url.startsWith("https://bgm.tv/oauth/authorize?")) + assertTrue(url.contains("client_id=test-id")) + assertTrue(url.contains("response_type=code")) + assertTrue(url.contains("state=state-123")) + assertTrue(url.contains("redirect_uri=" + "http%3A%2F%2F127.0.0.1%3A13712%2Fcallback")) + } + + @Test + fun `exchangeCode posts form and parses tokens`() = runBlocking { + MockWebServer().use { server -> + server.enqueue( + MockResponse().setResponseCode(200).setBody( + """{"access_token":"access-1","expires_in":604800,"token_type":"Bearer","refresh_token":"refresh-1","user_id":42}""" + ) + ) + val client = BangumiOAuthClient( + clientId = "test-id", + clientSecret = "test-secret", + clockMillis = { 1_000L }, + tokenUrl = server.url("/oauth/access_token").toString(), + ) + + val result = client.exchangeCode("auth-code") + + val tokens = (result as Result.Success).data + assertEquals("access-1", tokens.accessToken) + assertEquals("refresh-1", tokens.refreshToken) + assertEquals(1_000L + 604800L * 1000L, tokens.expiresAtMillis) + assertEquals(42L, tokens.userId) + + val recorded = server.takeRequest() + assertEquals("POST", recorded.method) + val body = recorded.body.readUtf8() + assertTrue(body.contains("grant_type=authorization_code")) + assertTrue(body.contains("client_id=test-id")) + assertTrue(body.contains("client_secret=test-secret")) + assertTrue(body.contains("code=auth-code")) + assertTrue(body.contains("redirect_uri=")) + } + } + + @Test + fun `exchangeCode maps http error to HttpError`() = runBlocking { + MockWebServer().use { server -> + server.enqueue(MockResponse().setResponseCode(400).setBody("bad code")) + val client = BangumiOAuthClient( + clientId = "test-id", + clientSecret = "test-secret", + tokenUrl = server.url("/oauth/access_token").toString(), + ) + + val result = client.exchangeCode("bad-code") + + assertTrue(result is Result.Error) + } + } + + @Test + fun `refresh posts refresh grant and rotates tokens`() = runBlocking { + MockWebServer().use { server -> + server.enqueue( + MockResponse().setResponseCode(200).setBody( + """{"access_token":"access-2","expires_in":604800,"token_type":"Bearer","refresh_token":"refresh-2","user_id":42}""" + ) + ) + val client = BangumiOAuthClient( + clientId = "test-id", + clientSecret = "test-secret", + clockMillis = { 0L }, + tokenUrl = server.url("/oauth/access_token").toString(), + ) + + val result = client.refresh("refresh-1") + + val tokens = (result as Result.Success).data + assertEquals("access-2", tokens.accessToken) + assertEquals("refresh-2", tokens.refreshToken) + val recorded = server.takeRequest() + val refreshBody = recorded.body.readUtf8() + assertTrue(refreshBody.contains("grant_type=refresh_token")) + assertTrue(refreshBody.contains("refresh_token=refresh-1")) + } + } + + @Test + fun `unconfigured client fails fast without network`() = runBlocking { + val client = BangumiOAuthClient(clientId = "", clientSecret = "") + + assertTrue(client.exchangeCode("whatever") is Result.Error) + assertTrue(client.refresh("whatever") is Result.Error) + } +} diff --git a/scraper/src/test/kotlin/com/miruplay/tv/scraper/TmdbDramaMetadataRepositoryTest.kt b/scraper/src/test/kotlin/com/miruplay/tv/scraper/TmdbDramaMetadataRepositoryTest.kt index d6d954e9..c43d262b 100644 --- a/scraper/src/test/kotlin/com/miruplay/tv/scraper/TmdbDramaMetadataRepositoryTest.kt +++ b/scraper/src/test/kotlin/com/miruplay/tv/scraper/TmdbDramaMetadataRepositoryTest.kt @@ -409,6 +409,8 @@ class TmdbDramaMetadataRepositoryTest { override var cloudDriveToken: String? = null override var cloudDrivePassword: String? = null override var bangumiAccessToken: String? = null + override var bangumiRefreshToken: String? = null + override var bangumiTokenExpiresAtMillis: Long = 0L override var otlpAccessToken: String? = null override fun clearCloudDriveCredentials() { diff --git a/sync-engine-shared/build.gradle.kts b/sync-engine-shared/build.gradle.kts index 27a8fd5d..b5d5f028 100644 --- a/sync-engine-shared/build.gradle.kts +++ b/sync-engine-shared/build.gradle.kts @@ -16,6 +16,7 @@ dependencies { implementation(libs.kotlinx.coroutines.core) implementation(libs.okhttp) + implementation(libs.nanohttpd) testImplementation(libs.junit) } diff --git a/sync-engine-shared/src/main/kotlin/com/miruplay/tv/sync/BangumiOAuthCoordinator.kt b/sync-engine-shared/src/main/kotlin/com/miruplay/tv/sync/BangumiOAuthCoordinator.kt new file mode 100644 index 00000000..7a5823ec --- /dev/null +++ b/sync-engine-shared/src/main/kotlin/com/miruplay/tv/sync/BangumiOAuthCoordinator.kt @@ -0,0 +1,203 @@ +package com.miruplay.tv.sync + +import com.miruplay.tv.core.common.Result +import com.miruplay.tv.core.common.UiText +import com.miruplay.tv.model.metadataBangumiOAuthFailedMessage +import com.miruplay.tv.model.metadataBangumiOAuthNotConfiguredMessage +import com.miruplay.tv.repository.AppCredentialStore +import com.miruplay.tv.scraper.core.BangumiHttpProxyConfig +import com.miruplay.tv.scraper.core.BangumiOAuthClientApi +import com.miruplay.tv.scraper.core.BangumiOAuthConstants +import java.util.UUID +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch + +sealed interface BangumiOAuthState { + data object Idle : BangumiOAuthState + data object NotConfigured : BangumiOAuthState + data class Authorizing(val url: String) : BangumiOAuthState + data object Exchanging : BangumiOAuthState + data object Success : BangumiOAuthState + data class Failed(val message: UiText) : BangumiOAuthState +} + +fun interface BangumiOAuthLoopbackFactory { + fun create(onCallback: (callbackUrl: String) -> Unit): BangumiOAuthLoopbackHandle +} + +interface BangumiOAuthLoopbackHandle { + fun start() + fun stop() +} + +/** + * App-side driver of the direct Bangumi OAuth flow. + * + * TV opens [BangumiOAuthConstants.authorizeUrl], the user approves in a + * browser/WebView, Bangumi redirects to the loopback callback and + * [submitCallbackUrl] exchanges the code. Tokens (access 7 days + refresh) + * persist in [credentials]; [ensureValidToken] rotates them proactively. + */ +class BangumiOAuthCoordinator( + private val credentials: AppCredentialStore, + private val client: BangumiOAuthClientApi?, + private val loopbackFactory: BangumiOAuthLoopbackFactory = BangumiOAuthLoopbackFactory { onCallback -> + object : BangumiOAuthLoopbackHandle { + private val server = BangumiOAuthLoopbackServer( + port = BangumiOAuthConstants.CALLBACK_PORT, + path = BangumiOAuthConstants.CALLBACK_PATH, + onCallback = onCallback, + ) + + override fun start() = server.start() + override fun stop() = server.stop() + } + }, + private val scope: CoroutineScope, + private val clockMillis: () -> Long = System::currentTimeMillis, + private val newState: () -> String = { UUID.randomUUID().toString() }, + private val proxyConfig: suspend () -> BangumiHttpProxyConfig = { BangumiHttpProxyConfig.Disabled }, +) { + private val _state = MutableStateFlow(BangumiOAuthState.Idle) + val state: StateFlow = _state.asStateFlow() + + private var pendingState: String? = null + private var loopback: BangumiOAuthLoopbackHandle? = null + private var loopbackJob: Job? = null + + val isConfigured: Boolean + get() = client != null && client.isConfigured + + /** Starts an authorize flow and returns the URL to open. Null when unconfigured. */ + fun startAuthorize(): String? { + val oauthClient = client?.takeIf { it.isConfigured } ?: run { + _state.value = BangumiOAuthState.NotConfigured + return null + } + cancelLocked() + val state = newState() + pendingState = state + val url = BangumiOAuthConstants.authorizeUrl( + clientId = oauthClient.clientId, + state = state, + ) + _state.value = BangumiOAuthState.Authorizing(url) + val handle = loopbackFactory.create { callbackUrl -> + // Never await the exchange on the HTTP callback thread: stopping the + // loopback server cancels its own job and would abort the token call. + scope.launch { submitCallbackUrl(callbackUrl) } + } + loopback = handle + loopbackJob = scope.launch { + runCatching { handle.start() } + } + return url + } + + /** + * Accepts a redirected callback URL (`?code=..&state=..`). + * @return true when the URL belonged to the pending flow. + */ + suspend fun submitCallbackUrl(callbackUrl: String): Boolean { + val expected = pendingState ?: return false + val query = callbackUrl.substringAfter('?', "") + val params = query.split('&') + .mapNotNull { + val key = it.substringBefore('=') + val value = it.substringAfter('=', "") + if (key.isNotBlank()) key to value else null + }.toMap() + if (params["state"] != expected) return false + val code = params["code"].orEmpty() + if (code.isBlank()) { + _state.value = BangumiOAuthState.Failed( + metadataBangumiOAuthFailedMessage("缺少授权码") + ) + stopLoopback() + return true + } + _state.value = BangumiOAuthState.Exchanging + val oauthClient = client + if (oauthClient == null) { + _state.value = BangumiOAuthState.Failed(metadataBangumiOAuthNotConfiguredMessage()) + stopLoopback() + return true + } + oauthClient.configureProxy(proxyConfig()) + when (val result = oauthClient.exchangeCode(code)) { + is Result.Success -> { + persist(result.data.accessToken, result.data.refreshToken, result.data.expiresAtMillis) + pendingState = null + _state.value = BangumiOAuthState.Success + } + is Result.Error -> { + _state.value = BangumiOAuthState.Failed(metadataBangumiOAuthFailedMessage()) + } + } + stopLoopback() + return true + } + + fun cancel() { + stopLoopback() + pendingState = null + _state.value = BangumiOAuthState.Idle + } + + fun logout() { + stopLoopback() + pendingState = null + credentials.clearBangumiToken() + _state.value = BangumiOAuthState.Idle + } + + /** + * Returns a usable access token, refreshing proactively when the stored + * one expires within [refreshMarginMillis]. Null when logged out or when + * the refresh fails and nothing valid remains. + */ + suspend fun ensureValidToken(refreshMarginMillis: Long = REFRESH_MARGIN_MILLIS): String? { + val current = credentials.bangumiAccessToken?.takeIf { it.isNotBlank() } ?: return null + val expiresAt = credentials.bangumiTokenExpiresAtMillis + if (expiresAt <= 0L || expiresAt - clockMillis() > refreshMarginMillis) { + return current + } + val refreshToken = credentials.bangumiRefreshToken?.takeIf { it.isNotBlank() } + ?: return current.takeIf { expiresAt > clockMillis() } + val oauthClient = client?.takeIf { it.isConfigured } ?: return current + oauthClient.configureProxy(proxyConfig()) + return when (val result = oauthClient.refresh(refreshToken)) { + is Result.Success -> { + persist(result.data.accessToken, result.data.refreshToken, result.data.expiresAtMillis) + result.data.accessToken + } + is Result.Error -> current.takeIf { expiresAt > clockMillis() } + } + } + + private fun persist(accessToken: String, refreshToken: String, expiresAtMillis: Long) { + credentials.bangumiAccessToken = accessToken + credentials.bangumiRefreshToken = refreshToken.ifBlank { credentials.bangumiRefreshToken } + credentials.bangumiTokenExpiresAtMillis = expiresAtMillis + } + + private fun stopLoopback() { + loopbackJob?.cancel() + loopbackJob = null + runCatching { loopback?.stop() } + loopback = null + } + + private fun cancelLocked() { + stopLoopback() + pendingState = null + } + + companion object { + const val REFRESH_MARGIN_MILLIS = 24L * 60L * 60L * 1000L + } +} diff --git a/sync-engine-shared/src/main/kotlin/com/miruplay/tv/sync/BangumiOAuthLoopbackServer.kt b/sync-engine-shared/src/main/kotlin/com/miruplay/tv/sync/BangumiOAuthLoopbackServer.kt new file mode 100644 index 00000000..820bd1a2 --- /dev/null +++ b/sync-engine-shared/src/main/kotlin/com/miruplay/tv/sync/BangumiOAuthLoopbackServer.kt @@ -0,0 +1,51 @@ +package com.miruplay.tv.sync + +import fi.iki.elonen.NanoHTTPD + +/** + * Minimal loopback HTTP server that captures the Bangumi OAuth redirect. + * + * The TV browser does not hand custom schemes back to the app, so the + * registered redirect URI is plain HTTP on loopback + * ([com.miruplay.tv.scraper.core.BangumiOAuthConstants.CALLBACK_URL]). + * [start] blocks until the first `/callback` hit (or [stop]), then the + * coordinator exchanges the code. Bound to 127.0.0.1 only: only processes + * on this device can reach it. + */ +class BangumiOAuthLoopbackServer( + private val port: Int, + private val path: String = "/callback", + private val onCallback: (callbackUrl: String) -> Unit, +) { + private var server: NanoHTTPD? = null + + fun start() { + if (server != null) return + server = object : NanoHTTPD("127.0.0.1", port) { + override fun serve(session: IHTTPSession): Response { + val uri = session.uri.substringBefore('?') + if (session.method == Method.GET && uri == path) { + val query = session.queryParameterString.orEmpty() + val callbackUrl = "http://127.0.0.1:$port$path" + + (if (query.isBlank()) "" else "?$query") + runCatching { onCallback(callbackUrl) } + return newFixedLengthResponse( + Response.Status.OK, + "text/html; charset=utf-8", + "

授权成功,请返回电视

", + ) + } + return newFixedLengthResponse(Response.Status.NOT_FOUND, MIME_PLAINTEXT, "Not found") + } + }.also { it.start(SOCKET_READ_TIMEOUT_MS, false) } + } + + fun stop() { + runCatching { server?.stop() } + server = null + } + + companion object { + private const val SOCKET_READ_TIMEOUT_MS = 10_000 + } +} diff --git a/sync-engine-shared/src/test/kotlin/com/miruplay/tv/sync/BangumiCredentialActionCoordinatorTest.kt b/sync-engine-shared/src/test/kotlin/com/miruplay/tv/sync/BangumiCredentialActionCoordinatorTest.kt index 21b8f95f..5e6a6ddc 100644 --- a/sync-engine-shared/src/test/kotlin/com/miruplay/tv/sync/BangumiCredentialActionCoordinatorTest.kt +++ b/sync-engine-shared/src/test/kotlin/com/miruplay/tv/sync/BangumiCredentialActionCoordinatorTest.kt @@ -96,6 +96,8 @@ class BangumiCredentialActionCoordinatorTest { } override var bangumiAccessToken: String? = bangumiToken + override var bangumiRefreshToken: String? = null + override var bangumiTokenExpiresAtMillis: Long = 0L override var tmdbAccessToken: String? = null override var tmdbApiBaseUrlOverride: String? = null diff --git a/sync-engine-shared/src/test/kotlin/com/miruplay/tv/sync/BangumiOAuthCoordinatorTest.kt b/sync-engine-shared/src/test/kotlin/com/miruplay/tv/sync/BangumiOAuthCoordinatorTest.kt new file mode 100644 index 00000000..a1225740 --- /dev/null +++ b/sync-engine-shared/src/test/kotlin/com/miruplay/tv/sync/BangumiOAuthCoordinatorTest.kt @@ -0,0 +1,197 @@ +package com.miruplay.tv.sync + +import com.miruplay.tv.core.common.Result +import com.miruplay.tv.repository.AppCredentialStore +import com.miruplay.tv.scraper.core.BangumiHttpProxyConfig +import com.miruplay.tv.scraper.core.BangumiOAuthClientApi +import com.miruplay.tv.scraper.core.BangumiOAuthTokens +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.cancel +import kotlinx.coroutines.runBlocking +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +private class FakeCredentials : AppCredentialStore { + override var cloudDriveToken: String? = null + override var cloudDrivePassword: String? = null + override fun clearCloudDriveCredentials() { + cloudDriveToken = null + cloudDrivePassword = null + } + + override var bangumiAccessToken: String? = null + override var bangumiRefreshToken: String? = null + override var bangumiTokenExpiresAtMillis: Long = 0L + override var tmdbAccessToken: String? = null + override var tmdbApiBaseUrlOverride: String? = null + override var otlpAccessToken: String? = null + override fun clearBangumiToken() { + bangumiAccessToken = null + bangumiRefreshToken = null + bangumiTokenExpiresAtMillis = 0L + } + + override fun clearTmdbToken() { + tmdbAccessToken = null + tmdbApiBaseUrlOverride = null + } + + override fun clearOtlpAccessToken() { + otlpAccessToken = null + } +} + +private class FakeOAuthClient( + override val isConfigured: Boolean = true, + override val clientId: String = "test-id", + var exchangeResult: Result = + Result.success(BangumiOAuthTokens("access-1", "refresh-1", 9_999_999_999L, 7L)), + var refreshResult: Result = + Result.success(BangumiOAuthTokens("access-2", "refresh-2", 9_999_999_999L, 7L)), +) : BangumiOAuthClientApi { + var lastExchangeCode: String? = null + var lastRefreshToken: String? = null + var lastProxyEnabled: Boolean? = null + + override fun configureProxy(proxyConfig: BangumiHttpProxyConfig) { + lastProxyEnabled = proxyConfig.enabled + } + + override suspend fun exchangeCode(code: String, callbackUrl: String): Result { + lastExchangeCode = code + return exchangeResult + } + + override suspend fun refresh(refreshToken: String, callbackUrl: String): Result { + lastRefreshToken = refreshToken + return refreshResult + } +} + +private class FakeLoopback(val accepted: MutableList = mutableListOf()) : + BangumiOAuthLoopbackHandle { + var started = false + var stopped = false + override fun start() { + started = true + } + + override fun stop() { + stopped = true + } +} + +class BangumiOAuthCoordinatorTest { + private fun coordinator( + credentials: FakeCredentials = FakeCredentials(), + client: FakeOAuthClient = FakeOAuthClient(), + loopbacks: MutableList = mutableListOf(), + clockMillis: () -> Long = { 1_000L }, + ): Triple { + val scope = CoroutineScope(SupervisorJob() + Dispatchers.Unconfined) + val coordinator = BangumiOAuthCoordinator( + credentials = credentials, + client = client, + loopbackFactory = BangumiOAuthLoopbackFactory { _ -> + FakeLoopback().also { loopbacks += it } + }, + scope = scope, + clockMillis = clockMillis, + ) + return Triple(coordinator, credentials, client) + } + + @Test + fun `unconfigured client reports NotConfigured without url`() = runBlocking { + val (coordinator, _, _) = coordinator(client = FakeOAuthClient(isConfigured = false)) + + assertNull(coordinator.startAuthorize()) + assertTrue(coordinator.state.value is BangumiOAuthState.NotConfigured) + } + + @Test + fun `startAuthorize emits url and wrong state callback is rejected`() = runBlocking { + val (coordinator, _, _) = coordinator() + + val url = coordinator.startAuthorize() + assertTrue(url!!.contains("https://bgm.tv/oauth/authorize?")) + assertTrue(coordinator.state.value is BangumiOAuthState.Authorizing) + + assertFalse(coordinator.submitCallbackUrl("http://127.0.0.1:13712/callback?code=x&state=wrong")) + assertTrue(coordinator.state.value is BangumiOAuthState.Authorizing) + } + + @Test + fun `matching callback exchanges code and persists tokens`() = runBlocking { + val (coordinator, credentials, client) = coordinator() + val url = coordinator.startAuthorize()!! + val state = url.substringAfter("state=").substringBefore("&") + + assertTrue(coordinator.submitCallbackUrl("http://127.0.0.1:13712/callback?code=auth-code&state=$state")) + assertEquals("auth-code", client.lastExchangeCode) + assertEquals("access-1", credentials.bangumiAccessToken) + assertEquals("refresh-1", credentials.bangumiRefreshToken) + assertEquals(9_999_999_999L, credentials.bangumiTokenExpiresAtMillis) + assertTrue(coordinator.state.value is BangumiOAuthState.Success) + } + + @Test + fun `failed exchange surfaces Failed state`() = runBlocking { + val (coordinator, _, client) = coordinator() + client.exchangeResult = Result.failure( + com.miruplay.tv.core.common.AppError.NetworkError.HttpError(400, "bad code") + ) + val url = coordinator.startAuthorize()!! + val state = url.substringAfter("state=").substringBefore("&") + + assertTrue(coordinator.submitCallbackUrl("http://127.0.0.1:13712/callback?code=bad&state=$state")) + assertTrue(coordinator.state.value is BangumiOAuthState.Failed) + } + + @Test + fun `ensureValidToken returns fresh token without refresh`() = runBlocking { + val credentials = FakeCredentials().apply { + bangumiAccessToken = "still-good" + bangumiTokenExpiresAtMillis = 9_999_999_999L + } + val (coordinator, _, client) = coordinator(credentials = credentials) + + assertEquals("still-good", coordinator.ensureValidToken()) + assertNull(client.lastRefreshToken) + } + + @Test + fun `ensureValidToken refreshes near expiry`() = runBlocking { + val credentials = FakeCredentials().apply { + bangumiAccessToken = "almost-dead" + bangumiRefreshToken = "refresh-1" + bangumiTokenExpiresAtMillis = 2_000L + } + val (coordinator, _, client) = coordinator(credentials = credentials, clockMillis = { 1_000L }) + + assertEquals("access-2", coordinator.ensureValidToken()) + assertEquals("refresh-1", client.lastRefreshToken) + assertEquals("access-2", credentials.bangumiAccessToken) + } + + @Test + fun `ensureValidToken returns null when logged out`() = runBlocking { + val (coordinator, _, _) = coordinator() + assertNull(coordinator.ensureValidToken()) + } + + @Test + fun `logout clears tokens and resets state`() = runBlocking { + val (coordinator, credentials, _) = coordinator() + coordinator.startAuthorize() + coordinator.logout() + + assertNull(credentials.bangumiAccessToken) + assertTrue(coordinator.state.value is BangumiOAuthState.Idle) + } +} diff --git a/ui-tv/src/main/kotlin/com/miruplay/tv/ui/common/UiTextResolver.kt b/ui-tv/src/main/kotlin/com/miruplay/tv/ui/common/UiTextResolver.kt index 42311de6..afce1534 100644 --- a/ui-tv/src/main/kotlin/com/miruplay/tv/ui/common/UiTextResolver.kt +++ b/ui-tv/src/main/kotlin/com/miruplay/tv/ui/common/UiTextResolver.kt @@ -673,6 +673,17 @@ internal fun uiTextResId(key: String): Int = "settings_metadata_bangumi_status_on" -> R.string.settings_metadata_bangumi_status_on "settings_metadata_bangumi_tile" -> R.string.settings_metadata_bangumi_tile "settings_metadata_bangumi_tile_detail" -> R.string.settings_metadata_bangumi_tile_detail + "settings_metadata_bangumi_oauth_unconfigured" -> R.string.settings_metadata_bangumi_oauth_unconfigured + "settings_metadata_bangumi_oauth_failed" -> R.string.settings_metadata_bangumi_oauth_failed + "settings_metadata_bangumi_oauth_failed_detail" -> R.string.settings_metadata_bangumi_oauth_failed_detail + "settings_metadata_bangumi_oauth_success" -> R.string.settings_metadata_bangumi_oauth_success + "settings_metadata_bangumi_oauth_exchanging" -> R.string.settings_metadata_bangumi_oauth_exchanging + "settings_metadata_bangumi_oauth_login" -> R.string.settings_metadata_bangumi_oauth_login + "settings_metadata_bangumi_oauth_title" -> R.string.settings_metadata_bangumi_oauth_title + "settings_metadata_bangumi_oauth_external" -> R.string.settings_metadata_bangumi_oauth_external + "settings_metadata_bangumi_oauth_cancel" -> R.string.settings_metadata_bangumi_oauth_cancel + "settings_metadata_bangumi_oauth_logout" -> R.string.settings_metadata_bangumi_oauth_logout + "settings_metadata_bangumi_oauth_valid_until" -> R.string.settings_metadata_bangumi_oauth_valid_until "settings_metadata_candidate_detail" -> R.string.settings_metadata_candidate_detail "settings_metadata_match_detail" -> R.string.settings_metadata_match_detail "settings_metadata_status" -> R.string.settings_metadata_status diff --git a/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/AddSourceScreen.kt b/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/AddSourceScreen.kt index 4bbe79d1..faf67190 100644 --- a/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/AddSourceScreen.kt +++ b/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/AddSourceScreen.kt @@ -2,9 +2,13 @@ package com.miruplay.tv.ui.settings import android.Manifest import android.content.Context +import android.content.Intent import android.content.pm.PackageManager import android.net.Uri import android.provider.DocumentsContract +import android.webkit.WebResourceRequest +import android.webkit.WebView +import android.webkit.WebViewClient import androidx.activity.compose.BackHandler import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts @@ -106,6 +110,9 @@ import androidx.compose.ui.input.key.key import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.input.key.type import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.viewinterop.AndroidView +import com.miruplay.tv.scraper.core.BangumiOAuthConstants +import com.miruplay.tv.sync.BangumiOAuthState import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp @@ -242,6 +249,16 @@ import com.miruplay.tv.model.pictureSettingsDescriptionLabel import com.miruplay.tv.model.pictureSettingsTitleLabel import com.miruplay.tv.model.playbackBackendLabel import com.miruplay.tv.model.metadataPanelTitleLabel +import com.miruplay.tv.model.metadataBangumiOAuthCancelActionLabel +import com.miruplay.tv.model.metadataBangumiOAuthDialogTitle +import com.miruplay.tv.model.metadataBangumiOAuthExchangingMessage +import com.miruplay.tv.model.metadataBangumiOAuthExternalBrowserActionLabel +import com.miruplay.tv.model.metadataBangumiOAuthFailedMessage +import com.miruplay.tv.model.metadataBangumiOAuthLoginActionLabel +import com.miruplay.tv.model.metadataBangumiOAuthLogoutActionLabel +import com.miruplay.tv.model.metadataBangumiOAuthNotConfiguredMessage +import com.miruplay.tv.model.metadataBangumiOAuthSuccessMessage +import com.miruplay.tv.model.metadataBangumiOAuthValidUntilMessage import com.miruplay.tv.model.metadataBangumiTokenFieldLabel import com.miruplay.tv.model.metadataBangumiTokenMissingStatus import com.miruplay.tv.model.metadataBangumiTokenOptionalHint @@ -425,6 +442,8 @@ fun AddSourceScreen( val sources by viewModel.sources.collectAsStateWithLifecycle() val testResult by viewModel.testResult.collectAsStateWithLifecycle() val savedToken by viewModel.bangumiToken.collectAsStateWithLifecycle() + val bangumiOAuthState by viewModel.bangumiOAuthState.collectAsStateWithLifecycle() + val bangumiTokenExpiryMs by viewModel.bangumiTokenExpiryMs.collectAsStateWithLifecycle() val autoScanEnabled by viewModel.autoScanEnabled.collectAsStateWithLifecycle() val autoScanIntervalHours by viewModel.autoScanIntervalHours.collectAsStateWithLifecycle() val lastScanAt by viewModel.lastScanAt.collectAsStateWithLifecycle() @@ -801,6 +820,12 @@ fun AddSourceScreen( tokenInput = "" tokenSaved = false }, + oauthState = bangumiOAuthState, + tokenExpiryMs = bangumiTokenExpiryMs, + onStartOAuth = viewModel::startBangumiOAuth, + onCancelOAuth = viewModel::cancelBangumiOAuth, + onOAuthCallback = viewModel::submitBangumiOAuthCallback, + onLogoutOAuth = viewModel::logoutBangumiOAuth, onSyncAll = viewModel::syncBangumiAll, syncState = bangumiSyncState, savedTmdbToken = savedTmdbToken, @@ -1295,6 +1320,12 @@ private fun SettingsContent( onTokenChange: (String) -> Unit, onSaveToken: () -> Unit, onClearToken: () -> Unit, + oauthState: BangumiOAuthState, + tokenExpiryMs: Long, + onStartOAuth: () -> String?, + onCancelOAuth: () -> Unit, + onOAuthCallback: (String) -> Unit, + onLogoutOAuth: () -> Unit, onSyncAll: () -> Unit, syncState: BangumiSyncAllUiState, savedTmdbToken: String, @@ -1624,6 +1655,12 @@ private fun SettingsContent( onTokenChange = onTokenChange, onSaveToken = onSaveToken, onClearToken = onClearToken, + oauthState = oauthState, + tokenExpiryMs = tokenExpiryMs, + onStartOAuth = onStartOAuth, + onCancelOAuth = onCancelOAuth, + onOAuthCallback = onOAuthCallback, + onLogoutOAuth = onLogoutOAuth, onSyncAll = onSyncAll, syncState = syncState, savedTmdbToken = savedTmdbToken, @@ -4519,6 +4556,159 @@ private fun ProxySettingsPanel( } } +@Composable +private fun BangumiOAuthSection( + hasToken: Boolean, + tokenExpiryMs: Long, + oauthState: BangumiOAuthState, + onStartOAuth: () -> String?, + onCancelOAuth: () -> Unit, + onOAuthCallback: (String) -> Unit, + onLogoutOAuth: () -> Unit, +) { + val context = LocalContext.current + var dialogUrl by remember { mutableStateOf(null) } + + LaunchedEffect(oauthState) { + if (oauthState is BangumiOAuthState.Success) dialogUrl = null + } + + Spacer(Modifier.height(12.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + if (hasToken) { + TvButton( + text = metadataBangumiOAuthLogoutActionLabel().resolve(), + icon = Icons.Filled.Delete, + onClick = onLogoutOAuth, + ) + } else { + TvButton( + text = metadataBangumiOAuthLoginActionLabel().resolve(), + icon = Icons.Filled.Key, + onClick = { + dialogUrl = onStartOAuth() + }, + ) + } + } + + val statusText: String? = when (val state = oauthState) { + is BangumiOAuthState.Authorizing -> null + BangumiOAuthState.Exchanging -> metadataBangumiOAuthExchangingMessage().resolve() + BangumiOAuthState.Success -> metadataBangumiOAuthSuccessMessage().resolve() + is BangumiOAuthState.Failed -> state.message.resolve() + BangumiOAuthState.NotConfigured -> metadataBangumiOAuthNotConfiguredMessage().resolve() + BangumiOAuthState.Idle -> if (hasToken && tokenExpiryMs > 0L) { + metadataBangumiOAuthValidUntilMessage(tokenExpiryMs).resolve() + } else { + null + } + } + if (statusText != null) { + Spacer(Modifier.height(8.dp)) + StatusMessage( + icon = if (oauthState is BangumiOAuthState.Failed) Icons.Filled.Warning else Icons.Filled.CheckCircle, + text = statusText, + color = if (oauthState is BangumiOAuthState.Failed) WarningYellow else TextSecondary, + ) + } + + val url = dialogUrl + if (url != null) { + BangumiOAuthDialog( + authorizeUrl = url, + onExternalBrowser = { + runCatching { + context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url))) + } + }, + onCallback = onOAuthCallback, + onDismiss = { + dialogUrl = null + onCancelOAuth() + }, + ) + } +} + +@Composable +private fun BangumiOAuthDialog( + authorizeUrl: String, + onExternalBrowser: () -> Unit, + onCallback: (String) -> Unit, + onDismiss: () -> Unit, +) { + var webViewRef by remember { mutableStateOf(null) } + BackHandler { + val webView = webViewRef + if (webView != null && webView.canGoBack()) { + webView.goBack() + } else { + onDismiss() + } + } + Dialog(onDismissRequest = onDismiss) { + Column( + modifier = Modifier + .width(960.dp) + .clip(RoundedCornerShape(12.dp)) + .background(DarkSurface) + .border(1.dp, Color.White.copy(alpha = 0.16f), RoundedCornerShape(12.dp)) + .padding(20.dp), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + Text( + text = metadataBangumiOAuthDialogTitle().resolve(), + style = TvTypography.subtitle, + color = TextPrimary, + ) + AndroidView( + factory = { context -> + WebView(context).apply { + settings.javaScriptEnabled = true + webViewClient = object : WebViewClient() { + override fun shouldOverrideUrlLoading( + view: WebView?, + request: WebResourceRequest?, + ): Boolean { + val target = request?.url?.toString().orEmpty() + return if (target.startsWith(BangumiOAuthConstants.CALLBACK_URL)) { + onCallback(target) + true + } else { + false + } + } + } + loadUrl(authorizeUrl) + } + }, + update = { webViewRef = it }, + modifier = Modifier + .fillMaxWidth() + .height(520.dp) + .clip(RoundedCornerShape(8.dp)), + onRelease = { webView -> + webView.stopLoading() + webView.destroy() + }, + ) + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + TvButton( + text = metadataBangumiOAuthExternalBrowserActionLabel().resolve(), + icon = Icons.Filled.Language, + onClick = onExternalBrowser, + ) + TvButton( + text = metadataBangumiOAuthCancelActionLabel().resolve(), + icon = Icons.Filled.Close, + onClick = onDismiss, + ) + } + } + } +} + @Composable private fun MetadataPanel( savedToken: String, @@ -4527,6 +4717,12 @@ private fun MetadataPanel( onTokenChange: (String) -> Unit, onSaveToken: () -> Unit, onClearToken: () -> Unit, + oauthState: BangumiOAuthState, + tokenExpiryMs: Long, + onStartOAuth: () -> String?, + onCancelOAuth: () -> Unit, + onOAuthCallback: (String) -> Unit, + onLogoutOAuth: () -> Unit, onSyncAll: () -> Unit, syncState: BangumiSyncAllUiState, savedTmdbToken: String, @@ -4590,6 +4786,16 @@ private fun MetadataPanel( color = if (hasToken) ProgressGreen else TextSecondary ) + BangumiOAuthSection( + hasToken = hasToken, + tokenExpiryMs = tokenExpiryMs, + oauthState = oauthState, + onStartOAuth = onStartOAuth, + onCancelOAuth = onCancelOAuth, + onOAuthCallback = onOAuthCallback, + onLogoutOAuth = onLogoutOAuth, + ) + Spacer(Modifier.height(16.dp)) Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { TvButton( diff --git a/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/SettingsViewModel.kt b/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/SettingsViewModel.kt index 7a3c15f3..21c8b0dd 100644 --- a/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/SettingsViewModel.kt +++ b/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/SettingsViewModel.kt @@ -105,6 +105,8 @@ import com.miruplay.tv.sync.rss.CloudDriveDirectoryTarget import com.miruplay.tv.sync.rss.loadCloudDriveDirectory import com.miruplay.tv.sync.rss.loadingFor import com.miruplay.tv.sync.rss.prepareCloudDriveDirectoryBrowser +import com.miruplay.tv.sync.BangumiOAuthCoordinator +import com.miruplay.tv.sync.BangumiOAuthState import com.miruplay.tv.sync.BangumiSyncEngine import com.miruplay.tv.model.rssSubscriptionDeletedStatus import com.miruplay.tv.model.rssSubscriptionSavedStatus @@ -164,6 +166,7 @@ class SettingsViewModel @Inject constructor( private val backgroundTasks: BackgroundTaskForegroundController, private val audioDspRuntimeConfig: AudioDspRuntimeConfig, private val bangumiSyncEngine: BangumiSyncEngine, + private val bangumiOAuth: BangumiOAuthCoordinator, @ApplicationContext private val appContext: Context, private val audioMeasureController: AudioMeasureController, private val toppingController: com.miruplay.tv.topping.ToppingController, @@ -189,6 +192,10 @@ class SettingsViewModel @Inject constructor( private val _bangumiToken = MutableStateFlow(securePrefs.bangumiAccessToken ?: "") val bangumiToken: StateFlow = _bangumiToken.asStateFlow() + val bangumiOAuthState: StateFlow = bangumiOAuth.state + private val _bangumiTokenExpiryMs = MutableStateFlow(securePrefs.bangumiTokenExpiresAtMillis) + val bangumiTokenExpiryMs: StateFlow = _bangumiTokenExpiryMs.asStateFlow() + private val _tmdbToken = MutableStateFlow(securePrefs.tmdbAccessToken ?: "") val tmdbToken: StateFlow = _tmdbToken.asStateFlow() @@ -715,11 +722,37 @@ class SettingsViewModel @Inject constructor( ) securePrefs.bangumiAccessToken = result.token _bangumiToken.value = result.token.orEmpty() + _bangumiTokenExpiryMs.value = securePrefs.bangumiTokenExpiresAtMillis } fun clearBangumiToken() { securePrefs.clearBangumiToken() _bangumiToken.value = "" + _bangumiTokenExpiryMs.value = 0L + } + + fun startBangumiOAuth(): String? = bangumiOAuth.startAuthorize() + + fun cancelBangumiOAuth() { + bangumiOAuth.cancel() + } + + fun submitBangumiOAuthCallback(url: String) { + viewModelScope.launch { + if (bangumiOAuth.submitCallbackUrl(url)) { + refreshBangumiTokenState() + } + } + } + + fun logoutBangumiOAuth() { + bangumiOAuth.logout() + refreshBangumiTokenState() + } + + private fun refreshBangumiTokenState() { + _bangumiToken.value = securePrefs.bangumiAccessToken.orEmpty() + _bangumiTokenExpiryMs.value = securePrefs.bangumiTokenExpiresAtMillis } fun saveTmdbToken(token: String) { diff --git a/ui-tv/src/main/res/values-en/strings.xml b/ui-tv/src/main/res/values-en/strings.xml index 50df9d74..550a2b27 100644 --- a/ui-tv/src/main/res/values-en/strings.xml +++ b/ui-tv/src/main/res/values-en/strings.xml @@ -229,6 +229,17 @@ No TMDB token set. Bangumi token Only used for Bangumi collection and watch-progress sync. + Bangumi OAuth app is not configured, sign-in unavailable. + Bangumi sign-in failed. + Bangumi sign-in failed: %1$s + Signed in with Bangumi. + Exchanging tokens with Bangumi… + Sign in with Bangumi + Bangumi sign-in + Open in external browser + Cancel + Sign out + Valid until %1$s Bangumi token saved. Bangumi access token is empty; not saved. Bangumi access token cleared. diff --git a/ui-tv/src/main/res/values-zh-rHK/strings.xml b/ui-tv/src/main/res/values-zh-rHK/strings.xml index e2fc7034..3b9080c3 100644 --- a/ui-tv/src/main/res/values-zh-rHK/strings.xml +++ b/ui-tv/src/main/res/values-zh-rHK/strings.xml @@ -690,6 +690,17 @@ %1$s %2$s Bangumi Token 僅用於 Bangumi 收藏與觀看進度同步。 + 未設定 Bangumi OAuth 應用資訊,無法登入。 + Bangumi 登入失敗。 + Bangumi 登入失敗:%1$s + Bangumi 登入成功。 + 正在與 Bangumi 交換權杖… + 使用 Bangumi 登入 + Bangumi 登入 + 用外部瀏覽器開啟 + 取消 + 登出 + 有效期限至 %1$s 批量匹配會跳過已有衝突後設資料。 支援單條應用、批量預覽、應用和撤銷。 Bangumi 搜尋、批量預覽、應用和撤銷保留在詳情頁。 diff --git a/ui-tv/src/main/res/values-zh-rTW/strings.xml b/ui-tv/src/main/res/values-zh-rTW/strings.xml index cd4a5404..eed1cf3b 100644 --- a/ui-tv/src/main/res/values-zh-rTW/strings.xml +++ b/ui-tv/src/main/res/values-zh-rTW/strings.xml @@ -229,6 +229,17 @@ 目前未設定 TMDB Token。 Bangumi Token 僅用於 Bangumi 收藏與觀看進度同步。 + 未設定 Bangumi OAuth 應用資訊,無法登入。 + Bangumi 登入失敗。 + Bangumi 登入失敗:%1$s + Bangumi 登入成功。 + 正在與 Bangumi 交換權杖… + 使用 Bangumi 登入 + Bangumi 登入 + 用外部瀏覽器開啟 + 取消 + 登出 + 有效期限至 %1$s Bangumi Token 已儲存。 Bangumi Access Token 為空,未儲存。 Bangumi Access Token 已清除。 diff --git a/ui-tv/src/main/res/values/strings.xml b/ui-tv/src/main/res/values/strings.xml index 987cc8a1..aee1f4c7 100644 --- a/ui-tv/src/main/res/values/strings.xml +++ b/ui-tv/src/main/res/values/strings.xml @@ -639,6 +639,17 @@ %1$s %2$s Bangumi Token 仅用于 Bangumi 收藏与观看进度同步。 + 未配置 Bangumi OAuth 应用信息,无法登录。 + Bangumi 登录失败。 + Bangumi 登录失败:%1$s + Bangumi 登录成功。 + 正在与 Bangumi 交换令牌… + 使用 Bangumi 登录 + Bangumi 登录 + 用外部浏览器打开 + 取消 + 退出登录 + 有效期至 %1$s 批量匹配会跳过已有冲突元数据。 支持单条应用、批量预览、应用和撤销。 Bangumi 搜索、批量预览、应用和撤销保留在详情页。 diff --git a/ui-tv/src/test/kotlin/com/miruplay/tv/ui/detail/DramaDetailViewModelTest.kt b/ui-tv/src/test/kotlin/com/miruplay/tv/ui/detail/DramaDetailViewModelTest.kt index 34903a62..8f82fee7 100644 --- a/ui-tv/src/test/kotlin/com/miruplay/tv/ui/detail/DramaDetailViewModelTest.kt +++ b/ui-tv/src/test/kotlin/com/miruplay/tv/ui/detail/DramaDetailViewModelTest.kt @@ -1019,6 +1019,8 @@ private data class DetailFakeCredentialStore( override var tmdbAccessToken: String? = null, override var tmdbApiBaseUrlOverride: String? = null, override var bangumiAccessToken: String? = null, + override var bangumiRefreshToken: String? = null, + override var bangumiTokenExpiresAtMillis: Long = 0L, override var otlpAccessToken: String? = null, override var cloudDriveToken: String? = null, override var cloudDrivePassword: String? = null, diff --git a/ui-tv/src/test/kotlin/com/miruplay/tv/ui/settings/SettingsViewModelTokenTest.kt b/ui-tv/src/test/kotlin/com/miruplay/tv/ui/settings/SettingsViewModelTokenTest.kt index 9836f77a..1043acc7 100644 --- a/ui-tv/src/test/kotlin/com/miruplay/tv/ui/settings/SettingsViewModelTokenTest.kt +++ b/ui-tv/src/test/kotlin/com/miruplay/tv/ui/settings/SettingsViewModelTokenTest.kt @@ -47,6 +47,7 @@ import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.setMain import org.junit.After import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import java.io.File @@ -70,6 +71,7 @@ class SettingsViewModelTokenTest { @MockK lateinit var cloudDriveScheduler: CloudDriveRssScheduler @MockK lateinit var bangumiArchiveStore: BangumiArchiveStore @MockK lateinit var bangumiSyncEngine: BangumiSyncEngine + @MockK lateinit var bangumiOAuth: com.miruplay.tv.sync.BangumiOAuthCoordinator @MockK lateinit var backgroundTasks: BackgroundTaskForegroundController private val logStatus = MutableStateFlow(LogUploadStatus()) @@ -78,6 +80,8 @@ class SettingsViewModelTokenTest { fun setUp() { MockKAnnotations.init(this, relaxUnitFun = true) Dispatchers.setMain(UnconfinedTestDispatcher()) + every { bangumiOAuth.state } returns + MutableStateFlow(com.miruplay.tv.sync.BangumiOAuthState.Idle) coEvery { mediaRepository.getSources() } returns Result.success(emptyList()) coEvery { appModePreferences.getSelectionState() } returns @@ -87,6 +91,7 @@ class SettingsViewModelTokenTest { ) every { securePrefs.bangumiAccessToken } returns null + every { securePrefs.bangumiTokenExpiresAtMillis } returns 0L every { securePrefs.tmdbAccessToken } returns null every { securePrefs.cloudDriveToken } returns null every { securePrefs.cloudDrivePassword } returns null @@ -188,6 +193,54 @@ class SettingsViewModelTokenTest { assertEquals(true, viewModel.perfMonitorEnabled.value) } + @Test + fun `startBangumiOAuth delegates to coordinator and exposes state`() = runTest { + val state = MutableStateFlow( + com.miruplay.tv.sync.BangumiOAuthState.Idle + ) + every { bangumiOAuth.state } returns state + every { bangumiOAuth.startAuthorize() } returns "https://bgm.tv/oauth/authorize?x=1" + val viewModel = createViewModel() + advanceUntilIdle() + + assertEquals("https://bgm.tv/oauth/authorize?x=1", viewModel.startBangumiOAuth()) + assertTrue(viewModel.bangumiOAuthState.value is com.miruplay.tv.sync.BangumiOAuthState.Idle) + } + + @Test + fun `submitBangumiOAuthCallback refreshes token state on accepted callback`() = runTest { + every { bangumiOAuth.state } returns MutableStateFlow(com.miruplay.tv.sync.BangumiOAuthState.Authorizing("u")) + coEvery { bangumiOAuth.submitCallbackUrl(any()) } returns true + every { securePrefs.bangumiAccessToken } returns "oauth-token" + every { securePrefs.bangumiTokenExpiresAtMillis } returns 9_999L + val viewModel = createViewModel() + advanceUntilIdle() + + viewModel.submitBangumiOAuthCallback("http://127.0.0.1:13712/callback?code=x&state=y") + advanceUntilIdle() + + assertEquals("oauth-token", viewModel.bangumiToken.value) + assertEquals(9_999L, viewModel.bangumiTokenExpiryMs.value) + } + + @Test + fun `logoutBangumiOAuth clears token state`() = runTest { + every { bangumiOAuth.state } returns MutableStateFlow(com.miruplay.tv.sync.BangumiOAuthState.Success) + every { securePrefs.bangumiAccessToken } returns null + every { securePrefs.bangumiTokenExpiresAtMillis } returns 0L + every { bangumiOAuth.logout() } answers { + every { securePrefs.bangumiAccessToken } returns null + } + val viewModel = createViewModel() + advanceUntilIdle() + + viewModel.logoutBangumiOAuth() + advanceUntilIdle() + + assertEquals("", viewModel.bangumiToken.value) + assertEquals(0L, viewModel.bangumiTokenExpiryMs.value) + } + private fun createViewModel(): SettingsViewModel = SettingsViewModel( mediaRepository = mediaRepository, @@ -207,6 +260,7 @@ class SettingsViewModelTokenTest { cloudDriveScheduler = cloudDriveScheduler, bangumiArchiveStore = bangumiArchiveStore, bangumiSyncEngine = bangumiSyncEngine, + bangumiOAuth = bangumiOAuth, backgroundTasks = backgroundTasks, appContext = appContext, audioMeasureController = audioMeasureController,