From 3540b0ae90caf8d08d204cc3a9dc92effbdb0047 Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Fri, 27 Mar 2026 14:54:58 +0100
Subject: [PATCH] fix(ente,garmin-grafana): resolve port conflict and
 credential piping

Ente: Remove circular Caddy :8080 reverse_proxy block that conflicted
with Museum binding to the same port. Museum serves directly on 8080.

Garmin-Grafana: Use GARMINCONNECT_EMAIL and GARMINCONNECT_BASE64_PASSWORD
env vars instead of broken heredoc stdin piping through timeout+uv run.
MFA code piped via stdin only when provided.
---
 install/ente-install.sh           | 10 ----------
 install/garmin-grafana-install.sh | 15 +++++++++------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/install/ente-install.sh b/install/ente-install.sh
index 1123ce27..e3a4eba3 100644
--- a/install/ente-install.sh
+++ b/install/ente-install.sh
@@ -289,16 +289,6 @@ cat <<EOF >/etc/caddy/Caddyfile
     }
 }
 
-# Museum API Proxy
-:8080 {
-    reverse_proxy localhost:8080
-
-    header {
-        Access-Control-Allow-Origin *
-        Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"
-        Access-Control-Allow-Headers *
-    }
-}
 EOF
 systemctl reload caddy
 msg_ok "Configured Caddy"
diff --git a/install/garmin-grafana-install.sh b/install/garmin-grafana-install.sh
index e9b366d8..f78bdfac 100644
--- a/install/garmin-grafana-install.sh
+++ b/install/garmin-grafana-install.sh
@@ -102,13 +102,16 @@ if [[ -z "$(ls -A /opt/garmin-grafana/.garminconnect)" ]]; then
   read -r -p "Please enter your Garmin Connect Email: " GARMIN_EMAIL
   read -r -p "Please enter your Garmin Connect Password (used to generate token, NOT stored): " GARMIN_PASSWORD
   read -r -p "Please enter your MFA Code (leave blank if not applicable): " GARMIN_MFA
+  GARMIN_BASE64_PASSWORD=$(echo -n "${GARMIN_PASSWORD}" | base64 -w0)
   msg_info "Creating Garmin credentials (timeout 60s)"
-  timeout 60s uv run --env-file /opt/garmin-grafana/.env --project /opt/garmin-grafana/ /opt/garmin-grafana/src/garmin_grafana/garmin_fetch.py <<EOF
-${GARMIN_EMAIL}
-${GARMIN_PASSWORD}
-${GARMIN_MFA}
-EOF
-  unset GARMIN_EMAIL GARMIN_PASSWORD GARMIN_MFA
+  if [[ -n "${GARMIN_MFA}" ]]; then
+    echo "${GARMIN_MFA}" | GARMINCONNECT_EMAIL="${GARMIN_EMAIL}" GARMINCONNECT_BASE64_PASSWORD="${GARMIN_BASE64_PASSWORD}" \
+      timeout 60s uv run --env-file /opt/garmin-grafana/.env --project /opt/garmin-grafana/ /opt/garmin-grafana/src/garmin_grafana/garmin_fetch.py
+  else
+    GARMINCONNECT_EMAIL="${GARMIN_EMAIL}" GARMINCONNECT_BASE64_PASSWORD="${GARMIN_BASE64_PASSWORD}" \
+      timeout 60s uv run --env-file /opt/garmin-grafana/.env --project /opt/garmin-grafana/ /opt/garmin-grafana/src/garmin_grafana/garmin_fetch.py </dev/null
+  fi
+  unset GARMIN_EMAIL GARMIN_PASSWORD GARMIN_MFA GARMIN_BASE64_PASSWORD
   if [[ -z "$(ls -A /opt/garmin-grafana/.garminconnect)" ]]; then
     msg_error "Failed to create token"
     exit 1