From 30fd42dba41141a9c490e78a56933a8a22047b18 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:00:49 -0800
Subject: [PATCH] I think this will actually fix the synology handler

---
 src/utils/proxy/handlers/synology.js  | 21 +++++++++------------
 src/widgets/diskstation/widget.js     |  2 +-
 src/widgets/downloadstation/widget.js |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/utils/proxy/handlers/synology.js b/src/utils/proxy/handlers/synology.js
index 5d207878a..3c4a06d57 100644
--- a/src/utils/proxy/handlers/synology.js
+++ b/src/utils/proxy/handlers/synology.js
@@ -6,7 +6,7 @@ import { httpProxy } from "utils/proxy/http";
 import createLogger from "utils/logger";
 import widgets from "widgets/widgets";
 
-const INFO_ENDPOINT = "{url}/webapi/query.cgi?api=SYNO.API.Info&version=1&method=query&{authParams}";
+const INFO_ENDPOINT = "{url}/webapi/query.cgi?api=SYNO.API.Info&version=1&method=query";
 const AUTH_ENDPOINT =
   "{url}/webapi/{path}?api=SYNO.API.Auth&version={maxVersion}&session=DownloadStation&format=cookie&method=login&{authParams}";
 const AUTH_API_NAME = "SYNO.API.Auth";
@@ -15,6 +15,7 @@ const proxyName = "synologyProxyHandler";
 const logger = createLogger(proxyName);
 
 async function login(loginUrl) {
+  logger.debug("Attempting login via %s", loginUrl);
   const [status, contentType, data] = await httpProxy(loginUrl);
   if (status !== 200) {
     return [status, contentType, data];
@@ -32,8 +33,8 @@ async function login(loginUrl) {
       404  Failed to authenticate 2-step verification code
     */
     let message = "Authentication failed.";
-    if (json?.error?.code >= 403) message += " 2FA enabled.";
-    logger.warn("Unable to login.  Code: %d", json?.error?.code);
+    if (json?.error?.code && parseInt(json?.error?.code, 10) >= 403) message += " 2FA enabled.";
+    logger.error("Unable to login.  Code: %d", json?.error?.code);
     return [401, "application/json", JSON.stringify({ code: json?.error?.code, message })];
   }
 
@@ -47,10 +48,10 @@ async function getApiInfo(serviceWidget, apiName, serviceName) {
     return [cgiPath, maxVersion];
   }
 
-  const authParams = new URLSearchParams({ username: serviceWidget.username, password: serviceWidget.password });
-  const infoUrl = formatApiCall(INFO_ENDPOINT, { url: serviceWidget.url, authParams: authParams.toString() });
+  const infoUrl = formatApiCall(INFO_ENDPOINT, serviceWidget);
   // eslint-disable-next-line no-unused-vars
   const [status, contentType, data] = await httpProxy(infoUrl);
+  logger.debug("Received %d from Info endpoint %s", status, infoUrl);
 
   if (status === 200) {
     try {
@@ -73,12 +74,10 @@ async function getApiInfo(serviceWidget, apiName, serviceName) {
 }
 
 async function handleUnsuccessfulResponse(serviceWidget, url, serviceName) {
-  logger.debug(`Attempting login to ${serviceWidget.type}`);
-
   // eslint-disable-next-line no-unused-vars
   const [apiPath, maxVersion] = await getApiInfo(serviceWidget, AUTH_API_NAME, serviceName);
 
-  const authParams = new URLSearchParams({ username: serviceWidget.username, password: serviceWidget.password });
+  const authParams = new URLSearchParams({ account: serviceWidget.username, passwd: serviceWidget.password });
   const authArgs = {
     path: apiPath ?? "entry.cgi",
     maxVersion: maxVersion ?? 7,
@@ -133,7 +132,7 @@ function toError(url, synologyError) {
       error.error = synologyError.message ?? "Unknown error.";
       break;
   }
-  logger.warn(`Unable to call ${url}.  code: ${code}, error: ${error.error}.`);
+  logger.error(`Unable to call ${url}.  code: ${code}, error: ${error.error}.`);
   return error;
 }
 
@@ -156,14 +155,12 @@ export default async function synologyProxyHandler(req, res) {
     return res.status(400).json({ error: `Unrecognized API name: ${mapping.apiName}` });
   }
 
-  const authParams = new URLSearchParams({ username: serviceWidget.username, password: serviceWidget.password });
   const url = formatApiCall(widget.api, {
     apiName: mapping.apiName,
     apiMethod: mapping.apiMethod,
     cgiPath,
     maxVersion,
     url: serviceWidget.url,
-    authParams: authParams.toString(),
   });
   let [status, contentType, data] = await httpProxy(url);
   if (status !== 200) {
@@ -173,7 +170,7 @@ export default async function synologyProxyHandler(req, res) {
 
   let json = asJson(data);
   if (json?.success !== true) {
-    logger.debug(`Attempting login to ${serviceWidget.type}`);
+    logger.debug(`Request failed. Attempting login to ${serviceWidget.type}`);
     [status, contentType, data] = await handleUnsuccessfulResponse(serviceWidget, url, service);
     json = asJson(data);
   }
diff --git a/src/widgets/diskstation/widget.js b/src/widgets/diskstation/widget.js
index 97902ddaf..03aa7d232 100644
--- a/src/widgets/diskstation/widget.js
+++ b/src/widgets/diskstation/widget.js
@@ -2,7 +2,7 @@ import synologyProxyHandler from "../../utils/proxy/handlers/synology";
 
 const widget = {
   // cgiPath and maxVersion are discovered at runtime, don't supply
-  api: "{url}/webapi/{cgiPath}?api={apiName}&version={maxVersion}&method={apiMethod}&{authParams}",
+  api: "{url}/webapi/{cgiPath}?api={apiName}&version={maxVersion}&method={apiMethod}",
   proxyHandler: synologyProxyHandler,
 
   mappings: {
diff --git a/src/widgets/downloadstation/widget.js b/src/widgets/downloadstation/widget.js
index c7088d823..cbd697345 100644
--- a/src/widgets/downloadstation/widget.js
+++ b/src/widgets/downloadstation/widget.js
@@ -2,7 +2,7 @@ import synologyProxyHandler from "../../utils/proxy/handlers/synology";
 
 const widget = {
   // cgiPath and maxVersion are discovered at runtime, don't supply
-  api: "{url}/webapi/{cgiPath}?api={apiName}&version={maxVersion}&method={apiMethod}&{authParams}",
+  api: "{url}/webapi/{cgiPath}?api={apiName}&version={maxVersion}&method={apiMethod}",
   proxyHandler: synologyProxyHandler,
 
   mappings: {