feat(greader): compatible with Miniflux login

Ashinch · Jan 19, 2024 · 3a64500 · 3a64500
1 parent 193ed19
commit 3a64500
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/app/src/main/java/me/ash/reader/infrastructure/rss/provider/greader/GoogleReaderAPI.kt b/app/src/main/java/me/ash/reader/infrastructure/rss/provider/greader/GoogleReaderAPI.kt
@@ -62,11 +62,15 @@ class GoogleReaderAPI private constructor(
             }
         }
 
-        authData.clientLoginToken = clBody
-            .split("\n")
-            .find { it.startsWith("Auth=") }
-            ?.substring(5)
-            ?: throw Exception("body format error for CL Token:\n$clBody")
+        authData.clientLoginToken = try {
+            toDTO<GoogleReaderDTO.MinifluxAuthData>(clBody).Auth
+        } catch (ignore: Exception) {
+            clBody
+                .split("\n")
+                .find { it.startsWith("Auth=") }
+                ?.substring(5)
+                ?: throw Exception("body format error for CL Token:\n$clBody")
+        }
 
         // Get action token
         val actResponse = client.newCall(

diff --git a/app/src/main/java/me/ash/reader/infrastructure/rss/provider/greader/GoogleReaderDTO.kt b/app/src/main/java/me/ash/reader/infrastructure/rss/provider/greader/GoogleReaderDTO.kt
@@ -8,6 +8,20 @@ object GoogleReaderDTO {
         @SerializedName("errors") val errors: List<String>,
     )
 
+    /**
+     * @sample
+     *{
+     *     "SID": "demo/718*********************************7fa",
+     *     "LSID": "demo/718*********************************7fa",
+     *     "Auth": "demo/718*********************************7fa"
+     * }
+     */
+    data class MinifluxAuthData(
+        val SID: String?,
+        val LSID: String?,
+        val Auth: String?,
+    )
+
     /**
      * @link reader/api/0/user-info?output=json
      * @sample