Upload main.rs

src/main.rs

@@ -1109,7 +1109,7 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
         .build()
         .unwrap();
 
-    let ud = match gw_light_call(&client, "deezer.getUserData", "null", json!({})).await {
+    let ud = match gw_light_call(&client, &jar, "deezer.getUserData", "null", json!({})).await {
         Ok(v) => v,
         Err(e) => return json_error(StatusCode::BAD_GATEWAY, e),
     };
@@ -1126,6 +1126,7 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
 
     if let Err(e) = gw_light_call(
         &client,
+        &jar,
         "user.checkCredentials",
         &token,
         json!({
@@ -1140,7 +1141,7 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
     }
 
     let mut arl: String = String::new();
-    if let Ok(v) = gw_light_call(&client, "user.getArl", &token, json!({})).await {
+    if let Ok(v) = gw_light_call(&client, &jar, "user.getArl", &token, json!({})).await {
         arl = v.as_str().unwrap_or("").to_string();
     }
 
@@ -1385,7 +1386,7 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
     let url_deezer = "https://www.deezer.com".parse::<Url>().unwrap();
     jar.add_cookie_str("comeback=1; Domain=.deezer.com", &url_deezer);
     let client = reqwest::Client::builder()
-        .cookie_provider(jar)
+        .cookie_provider(jar.clone())
         .timeout(std::time::Duration::from_secs(20))
         .build()
         .unwrap();
@@ -1396,7 +1397,7 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
     let mut arl_out: Option<String> = None;
     let mut gw_token: Option<String> = None;
 
-    let ud = match gw_light_call(&client, "deezer.getUserData", "null", json!({})).await {
+    let ud = match gw_light_call(&client, &jar, "deezer.getUserData", "null", json!({})).await {
         Ok(v) => v,
         Err(e) => {
             let mut map = state.pair.write().await;
@@ -1425,6 +1426,7 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
 
     if let Err(e) = gw_light_call(
         &client,
+        &jar,
         "user.checkCredentials",
         &token,
         json!({
@@ -1443,7 +1445,7 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
             .into_response();
     }
 
-    if let Ok(v) = gw_light_call(&client, "user.getArl", &token, json!({})).await {
+    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());
@@ -1634,7 +1636,7 @@ async fn oauth_arl(Json(req): Json<OauthArlReq>) -> impl IntoResponse {
     let mut ud: Option<serde_json::Value> = None;
     let mut ud_err: Option<String> = None;
     for attempt in 0..2 {
-        match gw_light_call(&client, "deezer.getUserData", "null", json!({})).await {
+        match gw_light_call(&client, &jar, "deezer.getUserData", "null", json!({})).await {
             Ok(v) => {
                 ud = Some(v);
                 break;
@@ -1668,7 +1670,7 @@ async fn oauth_arl(Json(req): Json<OauthArlReq>) -> impl IntoResponse {
         return json_error(StatusCode::SERVICE_UNAVAILABLE, "no checkForm");
     }
 
-    let arl_v = match gw_light_call(&client, "user.getArl", &check_form, json!({})).await {
+    let arl_v = match gw_light_call(&client, &jar, "user.getArl", &check_form, json!({})).await {
         Ok(v) => v,
         Err(e) => return json_error(StatusCode::SERVICE_UNAVAILABLE, e),
     };