Upload main.rs

src/main.rs

@@ -1376,6 +1376,21 @@ 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 {
         Ok(arl) => (StatusCode::OK, Json(json!({
             "arl":          arl,
@@ -1390,18 +1405,19 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
                 "uid":          "",
                 "access_token": null
             }))).into_response(),
-            Err(e2) => match worker_login(&email, &pass).await {
-                Ok(arl) => (StatusCode::OK, Json(json!({
-                    "arl":          arl,
-                    "token":        null,
-                    "uid":          "",
-                    "access_token": null
-                }))).into_response(),
-                Err(e3) => json_error(
-                    StatusCode::UNAUTHORIZED,
-                    format!("login_failed; mobile:{e1}; web:{e2}; worker:{e3}"),
-                ),
-            },
+            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"),
+                    )
+                }
+            }
         }
     }
 }
@@ -1766,14 +1782,35 @@ 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) => match worker_login(&email, &pass_md5).await {
-                Ok(arl) => Ok(arl),
-                Err(e3) => Err(format!("mobile:{e1}; web:{e2}; worker:{e3}")),
-            },
+            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"))
+                }
+            }
         },
     };