Use WebView auth flow for MAL (fixes #4100)

2020-12-08 22:19:59 -05:00
parent c2b8fea291
commit 2bb7a33bc3
8 changed files with 183 additions and 151 deletions
@@ -10,6 +10,7 @@ import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.data.track.anilist.AnilistApi
 import eu.kanade.tachiyomi.data.track.bangumi.BangumiApi
 import eu.kanade.tachiyomi.data.track.shikimori.ShikimoriApi
+import eu.kanade.tachiyomi.ui.setting.track.MyAnimeListLoginActivity
 import eu.kanade.tachiyomi.ui.setting.track.TrackLoginDialog
 import eu.kanade.tachiyomi.ui.setting.track.TrackLogoutDialog
 import eu.kanade.tachiyomi.util.preference.defaultValue
@@ -43,9 +44,7 @@ class SettingsTrackingController :
            titleRes = R.string.services

            trackPreference(trackManager.myAnimeList) {
-                val dialog = TrackLoginDialog(trackManager.myAnimeList)
-                dialog.targetController = this@SettingsTrackingController
-                dialog.showDialog(router)
+                startActivity(MyAnimeListLoginActivity.newIntent(activity!!))
            }
            trackPreference(trackManager.aniList) {
                val tabsIntent = CustomTabsIntent.Builder()
@@ -106,6 +105,7 @@ class SettingsTrackingController :
        super.onActivityResumed(activity)

        // Manually refresh OAuth trackers' holders
+        updatePreference(trackManager.myAnimeList.id)
        updatePreference(trackManager.aniList.id)
        updatePreference(trackManager.shikimori.id)
        updatePreference(trackManager.bangumi.id)
@@ -0,0 +1,76 @@
+package eu.kanade.tachiyomi.ui.setting.track
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.webkit.WebView
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.data.track.myanimelist.MyAnimeListApi
+import eu.kanade.tachiyomi.ui.main.MainActivity
+import eu.kanade.tachiyomi.ui.webview.BaseWebViewActivity
+import eu.kanade.tachiyomi.util.system.WebViewClientCompat
+import rx.android.schedulers.AndroidSchedulers
+import rx.schedulers.Schedulers
+import uy.kohesive.injekt.injectLazy
+
+class MyAnimeListLoginActivity : BaseWebViewActivity() {
+
+    private val trackManager: TrackManager by injectLazy()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        title = getString(R.string.login)
+
+        if (bundle == null) {
+            binding.webview.webViewClient = object : WebViewClientCompat() {
+                override fun shouldOverrideUrlCompat(view: WebView, url: String): Boolean {
+                    view.loadUrl(url)
+                    return true
+                }
+
+                override fun onPageFinished(view: WebView?, url: String?) {
+                    super.onPageFinished(view, url)
+
+                    // Get CSRF token from HTML after post-login redirect
+                    if (url == "https://myanimelist.net/") {
+                        view?.evaluateJavascript(
+                            "(function(){return document.querySelector('meta[name=csrf_token]').getAttribute('content')})();"
+                        ) {
+                            trackManager.myAnimeList.login(it.replace("\"", ""))
+                                .subscribeOn(Schedulers.io())
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(
+                                    {
+                                        returnToSettings()
+                                    },
+                                    {
+                                        returnToSettings()
+                                    }
+                                )
+                        }
+                    }
+                }
+            }
+
+            binding.webview.loadUrl(MyAnimeListApi.loginUrl())
+        }
+    }
+
+    private fun returnToSettings() {
+        finish()
+
+        val intent = Intent(this, MainActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        startActivity(intent)
+    }
+
+    companion object {
+        fun newIntent(context: Context): Intent {
+            val intent = Intent(context, MyAnimeListLoginActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            return intent
+        }
+    }
+}