Merge pull request #57 from outis1one/claude/clever-mayer-FvxF6
manage_users.sh: fix login silently bailing on credential entry
This commit is contained in:
+17
-6
@@ -101,17 +101,28 @@ ensure_token() {
|
|||||||
[[ -n "$TOKEN" ]] && return 0
|
[[ -n "$TOKEN" ]] && return 0
|
||||||
echo
|
echo
|
||||||
echo " ${B}FileBrowser login${R} ${DIM}(${FB_URL})${R}"
|
echo " ${B}FileBrowser login${R} ${DIM}(${FB_URL})${R}"
|
||||||
local _u _p _tok
|
local _u _p _payload _tok
|
||||||
read -r -p " Admin username [admin]: " _u
|
read -r -p " Admin username [admin]: " _u
|
||||||
_u="${_u:-admin}"
|
_u="${_u:-admin}"
|
||||||
read -r -s -p " Admin password: " _p; echo
|
read -r -s -p " Admin password: " _p; echo
|
||||||
|
|
||||||
|
# Build JSON with jq so special characters in passwords don't break the payload
|
||||||
|
_payload=$(jq -n --arg u "$_u" --arg p "$_p" '{username:$u,password:$p}')
|
||||||
|
|
||||||
|
# || true prevents set -e from exiting silently on connection refused
|
||||||
_tok=$(curl -s -X POST "$FB_URL/api/login" \
|
_tok=$(curl -s -X POST "$FB_URL/api/login" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "{\"username\":\"$_u\",\"password\":\"$_p\"}")
|
-d "$_payload") || true
|
||||||
[[ "$_tok" == *"."*"."* ]] \
|
|
||||||
|| die "Login failed. Check credentials and that FileBrowser is running at $FB_URL"
|
if [[ -z "$_tok" ]]; then
|
||||||
TOKEN="$_tok"
|
die "No response from FileBrowser at $FB_URL — is it running? (docker compose up -d)"
|
||||||
ok "Logged in as $_u"
|
elif [[ "$_tok" == *"."*"."* ]]; then
|
||||||
|
TOKEN="$_tok"
|
||||||
|
ok "Logged in as $_u"
|
||||||
|
else
|
||||||
|
echo " FileBrowser responded: $_tok" >&2
|
||||||
|
die "Login failed — wrong credentials, or FileBrowser is not reachable at $FB_URL"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# ── REST wrappers ─────────────────────────────────────────────────────────────
|
# ── REST wrappers ─────────────────────────────────────────────────────────────
|
||||||
|
|||||||
Reference in New Issue
Block a user