Upload main.rs

src/main.rs

@@ -1155,6 +1155,7 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
 struct PairSession {
     created_ms: u128,
     access_token: Option<String>,
+    token: Option<String>,
     user_id: Option<String>,
     email: Option<String>,
     arl: Option<String>,
@@ -1188,6 +1189,7 @@ async fn pair_start(State(state): State<AppState>) -> impl IntoResponse {
             PairSession {
                 created_ms,
                 access_token: None,
+                token: None,
                 user_id: None,
                 email: None,
                 arl: None,
@@ -1221,14 +1223,14 @@ async fn pair_status(State(state): State<AppState>, Query(q): Query<PairStatusQu
     if let Some(tok) = &sess.access_token {
         return (
             StatusCode::OK,
-            Json(json!({ "status": "ok", "access_token": tok, "user_id": sess.user_id, "email": sess.email, "arl": sess.arl })),
+            Json(json!({ "status": "ok", "access_token": tok, "token": sess.token, "user_id": sess.user_id, "email": sess.email, "arl": sess.arl })),
         )
             .into_response();
     }
     if sess.arl.as_deref().unwrap_or("").len() > 20 {
         return (
             StatusCode::OK,
-            Json(json!({ "status": "ok", "access_token": null, "user_id": sess.user_id, "email": sess.email, "arl": sess.arl })),
+            Json(json!({ "status": "ok", "access_token": null, "token": sess.token, "user_id": sess.user_id, "email": sess.email, "arl": sess.arl })),
         )
             .into_response();
     }
@@ -1421,6 +1423,8 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
     let mut uid: Option<String> = None;
     let mut arl_out: Option<String> = None;
     let mut login_err: Option<String> = None;
+    let mut gw_token: Option<String> = None;
+    let mut gw_err: Option<String> = None;
 
     match oauth_access_token(&client, &email, &pass_md5).await {
         Ok(t) => access_token = Some(t),
@@ -1475,44 +1479,67 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
     }
 
     if arl_out.is_none() {
-        if let Ok(ud) = gw_light_call(&client, "deezer.getUserData", "null", json!({})).await {
-            let token = ud["checkForm"].as_str().unwrap_or("").to_string();
-            if !token.is_empty() {
-                match gw_light_call(&client, "user.getArl", &token, json!({})).await {
-                    Ok(v) => {
-                        if let Some(s) = v.as_str() {
-                            if s.len() > 20 {
-                                arl_out = Some(s.to_string());
-                            }
-                        }
-                    }
-                    Err(_) => {
-                        let _ = gw_light_call(
-                            &client,
-                            "user.checkCredentials",
-                            &token,
-                            json!({
-                                "login": email,
-                                "password": pass_md5,
-                                "checkFormLogin": token
-                            }),
-                        )
-                        .await;
-                        if let Ok(v2) = gw_light_call(&client, "user.getArl", &token, json!({})).await {
-                            if let Some(s) = v2.as_str() {
-                                if s.len() > 20 {
-                                    arl_out = Some(s.to_string());
+        match gw_light_call(&client, "deezer.getUserData", "null", json!({})).await {
+            Ok(ud) => {
+                let token = ud["checkForm"].as_str().unwrap_or("").to_string();
+                let gw_uid = ud["USER"]["USER_ID"]
+                    .as_i64()
+                    .map(|n| n.to_string())
+                    .unwrap_or_default();
+                if !gw_uid.is_empty() && uid.is_none() {
+                    uid = Some(gw_uid);
+                }
+                if !token.is_empty() {
+                    gw_token = Some(token.clone());
+                    match gw_light_call(
+                        &client,
+                        "user.checkCredentials",
+                        &token,
+                        json!({
+                            "login": email,
+                            "password": pass_md5,
+                            "checkFormLogin": token
+                        }),
+                    )
+                    .await
+                    {
+                        Ok(_) => match gw_light_call(&client, "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 {
+                                        gw_err = Some("gw:no_arl".to_string());
+                                    }
+                                } else {
+                                    gw_err = Some("gw:no_arl".to_string());
                                 }
                             }
+                            Err(e) => {
+                                gw_err = Some(format!("gw:getArl:{e}"));
+                            }
+                        },
+                        Err(e) => {
+                            gw_err = Some(format!("gw:checkCredentials:{e}"));
                         }
                     }
+                } else {
+                    gw_err = Some("gw:no_checkForm".to_string());
                 }
             }
+            Err(e) => {
+                gw_err = Some(format!("gw:getUserData:{e}"));
+            }
         }
     }
 
     if access_token.is_none() && arl_out.as_deref().unwrap_or("").len() < 20 {
-        let msg = login_err.unwrap_or_else(|| "login_failed".to_string());
+        let msg = match (login_err, gw_err) {
+            (Some(a), Some(b)) => format!("{a}; {b}"),
+            (Some(a), None) => a,
+            (None, Some(b)) => b,
+            (None, None) => "login_failed".to_string(),
+        };
         let mut map = state.pair.write().await;
         if let Some(s) = map.get_mut(&code) {
             s.error = Some(msg.clone());
@@ -1524,6 +1551,9 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
         let mut map = state.pair.write().await;
         if let Some(s) = map.get_mut(&code) {
             s.access_token = access_token;
+            if gw_token.is_some() {
+                s.token = gw_token;
+            }
             s.user_id = uid;
             s.email = Some(email);
             s.arl = arl_out;