Upload main.rs

src/main.rs

@@ -1605,46 +1605,84 @@ 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(
-                &client,
-                &jar,
-                "user.checkCredentials",
-                &token,
-                json!({
-                    "login": email,
-                    "password": pass_md5,
-                    "checkFormLogin": token
-                }),
-            )
-            .await
-            {
-                if access_token_out.is_none() {
-                    let mut map = state.pair.write().await;
-                    if let Some(s) = map.get_mut(&code) {
-                        s.error = Some(format!("gw:checkCredentials:{e}"));
-                    }
-                    return Html(format!(
-                        "<h3>Ошибка входа</h3><pre>{}</pre>",
-                        htmlesc(&format!("gw:checkCredentials:{e}"))
-                    ))
-                    .into_response();
+    let mut ud: Option<serde_json::Value> = None;
+    for attempt in 0..2 {
+        match gw_light_call(&client, &jar, "deezer.getUserData", "null", json!({})).await {
+            Ok(v) => {
+                ud = Some(v);
+                break;
+            }
+            Err(e) => {
+                gw_err = Some(format!("gw:getUserData:{e}"));
+                if attempt == 0 {
+                    let _ = client
+                        .get("https://www.deezer.com/")
+                        .header(ACCEPT, "*/*")
+                        .header("Accept-Language", "en-US,en;q=0.9")
+                        .header(
+                            "User-Agent",
+                            "Mozilla/5.0 (X11; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0",
+                        )
+                        .send()
+                        .await;
                 }
-                gw_err = Some(format!("gw:checkCredentials:{e}"));
-            } else {
-                gw_token = Some(token.clone());
-                gw_uid = ud["USER"]["USER_ID"]
-                    .as_i64()
-                    .map(|n| n.to_string())
-                    .filter(|s| !s.trim().is_empty());
+            }
+        }
+    }
 
-                if let Ok(v) = gw_light_call(&client, &jar, "user.getArl", &token, json!({})).await {
+    if let Some(ud) = ud {
+        let token = ud["checkForm"].as_str().unwrap_or("").to_string();
+        if token.is_empty() {
+            if gw_err.is_none() {
+                gw_err = Some("gw:no_checkForm".to_string());
+            }
+        } else if let Err(e) = gw_light_call(
+            &client,
+            &jar,
+            "user.checkCredentials",
+            &token,
+            json!({
+                "login": email,
+                "password": pass_md5,
+                "checkFormLogin": token
+            }),
+        )
+        .await
+        {
+            if access_token_out.is_none() {
+                let mut map = state.pair.write().await;
+                if let Some(s) = map.get_mut(&code) {
+                    s.error = Some(format!("gw:checkCredentials:{e}"));
+                }
+                return Html(format!(
+                    "<h3>Ошибка входа</h3><pre>{}</pre>",
+                    htmlesc(&format!("gw:checkCredentials:{e}"))
+                ))
+                .into_response();
+            }
+            gw_err = Some(format!("gw:checkCredentials:{e}"));
+        } else {
+            gw_token = Some(token.clone());
+            gw_uid = ud["USER"]["USER_ID"]
+                .as_i64()
+                .map(|n| n.to_string())
+                .filter(|s| !s.trim().is_empty());
+
+            match gw_light_call(&client, &jar, "user.getArl", &token, json!({})).await {
+                Ok(v) => {
                     if let Some(s) = v.as_str() {
                         if s.len() > 20 {
                             arl_out = Some(s.to_string());
+                        } else if gw_err.is_none() {
+                            gw_err = Some("gw:no_arl".to_string());
                         }
+                    } else if gw_err.is_none() {
+                        gw_err = Some("gw:no_arl".to_string());
+                    }
+                }
+                Err(e) => {
+                    if gw_err.is_none() {
+                        gw_err = Some(format!("gw:getArl:{e}"));
                     }
                 }
             }