Upload main.rs

src/main.rs

@@ -1109,48 +1109,36 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
         .build()
         .unwrap();
 
-    let ud = match gw_light_call(&client, &jar, "deezer.getUserData", "null", json!({})).await {
-        Ok(v) => v,
-        Err(e) => return json_error(StatusCode::BAD_GATEWAY, e),
-    };
-
-    let token = ud["checkForm"].as_str().unwrap_or("").to_string();
-    if token.is_empty() {
-        return json_error(StatusCode::BAD_GATEWAY, "no checkForm");
-    }
-
-    let uid = ud["USER"]["USER_ID"]
-        .as_i64()
-        .map(|n| n.to_string())
-        .unwrap_or_default();
-
-    if let Err(e) = gw_light_call(
-        &client,
-        &jar,
-        "user.checkCredentials",
-        &token,
-        json!({
-            "login": email,
-            "password": pass,
-            "checkFormLogin": token
-        }),
-    )
-    .await
-    {
-        return json_error(StatusCode::UNAUTHORIZED, e);
-    }
+    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) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36",
+        )
+        .send()
+        .await;
 
-    let mut arl: String = String::new();
-    if let Ok(v) = gw_light_call(&client, &jar, "user.getArl", &token, json!({})).await {
-        arl = v.as_str().unwrap_or("").to_string();
-    }
+    let access_token = match oauth_access_token(&client, &email, &pass).await {
+        Ok(t) => t,
+        Err(e) => return json_error(StatusCode::UNAUTHORIZED, e),
+    };
 
-    let mut access_token_out: Option<String> = None;
-    if let Ok(access_token) = oauth_access_token(&client, &email, &pass).await {
-        access_token_out = Some(access_token);
+    let me = match api_deezer_get(&client, "/user/me", &access_token, &[]).await {
+        Ok(v) => v,
+        Err(e) => return json_error(StatusCode::SERVICE_UNAVAILABLE, e),
+    };
+    let uid = me.get("id").and_then(|x| x.as_i64()).unwrap_or(0);
+    if uid <= 0 {
+        return json_error(StatusCode::SERVICE_UNAVAILABLE, "api:no_user_id");
     }
 
-    (StatusCode::OK, Json(json!({ "arl": arl, "token": token, "uid": uid, "access_token": access_token_out }))).into_response()
+    (
+        StatusCode::OK,
+        Json(json!({ "arl": "", "token": null, "uid": uid.to_string(), "access_token": access_token })),
+    )
+        .into_response()
 }
 
 #[derive(Clone)]
@@ -1392,79 +1380,57 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
         .unwrap();
 
     let pass_md5 = format!("{:x}", md5::compute(password.as_bytes()));
-    let mut access_token: Option<String> = None;
-    let mut uid: Option<String> = None;
-    let mut arl_out: Option<String> = None;
-    let mut gw_token: Option<String> = None;
+    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) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36",
+        )
+        .send()
+        .await;
 
-    let ud = match gw_light_call(&client, &jar, "deezer.getUserData", "null", json!({})).await {
-        Ok(v) => v,
+    let access_token = match oauth_access_token(&client, &email, &pass_md5).await {
+        Ok(t) => t,
         Err(e) => {
             let mut map = state.pair.write().await;
             if let Some(s) = map.get_mut(&code) {
-                s.error = Some(format!("gw:getUserData:{e}"));
+                s.error = Some(e.clone());
             }
-            return Html(format!("<h3>Ошибка входа</h3><pre>{}</pre>", htmlesc(&format!("gw:getUserData:{e}"))))
-                .into_response();
+            return Html(format!("<h3>Ошибка входа</h3><pre>{}</pre>", htmlesc(&e))).into_response();
         }
     };
 
-    let token = ud["checkForm"].as_str().unwrap_or("").to_string();
-    if token.is_empty() {
-        let msg = "gw:no_checkForm";
-        let mut map = state.pair.write().await;
-        if let Some(s) = map.get_mut(&code) {
-            s.error = Some(msg.to_string());
+    let me = match api_deezer_get(&client, "/user/me", &access_token, &[]).await {
+        Ok(v) => v,
+        Err(e) => {
+            let mut map = state.pair.write().await;
+            if let Some(s) = map.get_mut(&code) {
+                s.error = Some(e.clone());
+            }
+            return Html(format!("<h3>Ошибка входа</h3><pre>{}</pre>", htmlesc(&e))).into_response();
         }
-        return Html(format!("<h3>Ошибка входа</h3><pre>{}</pre>", htmlesc(msg))).into_response();
-    }
-    gw_token = Some(token.clone());
-    uid = ud["USER"]["USER_ID"]
-        .as_i64()
-        .map(|n| n.to_string())
-        .filter(|s| !s.trim().is_empty());
-
-    if let Err(e) = gw_light_call(
-        &client,
-        &jar,
-        "user.checkCredentials",
-        &token,
-        json!({
-            "login": email,
-            "password": pass_md5,
-            "checkFormLogin": token
-        }),
-    )
-    .await
-    {
+    };
+    let uid = me.get("id").and_then(|x| x.as_i64()).unwrap_or(0);
+    if uid <= 0 {
+        let msg = "api:no_user_id".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();
-    }
-
-    if let Ok(v) = gw_light_call(&client, &jar, "user.getArl", &token, json!({})).await {
-        if let Some(s) = v.as_str() {
-            if s.len() > 20 {
-                arl_out = Some(s.to_string());
-            }
-        }
-    }
-
-    if let Ok(t) = oauth_access_token(&client, &email, &pass_md5).await {
-        access_token = Some(t);
+        return Html(format!("<h3>Ошибка входа</h3><pre>{}</pre>", htmlesc(&msg))).into_response();
     }
+    let uid = uid.to_string();
 
     {
         let mut map = state.pair.write().await;
         if let Some(s) = map.get_mut(&code) {
-            s.access_token = access_token;
-            s.token = gw_token;
-            s.user_id = uid;
+            s.access_token = Some(access_token);
+            s.token = None;
+            s.user_id = Some(uid);
             s.email = Some(email);
-            s.arl = arl_out;
+            s.arl = None;
             s.error = None;
         }
     }
@@ -1479,7 +1445,7 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
     let safe_code = htmlesc(&code);
     Html(format!(
         "<h3>Вход выполнен</h3>\
-        <p>Токен получен, но ARL сервер автоматически не вытащил (из‑за блокировки/ошибок gw-light на хостинге).</p>\
+        <p>Токен получен, но ARL сервер автоматически не вытащил (из‑за блокировки/ошибок на хостинге).</p>\
         <p>Чтобы включить полные треки, вставь ARL (с телефона):</p>\
         <form method=\"POST\" action=\"/pair/arl\">\
             <input type=\"hidden\" name=\"code\" value=\"{safe_code}\">\