Upload main.rs

src/main.rs

@@ -1086,6 +1086,18 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
         .build()
         .unwrap();
 
+    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 gw_token: Option<String> = None;
     let mut gw_uid: Option<String> = None;
     let mut arl_out: Option<String> = None;
@@ -1097,7 +1109,6 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
             if token.is_empty() {
                 gw_err = Some("gw:no_checkForm".to_string());
             } else {
-                gw_token = Some(token.clone());
                 gw_uid = ud["USER"]["USER_ID"]
                     .as_i64()
                     .map(|n| n.to_string())
@@ -1116,13 +1127,18 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
                 )
                 .await
                 {
-                    return json_error(StatusCode::UNAUTHORIZED, e);
-                }
+                    if access_token_out.is_none() {
+                        return json_error(StatusCode::UNAUTHORIZED, format!("gw:checkCredentials:{e}"));
+                    }
+                    gw_err = Some(format!("gw:checkCredentials:{e}"));
+                } else {
+                    gw_token = Some(token.clone());
 
-                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(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());
+                            }
                         }
                     }
                 }
@@ -1133,18 +1149,6 @@ 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 uid_out = gw_uid.or(oauth_uid).unwrap_or_default();
 
     if gw_token.is_none() && access_token_out.is_none() {
@@ -1373,6 +1377,11 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
     let mut gw_uid: Option<String> = None;
     let mut arl_out: Option<String> = None;
     let mut access_token_out: Option<String> = None;
+    let mut gw_err: Option<String> = None;
+
+    if let Ok(t) = oauth_access_token(&client, &email, &pass_md5).await {
+        access_token_out = Some(t);
+    }
 
     if let Ok(ud) = gw_light_call(&client, &jar, "deezer.getUserData", "null", json!({})).await {
         let token = ud["checkForm"].as_str().unwrap_or("").to_string();
@@ -1390,36 +1399,38 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
             )
             .await
             {
-                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}"))))
+                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_token = Some(token.clone());
-            gw_uid = ud["USER"]["USER_ID"]
-                .as_i64()
-                .map(|n| n.to_string())
-                .filter(|s| !s.trim().is_empty());
+                }
+                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(s) = v.as_str() {
-                    if s.len() > 20 {
-                        arl_out = Some(s.to_string());
+                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_out = Some(t);
-    }
-
     if gw_token.is_none() && access_token_out.is_none() {
-        let msg = "login_failed".to_string();
+        let msg = gw_err.unwrap_or_else(|| "login_failed".to_string());
         let mut map = state.pair.write().await;
         if let Some(s) = map.get_mut(&code) {
             s.error = Some(msg.clone());