Upload main.rs

src/main.rs

@@ -1008,8 +1008,6 @@ async fn gw_light_call(
                 ("cid", cid.as_str()),
             ])
             .header(ACCEPT, "*/*")
-            .header("Cache-Control", "max-age=0")
-            .header("Connection", "keep-alive")
             .header("Origin", "https://www.deezer.com")
             .header("Referer", "https://www.deezer.com/")
             .header("Sec-Fetch-Site", "same-origin")
@@ -1017,9 +1015,6 @@ async fn gw_light_call(
             .header("Sec-Fetch-Dest", "empty")
             .header("X-Requested-With", "XMLHttpRequest")
             .header("Accept-Language", "en-US,en;q=0.9")
-            .header("Content-Language", "en-US")
-            .header("X-User-IP", "1.1.1.1")
-            .header("x-deezer-client-ip", "1.1.1.1")
             .header(
                 "User-Agent",
                 "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36",
@@ -1393,10 +1388,12 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
         Err(e) => oauth_err = Some(e),
     }
 
-    if let Ok(ud) = gw_light_call(&client, &jar, "deezer.getUserData", "null", json!({})).await {
-        let token = ud["checkForm"].as_str().unwrap_or("").to_string();
-        if !token.is_empty() {
-            if let Err(e) = gw_light_call(
+    match gw_light_call(&client, &jar, "deezer.getUserData", "null", json!({})).await {
+        Ok(ud) => {
+            let token = ud["checkForm"].as_str().unwrap_or("").to_string();
+            if token.is_empty() {
+                gw_err = Some("gw:no_checkForm".to_string());
+            } else if let Err(e) = gw_light_call(
                 &client,
                 &jar,
                 "user.checkCredentials",
@@ -1409,18 +1406,15 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
             )
             .await
             {
+                gw_err = Some(format!("gw:checkCredentials:{e}"));
                 if access_token_out.is_none() {
+                    let msg = gw_err.clone().unwrap_or_else(|| "gw:checkCredentials".to_string());
                     let mut map = state.pair.write().await;
                     if let Some(s) = map.get_mut(&code) {
-                        s.error = Some(format!("gw:checkCredentials:{e}"));
+                        s.error = Some(msg.clone());
                     }
-                    return Html(format!(
-                        "<h3>Ошибка входа</h3><pre>{}</pre>",
-                        htmlesc(&format!("gw:checkCredentials:{e}"))
-                    ))
-                    .into_response();
+                    return Html(format!("<h3>Ошибка входа</h3><pre>{}</pre>", htmlesc(&msg))).into_response();
                 }
-                gw_err = Some(format!("gw:checkCredentials:{e}"));
             } else {
                 gw_token = Some(token.clone());
                 gw_uid = ud["USER"]["USER_ID"]
@@ -1437,6 +1431,9 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
                 }
             }
         }
+        Err(e) => {
+            gw_err = Some(format!("gw:getUserData:{e}"));
+        }
     }
 
     if gw_token.is_none() && access_token_out.is_none() {