Upload 2 files

src/api.rs

@@ -123,6 +123,7 @@ impl APIClient {
             .query(&[
                 ("method", method),
                 ("input", "3"),
+                ("output", "3"),
                 ("api_version", "1.0"),
                 ("api_token", check_form),
                 ("cid", cid.as_str()),

src/main.rs

@@ -1,4 +1,4 @@
-use axum::{
+use axum::{
     routing::{get, post},
     http::StatusCode,
     http::{HeaderMap, Method, header::{RANGE, CONTENT_RANGE, ACCEPT_RANGES, CONTENT_LENGTH, CONTENT_TYPE}},
@@ -1217,6 +1217,7 @@ async fn gw_light_call(
             .query(&[
                 ("method", method),
                 ("input", "3"),
+                ("output", "3"),
                 ("api_version", "1.0"),
                 ("api_token", api_token),
                 ("cid", cid.as_str()),
@@ -1313,6 +1314,7 @@ async fn gw_light_call_custom(
     let mut qp: Vec<(&str, &str)> = vec![
         ("method", method),
         ("input", "3"),
+        ("output", "3"),
         ("api_version", "1.0"),
         ("api_token", api_token),
         ("cid", cid.as_str()),
@@ -1376,49 +1378,17 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
         return json_error(StatusCode::BAD_REQUEST, "Email and password_md5 required");
     }
 
-    let mut worker_err: Option<String> = None;
-    if worker_base().is_some() {
-        match worker_login(&email, &pass).await {
-            Ok(arl) => {
-                return (StatusCode::OK, Json(json!({
-                    "arl":          arl,
-                    "token":        null,
-                    "uid":          "",
-                    "access_token": null
-                }))).into_response();
-            }
-            Err(e) => worker_err = Some(e),
-        }
-    }
-
-    match mobile_login(&email, &pass).await {
+    match web_login(&email, &pass).await {
         Ok(arl) => (StatusCode::OK, Json(json!({
             "arl":          arl,
             "token":        null,
             "uid":          "",
             "access_token": null
         }))).into_response(),
-        Err(e1) => match web_login(&email, &pass).await {
-            Ok(arl) => (StatusCode::OK, Json(json!({
-                "arl":          arl,
-                "token":        null,
-                "uid":          "",
-                "access_token": null
-            }))).into_response(),
-            Err(e2) => {
-                if let Some(e0) = worker_err {
-                    json_error(
-                        StatusCode::UNAUTHORIZED,
-                        format!("login_failed; worker:{e0}; mobile:{e1}; web:{e2}"),
-                    )
-                } else {
-                    json_error(
-                        StatusCode::UNAUTHORIZED,
-                        format!("login_failed; mobile:{e1}; web:{e2}; worker:worker:disabled"),
-                    )
-                }
-            }
-        }
+        Err(e) => json_error(
+            StatusCode::UNAUTHORIZED,
+            format!("login_failed; web:{e}"),
+        ),
     }
 }
 
@@ -1782,37 +1752,7 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
 
     let pass_md5 = format!("{:x}", md5::compute(password.as_bytes()));
 
-    let mut worker_err: Option<String> = None;
-    if worker_base().is_some() {
-        match worker_login(&email, &pass_md5).await {
-            Ok(arl) => {
-                let mut map = state.pair.write().await;
-                if let Some(s) = map.get_mut(&code) {
-                    s.arl = Some(arl);
-                    s.email = Some(email);
-                    s.error = None;
-                }
-                drop(map);
-                pair_store_save(&state).await;
-                return Html("<h3>Готово</h3><p>Вернись на ТВ — плагин подключится автоматически.</p>".to_string()).into_response();
-            }
-            Err(e) => worker_err = Some(e),
-        }
-    }
-
-    let res = match mobile_login(&email, &pass_md5).await {
-        Ok(arl) => Ok(arl),
-        Err(e1) => match web_login(&email, &pass_md5).await {
-            Ok(arl) => Ok(arl),
-            Err(e2) => {
-                if let Some(e0) = worker_err {
-                    Err(format!("worker:{e0}; mobile:{e1}; web:{e2}"))
-                } else {
-                    Err(format!("mobile:{e1}; web:{e2}; worker:worker:disabled"))
-                }
-            }
-        },
-    };
+    let res = web_login(&email, &pass_md5).await;
 
     match res {
         Err(e) => {