Change qBittorrent to no longer use fetch

src/widgets/qbittorrent/proxy.js

@@ -1,30 +1,23 @@
 import { formatApiCall } from "utils/proxy/api-helpers";
-import { addCookieToJar, setCookieHeader } from "utils/proxy/cookie-jar";
 import { httpProxy } from "utils/proxy/http";
 import getServiceWidget from "utils/config/service-helpers";
 import createLogger from "utils/logger";
 
 const logger = createLogger("qbittorrentProxyHandler");
 
-async function login(widget, params) {
+async function login(widget) {
   logger.debug("qBittorrent is rejecting the request, logging in.");
   const loginUrl = new URL(`${widget.url}/api/v2/auth/login`).toString();
   const loginBody = `username=${encodeURI(widget.username)}&password=${encodeURI(widget.password)}`;
-
-  // using fetch intentionally, for login only, as the httpProxy method causes qBittorrent to
-  // complain about header encoding
-  return fetch(loginUrl, {
+  const loginParams = {
     method: "POST",
     headers: { "Content-Type": "application/x-www-form-urlencoded" },
     body: loginBody,
-  })
-  .then(async (response) => {
-    addCookieToJar(loginUrl, response.headers);
-    setCookieHeader(loginUrl, params);
-    const data = await response.text();
-    return [response.status, data];
-  })
-  .catch((err) => [500, err]);
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  const [status, contentType, data] = await httpProxy(loginUrl, loginParams);
+  return [status, data];
 }
 
 export default async function qbittorrentProxyHandler(req, res) {
@@ -44,11 +37,10 @@ export default async function qbittorrentProxyHandler(req, res) {
 
   const url = new URL(formatApiCall("{url}/api/v2/{endpoint}", { endpoint, ...widget }));
   const params = { method: "GET", headers: {} };
-  setCookieHeader(url, params);
 
   let [status, contentType, data] = await httpProxy(url, params);
   if (status === 403) {
-    [status, data] = await login(widget, params);
+    [status, data] = await login(widget);
 
     if (status !== 200) {
       logger.error("HTTP %d logging in to qBittorrent.  Data: %s", status, data);
@@ -59,9 +51,9 @@ export default async function qbittorrentProxyHandler(req, res) {
       logger.error("Error logging in to qBittorrent: Data: %s", data);
       return res.status(401).end(data);
     }
-  }
 
-  [status, contentType, data] = await httpProxy(url, params);
+    [status, contentType, data] = await httpProxy(url, params);
+  }
 
   if (status !== 200) {
     logger.error("HTTP %d getting data from qBittorrent.  Data: %s", status, data);