diff --git a/docs/SCRIPTS.md b/docs/SCRIPTS.md index b3a301a..47b3b8d 100644 --- a/docs/SCRIPTS.md +++ b/docs/SCRIPTS.md @@ -229,6 +229,7 @@ Configures TOTP 2FA for multiple AzerothCore accounts using official SOAP API. - Remote Access enabled (Ra.Enable = 1) in worldserver.conf - SOAP.IP = "0.0.0.0" for external connectivity - GM account with sufficient privileges (gmlevel 3) +- Provide SOAP credentials explicitly via `--soap-user` and `--soap-pass` (these are required; no env fallback) **Output Structure:** ``` diff --git a/scripts/bash/bulk-2fa-setup.sh b/scripts/bash/bulk-2fa-setup.sh index a8e20cf..b7b5aec 100755 --- a/scripts/bash/bulk-2fa-setup.sh +++ b/scripts/bash/bulk-2fa-setup.sh @@ -67,8 +67,8 @@ show_usage() { echo " --dry-run Show what would be done without executing" echo " --issuer NAME Issuer name for TOTP (default: AzerothCore)" echo " --format [qr|manual] Output QR codes or manual setup info" - echo " --soap-user USERNAME SOAP API username (default: from .env)" - echo " --soap-pass PASSWORD SOAP API password (default: from .env)" + echo " --soap-user USERNAME SOAP API username (required)" + echo " --soap-pass PASSWORD SOAP API password (required)" echo " -h, --help Show this help message" echo "" echo "Examples:" @@ -496,17 +496,9 @@ main() { fatal "MYSQL_ROOT_PASSWORD not found in environment" fi - # Initialize SOAP credentials from environment if not provided via CLI - if [ -z "$SOAP_USERNAME" ]; then - SOAP_USERNAME=$(read_env "SOAP_USERNAME" "GM") - fi - if [ -z "$SOAP_PASSWORD" ]; then - SOAP_PASSWORD=$(read_env "SOAP_PASSWORD" "pass") - fi - - # Validate SOAP credentials + # Require SOAP credentials via CLI flags if [ -z "$SOAP_USERNAME" ] || [ -z "$SOAP_PASSWORD" ]; then - fatal "SOAP credentials required. Set via --soap-user/--soap-pass or SOAP_USERNAME/SOAP_PASSWORD in .env" + fatal "SOAP credentials required. Provide --soap-user and --soap-pass." fi # Check container health