chore(plugin): disable chrome plugin

clearloop · clearloop · Jun 24, 2023 · Aug 14, 2022 · Aug 14, 2022 · Aug 14, 2022
commit fae42dea0f6c074fec0361a1e036be06c32d8c89
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,6 +32,7 @@ serde_json = "1.0.82"
 toml = "0.5.9"
 regex = "1.6.0"
 scraper = "0.13.0"
+anyhow = "1.0.71"
 
 [dependencies.diesel]
 version = "2.0.3"

diff --git a/src/cache/mod.rs b/src/cache/mod.rs
@@ -8,6 +8,7 @@ use self::schemas::{problems::dsl::*, tags::dsl::*};
 use self::sql::*;
 use crate::helper::test_cases_path;
 use crate::{config::Config, err::Error, plugins::LeetCode};
+use anyhow::anyhow;
 use colored::Colorize;
 use diesel::prelude::*;
 use reqwest::Response;
@@ -342,15 +343,20 @@ impl Cache {
     ) -> Result<VerifyResult, Error> {
         trace!("Exec problem filter —— Test or Submit");
         let (json, [url, refer]) = self.pre_run_code(run.clone(), rfid, test_case).await?;
-        trace!("Pre run code result {:?}, {:?}, {:?}", json, url, refer);
+        trace!("Pre run code result {:#?}, {}, {}", json, url, refer);
 
-        let run_res: RunCode = self
+        let text = self
             .0
             .clone()
             .run_code(json.clone(), url.clone(), refer.clone())
             .await?
-            .json() // does not require LEETCODE_SESSION (very oddly)
+            .text()
             .await?;
+
+        let run_res: RunCode = serde_json::from_str(&text).map_err(|e| {
+            anyhow!("json error: {e}, plz double check your session and csrf config.")
+        })?;
+
         trace!("Run code result {:#?}", run_res);
 
         // Check if leetcode accepted the Run request

diff --git a/src/config/cookies.rs b/src/config/cookies.rs
@@ -7,3 +7,9 @@ pub struct Cookies {
     pub csrf: String,
     pub session: String,
 }
+
+impl std::string::ToString for Cookies {
+    fn to_string(&self) -> String {
+        format!("LEETCODE_SESSION={};csrftoken={};", self.session, self.csrf)
+    }
+}
diff --git a/src/err.rs b/src/err.rs
@@ -5,7 +5,6 @@ use std::fmt;
 
 // fixme: use this_error
 /// Error enum
-#[derive(Clone)]
 pub enum Error {
     MatchError,
     DownloadError(String),
@@ -20,6 +19,7 @@ pub enum Error {
     SilentError,
     NoneError,
     ChromeNotLogin,
+    Anyhow(anyhow::Error),
 }
 
 impl std::fmt::Debug for Error {
@@ -59,7 +59,8 @@ impl std::fmt::Debug for Error {
                 "json from response parse failed, please open a new issue at: {}.",
                 "https://github.com/clearloop/leetcode-cli/".underline(),
             ),
-            Error::ChromeNotLogin => write!(f, "maybe you not login on the Chrome, you can login and retry.")
+            Error::ChromeNotLogin => write!(f, "maybe you not login on the Chrome, you can login and retry."),
+            Error::Anyhow(e) => write!(f, "{} {}", e, e),
         }
     }
 }
@@ -147,6 +148,12 @@ impl std::convert::From<openssl::error::ErrorStack> for Error {
     }
 }
 
+impl From<anyhow::Error> for Error {
+    fn from(err: anyhow::Error) -> Self {
+        Error::Anyhow(err)
+    }
+}
+
 // pyo3
 #[cfg(feature = "pym")]
 impl std::convert::From<pyo3::PyErr> for Error {

diff --git a/src/plugins/leetcode.rs b/src/plugins/leetcode.rs
@@ -2,7 +2,7 @@ use self::req::{Json, Mode, Req};
 use crate::{
     config::{self, Config},
     err::Error,
-    plugins::chrome,
+    // plugins::chrome,
 };
 use reqwest::{
     header::{HeaderMap, HeaderName, HeaderValue},
@@ -37,7 +37,7 @@ impl LeetCode {
     /// New LeetCode client
     pub fn new() -> Result<LeetCode, crate::Error> {
         let conf = config::Config::locate()?;
-        let cookies = chrome::cookies()?;
+        let cookies = conf.cookies.clone();
         let default_headers = LeetCode::headers(
             HeaderMap::new(),
             vec![
@@ -53,11 +53,6 @@ impl LeetCode {
             .connect_timeout(Duration::from_secs(30))
             .build()?;
 
-        // Sync conf
-        if conf.cookies.csrf != cookies.csrf {
-            conf.sync()?;
-        }
-
         Ok(LeetCode {
             conf,
             client,

diff --git a/src/plugins/mod.rs b/src/plugins/mod.rs
@@ -6,6 +6,8 @@
 //! ## login to `leetcode.com`
 //! Leetcode-cli use chrome cookie directly, do not need to login, please make sure you have loggined in `leetcode.com` before usnig `leetcode-cli`
 //!
-mod chrome;
+
+// FIXME: Read cookies from local storage. (issue #122)
+// mod chrome;
 mod leetcode;
 pub use leetcode::LeetCode;