Removed secrets

Inject HTML directly and fix footer out of main content <div>

.env

@@ -1 +0,0 @@
-DATABASE_URL="postgres://postgres:Jq09NF6Y8ZXJS4jd9c8U@localhost:5432/newsletter"

.gitignore

@@ -1,2 +1,3 @@
 /target
 /node_modules
+.env

configuration/local.yaml

@@ -7,9 +7,9 @@ database:
   port: 5432
   database_name: "newsletter"
   username: "postgres"
-  password: "Jq09NF6Y8ZXJS4jd9c8U"
+  password: "password"
   require_ssl: false
-  timeout_millis: 1000
+  timeout_milliseconds: 1000
 email_client:
   authorization_token: "secret-token"
 redis_uri: "redis://127.0.0.1:6379"

configuration/production.yaml

@@ -1,4 +1,4 @@
 application:
   host: "0.0.0.0"
 database:
-  timeout_millis: 500
+  timeout_milliseconds: 500

scripts/init_db.sh

@@ -14,7 +14,7 @@ if ! [ -x "$(command -v sqlx)" ]; then
 fi
 
 DB_USER="${POSTGRES_USER:=postgres}"
-DB_PASSWORD="${POSTGRES_PASSWORD:=Jq09NF6Y8ZXJS4jd9c8U}"
+DB_PASSWORD="${POSTGRES_PASSWORD:=password}"
 DB_NAME="${POSTGRES_DB:=newsletter}"
 DB_PORT="${POSTGRES_PORT:=5432}"
 DB_HOST="${POSTGRES_HOST:=localhost}"

src/configuration.rs

@@ -110,7 +110,7 @@ pub struct DatabaseSettings {
     pub host: String,
     pub database_name: String,
     pub require_ssl: bool,
-    pub timeout_millis: u64,
+    pub timeout_milliseconds: u64,
 }
 
 impl DatabaseSettings {

src/startup.rs

@@ -38,7 +38,9 @@ impl Application {
             configuration.application.host, configuration.application.port
         );
         let connection_pool = PgPoolOptions::new()
-            .acquire_timeout(Duration::from_millis(configuration.database.timeout_millis))
+            .acquire_timeout(Duration::from_millis(
+                configuration.database.timeout_milliseconds,
+            ))
             .connect_lazy_with(configuration.database.with_db());
         let email_client = EmailClient::build(configuration.email_client).unwrap();
         let pool = Pool::new(

tests/api/subscriptions.rs

@@ -108,5 +108,11 @@ async fn subscribe_fails_if_there_is_a_fatal_database_error() {
 
     let response = app.post_subscriptions(body).await;
 
-    assert_eq!(response.status().as_u16(), 500);
+    assert!(
+        response
+            .text()
+            .await
+            .unwrap()
+            .contains("An internal server error occured")
+    );
 }