fix: dandanplay api auth

Author: muedsa

.github/workflows/build.yml

@@ -20,10 +20,15 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: gradle
-      - name: Load Google Service file
+      - name: Load secret files
         env:
-          DATA: ${{ secrets.GOOGLE_SERVICES_JSON }}
-        run: echo $DATA | base64 -di > app/google-services.json
+          - GOOGLE_SERVICES_JSON_DATA: ${{ secrets.GOOGLE_SERVICES_JSON }}
+          - SIGN_KEY_DATA: ${{ secrets.SIGN_KEY }}
+          - KEY_STORE_PROP_DATA: ${{ secrets.KEY_STORE_PROP }}
+        run: |
+          echo $GOOGLE_SERVICES_JSON_DATA | base64 -di > app/google-services.json 
+          echo $SIGN_KEY_DATA | base64 -di > MUEDSA.jks
+          echo $KEY_STORE_PROP_DATA | base64 -di > keystore.properties
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle

app/build.gradle.kts

@@ -48,6 +48,19 @@ android {
         }
     }
 
+    defaultConfig {
+        buildConfigField(
+            "String",
+            "DANDANPLAY_APP_ID",
+            "\"${keystoreProperties["muedsa.danDanPlay.appId"]}\""
+        )
+        buildConfigField(
+            "String",
+            "DANDANPLAY_APP_SECRET",
+            "\"${keystoreProperties["muedsa.danDanPlay.appSecret"]}\""
+        )
+    }
+
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -70,6 +83,7 @@ android {
 
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 
     room {

app/src/main/java/com/muedsa/tvbox/AppModule.kt

@@ -4,8 +4,10 @@ import android.content.Context
 import androidx.room.Room
 import com.muedsa.tvbox.room.AppDatabase
 import com.muedsa.tvbox.service.DanDanPlayApiService
+import com.muedsa.tvbox.service.DanDanPlayAuthInterceptor
 import com.muedsa.tvbox.store.DataStoreRepo
 import com.muedsa.tvbox.tool.createJsonRetrofit
+import com.muedsa.tvbox.tool.createOkHttpClient
 import com.muedsa.util.AppUtil
 import dagger.Module
 import dagger.Provides
@@ -46,6 +48,8 @@ internal object AppModule {
         createJsonRetrofit(
             baseUrl = "https://api.dandanplay.net/api/",
             service = DanDanPlayApiService::class.java,
-            debug = AppUtil.debuggable(context)
+            okHttpClient = createOkHttpClient(debug = AppUtil.debuggable(context)) {
+                addInterceptor(DanDanPlayAuthInterceptor())
+            }
         )
 }

app/src/main/java/com/muedsa/tvbox/screens/detail/MediaDetailScreenViewModel.kt

@@ -2,6 +2,7 @@ package com.muedsa.tvbox.screens.detail
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.muedsa.tvbox.BuildConfig
 import com.muedsa.tvbox.api.data.MediaDetail
 import com.muedsa.tvbox.api.data.MediaEpisode
 import com.muedsa.tvbox.api.data.MediaHttpSource
@@ -93,6 +94,8 @@ class MediaDetailScreenViewModel @Inject constructor(
     private val _danBangumiListFlow =
         combine(_mediaDetailFlow, _banBangumiSearchQueryFlow) { wrapper, searchQuery ->
             if (wrapper.data != null
+                && !BuildConfig.DANDANPLAY_APP_ID.isEmpty()
+                && !BuildConfig.DANDANPLAY_APP_SECRET.isEmpty()
                 && wrapper.data.second.enableDanDanPlaySearch
                 && !wrapper.data.third.enableCustomDanmakuList
                 && !wrapper.data.third.enableCustomDanmakuFlow

app/src/main/java/com/muedsa/tvbox/screens/playback/PlaybackScreenViewModel.kt

@@ -3,6 +3,7 @@ package com.muedsa.tvbox.screens.playback
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.kuaishou.akdanmaku.data.DanmakuItemData
+import com.muedsa.tvbox.BuildConfig
 import com.muedsa.tvbox.api.data.DanmakuDataFlow
 import com.muedsa.tvbox.api.data.MediaEpisode
 import com.muedsa.tvbox.model.AppSettingModel
@@ -70,7 +71,10 @@ class PlaybackScreenViewModel @Inject constructor(
                                         danmakuStyle = data.danmakuStyle
                                     )
                                 }
-                        } else if (it.danEpisodeId > 0) {
+                        } else if (!BuildConfig.DANDANPLAY_APP_ID.isEmpty()
+                            && !BuildConfig.DANDANPLAY_APP_SECRET.isEmpty()
+                            && it.danEpisodeId > 0
+                        ) {
                             danDanPlayApiService.getComment(
                                 episodeId = it.danEpisodeId,
                                 from = 0,

app/src/main/java/com/muedsa/tvbox/service/DanDanPlayAuthInterceptor.kt

@@ -0,0 +1,27 @@
+package com.muedsa.tvbox.service
+
+import com.muedsa.tvbox.BuildConfig
+import com.muedsa.tvbox.tool.encodeBase64
+import okhttp3.Interceptor
+import okhttp3.Response
+import java.security.MessageDigest
+
+class DanDanPlayAuthInterceptor : Interceptor {
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val timestamp = System.currentTimeMillis() / 1000
+        val path = chain.request().url.encodedPath
+        val sign =
+            "${BuildConfig.DANDANPLAY_APP_ID}$timestamp$path${BuildConfig.DANDANPLAY_APP_SECRET}".let {
+                MessageDigest.getInstance("SHA-256")
+                    .digest(it.toByteArray(Charsets.UTF_8))
+                    .encodeBase64()
+            }
+        val request = chain.request().newBuilder()
+            .header("X-AppId", BuildConfig.DANDANPLAY_APP_ID)
+            .header("X-Timestamp", "$timestamp")
+            .header("X-Signature", sign)
+            .build()
+        return chain.proceed(request)
+    }
+}