Upload 2 files

src/main.rs

@@ -477,6 +477,12 @@ async fn gw_light_call(
     Ok(json.results)
 }
 
+fn jar_has_cookie(jar: &Jar, url: &Url, cookie_prefix: &str) -> bool {
+    let Some(hv) = jar.cookies(url) else { return false };
+    let Ok(s) = hv.to_str() else { return false };
+    s.split(';').any(|p| p.trim_start().starts_with(cookie_prefix))
+}
+
 async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
     let email = req.email.trim().to_string();
     let pass = req.password_md5.trim().to_string();
@@ -484,18 +490,18 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
     if email.is_empty() || pass.is_empty() {
         return json_error(StatusCode::BAD_REQUEST, "Email and password_md5 required");
     }
-    let jar = Jar::default();
-    let url = "https://www.deezer.com".parse::<Url>().unwrap();
-    jar.add_cookie_str("comeback=1; Domain=.deezer.com", &url);
+    let jar = Arc::new(Jar::default());
+    let url_deezer = "https://www.deezer.com".parse::<Url>().unwrap();
+    let url_api = "https://api.deezer.com".parse::<Url>().unwrap();
+    jar.add_cookie_str("comeback=1; Domain=.deezer.com", &url_deezer);
     let client = reqwest::Client::builder()
-        .cookie_provider(Arc::new(jar))
+        .cookie_provider(jar.clone())
         .timeout(std::time::Duration::from_secs(15))
         .build()
         .unwrap();
 
-    let mut oauth_ok = false;
     if let Ok(access_token) = oauth_access_token(&client, &email, &pass).await {
-        let ping = client
+        let _ = client
             .get("https://api.deezer.com/platform/generic/track/80085")
             .header("Authorization", format!("Bearer {}", access_token))
             .header(ACCEPT, "*/*")
@@ -506,10 +512,19 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
             )
             .send()
             .await;
-        if let Ok(r) = ping {
-            if r.status().is_success() {
-                oauth_ok = true;
-            }
+
+        if !jar_has_cookie(&jar, &url_deezer, "sid=") && !jar_has_cookie(&jar, &url_api, "sid=") {
+            let _ = client
+                .get("https://api.deezer.com/platform/generic/track/3135556")
+                .header("Authorization", format!("Bearer {}", access_token))
+                .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;
         }
     }
 
@@ -530,11 +545,8 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
 
     let arl_v = match gw_light_call(&client, "user.getArl", &token, json!({})).await {
         Ok(v) => v,
-        Err(e) => {
-            if oauth_ok {
-                return json_error(StatusCode::BAD_GATEWAY, e);
-            }
-            let _ = gw_light_call(
+        Err(e1) => {
+            let cred = gw_light_call(
                 &client,
                 "user.checkCredentials",
                 &token,
@@ -545,9 +557,12 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
                 }),
             )
             .await;
+            if let Err(e) = cred {
+                return json_error(StatusCode::UNAUTHORIZED, e);
+            }
             match gw_light_call(&client, "user.getArl", &token, json!({})).await {
                 Ok(v) => v,
-                Err(e) => return json_error(StatusCode::BAD_GATEWAY, e),
+                Err(e2) => return json_error(StatusCode::BAD_GATEWAY, format!("getArl:{e1}; retry:{e2}")),
             }
         }
     };