fix(installer): prompt for and write AuthBlocks:Email:From
Without this field, DeepDrftAPI throws InvalidOperationException on startup. Adds the EMAIL_FROM prompt after EMAIL_TOKEN, writes "From" into the Email JSON object, and unsets the variable on cleanup.
This commit is contained in:
@@ -181,6 +181,7 @@ if need_cred "authblocks"; then
|
|||||||
read -rp " Email host (SMTP server or API host): " EMAIL_HOST
|
read -rp " Email host (SMTP server or API host): " EMAIL_HOST
|
||||||
read -rsp " Email token (API key / SMTP password): " EMAIL_TOKEN
|
read -rsp " Email token (API key / SMTP password): " EMAIL_TOKEN
|
||||||
echo
|
echo
|
||||||
|
read -rp " Sender email address (From:, e.g. noreply@${DOMAIN_PUBLIC}): " EMAIL_FROM
|
||||||
|
|
||||||
# Admin account
|
# Admin account
|
||||||
echo
|
echo
|
||||||
@@ -201,10 +202,10 @@ if need_cred "authblocks"; then
|
|||||||
read -rp " Support email address: " SUPPORT_EMAIL
|
read -rp " Support email address: " SUPPORT_EMAIL
|
||||||
|
|
||||||
write_cred "authblocks" "$(cat <<JSON
|
write_cred "authblocks" "$(cat <<JSON
|
||||||
{"AuthBlocks":{"Jwt":{"Secret":"$(json_escape "${JWT_SECRET}")","Issuer":"$(json_escape "${JWT_ISSUER}")","Audience":"$(json_escape "${JWT_AUDIENCE}")"},"Email":{"Host":"$(json_escape "${EMAIL_HOST}")","Token":"$(json_escape "${EMAIL_TOKEN}")"},"Admin":{"UserName":"$(json_escape "${ADMIN_USERNAME}")","Email":"$(json_escape "${ADMIN_EMAIL}")","Password":"$(json_escape "${ADMIN_PASSWORD}")"},"SupportEmail":"$(json_escape "${SUPPORT_EMAIL}")"}}
|
{"AuthBlocks":{"Jwt":{"Secret":"$(json_escape "${JWT_SECRET}")","Issuer":"$(json_escape "${JWT_ISSUER}")","Audience":"$(json_escape "${JWT_AUDIENCE}")"},"Email":{"Host":"$(json_escape "${EMAIL_HOST}")","Token":"$(json_escape "${EMAIL_TOKEN}")","From":"$(json_escape "${EMAIL_FROM}")"},"Admin":{"UserName":"$(json_escape "${ADMIN_USERNAME}")","Email":"$(json_escape "${ADMIN_EMAIL}")","Password":"$(json_escape "${ADMIN_PASSWORD}")"},"SupportEmail":"$(json_escape "${SUPPORT_EMAIL}")"}}
|
||||||
JSON
|
JSON
|
||||||
)"
|
)"
|
||||||
unset JWT_SECRET JWT_ISSUER JWT_AUDIENCE EMAIL_HOST EMAIL_TOKEN
|
unset JWT_SECRET JWT_ISSUER JWT_AUDIENCE EMAIL_HOST EMAIL_TOKEN EMAIL_FROM
|
||||||
unset ADMIN_USERNAME ADMIN_EMAIL ADMIN_PASSWORD SUPPORT_EMAIL
|
unset ADMIN_USERNAME ADMIN_EMAIL ADMIN_PASSWORD SUPPORT_EMAIL
|
||||||
else
|
else
|
||||||
echo "[setup-step10-creds] authblocks.json already exists, skipping"
|
echo "[setup-step10-creds] authblocks.json already exists, skipping"
|
||||||
|
|||||||
Reference in New Issue
Block a user