Upload main.rs

src/main.rs

@@ -1088,14 +1088,20 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
 
     let mut access_token_out: Option<String> = None;
     let mut oauth_uid: Option<String> = None;
-    if let Ok(access_token) = oauth_access_token(&client, &email, &pass).await {
-        oauth_uid = api_deezer_get(&client, "/user/me", &access_token, &[])
-            .await
-            .ok()
-            .and_then(|v| v.get("id").and_then(|x| x.as_i64()))
-            .filter(|id| *id > 0)
-            .map(|id| id.to_string());
-        access_token_out = Some(access_token);
+    let mut oauth_err: Option<String> = None;
+    match oauth_access_token(&client, &email, &pass).await {
+        Ok(access_token) => {
+            oauth_uid = api_deezer_get(&client, "/user/me", &access_token, &[])
+                .await
+                .ok()
+                .and_then(|v| v.get("id").and_then(|x| x.as_i64()))
+                .filter(|id| *id > 0)
+                .map(|id| id.to_string());
+            access_token_out = Some(access_token);
+        }
+        Err(e) => {
+            oauth_err = Some(e);
+        }
     }
 
     let mut gw_token: Option<String> = None;
@@ -1152,9 +1158,11 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
     let uid_out = gw_uid.or(oauth_uid).unwrap_or_default();
 
     if gw_token.is_none() && access_token_out.is_none() {
+        let gw_msg = gw_err.unwrap_or_else(|| "gw:none".to_string());
+        let oauth_msg = oauth_err.unwrap_or_else(|| "oauth:none".to_string());
         return json_error(
             StatusCode::UNAUTHORIZED,
-            gw_err.unwrap_or_else(|| "login_failed".to_string()),
+            format!("login_failed; {oauth_msg}; {gw_msg}"),
         );
     }
 
@@ -1378,9 +1386,11 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
     let mut arl_out: Option<String> = None;
     let mut access_token_out: Option<String> = None;
     let mut gw_err: Option<String> = None;
+    let mut oauth_err: Option<String> = None;
 
-    if let Ok(t) = oauth_access_token(&client, &email, &pass_md5).await {
-        access_token_out = Some(t);
+    match oauth_access_token(&client, &email, &pass_md5).await {
+        Ok(t) => access_token_out = Some(t),
+        Err(e) => oauth_err = Some(e),
     }
 
     if let Ok(ud) = gw_light_call(&client, &jar, "deezer.getUserData", "null", json!({})).await {
@@ -1430,7 +1440,9 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
     }
 
     if gw_token.is_none() && access_token_out.is_none() {
-        let msg = gw_err.unwrap_or_else(|| "login_failed".to_string());
+        let gw_msg = gw_err.unwrap_or_else(|| "gw:none".to_string());
+        let oauth_msg = oauth_err.unwrap_or_else(|| "oauth:none".to_string());
+        let msg = format!("login_failed; {oauth_msg}; {gw_msg}");
         let mut map = state.pair.write().await;
         if let Some(s) = map.get_mut(&code) {
             s.error = Some(msg.clone());