diff --git a/Cargo.lock b/Cargo.lock index 50e1416..cce3740 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -465,10 +465,13 @@ dependencies = [ ] [[package]] -name = "cpuid-bool" -version = "0.1.2" +name = "cpufeatures" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" +checksum = "dec1028182c380cc45a2e2c5ec841134f2dfd0f8f5f0a5bcd68004f81b5efdf4" +dependencies = [ + "libc", +] [[package]] name = "crc" @@ -690,9 +693,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" +checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" dependencies = [ "futures-channel", "futures-core", @@ -705,9 +708,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" +checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" dependencies = [ "futures-core", "futures-sink", @@ -715,15 +718,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" +checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" [[package]] name = "futures-executor" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" +checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" dependencies = [ "futures-core", "futures-task", @@ -732,9 +735,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" +checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" [[package]] name = "futures-lite" @@ -753,10 +756,11 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" +checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" dependencies = [ + "autocfg", "proc-macro-hack", "proc-macro2", "quote", @@ -765,15 +769,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" +checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" [[package]] name = "futures-task" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" +checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" [[package]] name = "futures-timer" @@ -783,10 +787,11 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" +checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" dependencies = [ + "autocfg", "futures-channel", "futures-core", "futures-io", @@ -927,9 +932,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfb77c123b4e2f72a2069aeae0b4b4949cc7e966df277813fc16347e7549737" +checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" dependencies = [ "bytes", "http", @@ -938,9 +943,9 @@ dependencies = [ [[package]] name = "http-types" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f600cccfb9d96c45550bac47b592bc88191a0dd965e9d55848880c2c5a45f" +checksum = "ad077d89137cd3debdce53c66714dc536525ef43fe075d41ddc0a8ac11f85957" dependencies = [ "anyhow", "async-channel", @@ -959,9 +964,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437" +checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" [[package]] name = "httpdate" @@ -1058,9 +1063,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "js-sys" -version = "0.3.50" +version = "0.3.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" +checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" dependencies = [ "wasm-bindgen", ] @@ -1530,9 +1535,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85dd92e586f7355c633911e11f77f3d12f04b1b1bd76a198bd34ae3af8341ef2" +checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" dependencies = [ "bitflags", ] @@ -1549,9 +1554,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.2" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efb2352a0f4d4b128f734b5c44c79ff80117351138733f12f982fe3e2b13343" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", @@ -1570,9 +1575,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.24" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00efb87459ba4f6fb2169d20f68565555688e1250ee6825cdf6254f8b48fafb2" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "reqwest" @@ -1686,9 +1691,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" dependencies = [ "serde_derive", ] @@ -1706,9 +1711,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2", "quote", @@ -1753,13 +1758,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f" +checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16" dependencies = [ "block-buffer", "cfg-if", - "cpuid-bool", + "cpufeatures", "digest", "opaque-debug", ] @@ -1772,13 +1777,13 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "sha2" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" +checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" dependencies = [ "block-buffer", "cfg-if", - "cpuid-bool", + "cpufeatures", "digest", "opaque-debug", ] @@ -2027,9 +2032,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" dependencies = [ "proc-macro2", "quote", @@ -2260,9 +2265,9 @@ dependencies = [ [[package]] name = "tracing-bunyan-formatter" -version = "0.1.7" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06718867c20ea03700d41a9413610cccf5d772caea792f34cc73cdd43f0e14a6" +checksum = "dce1eae70720bd6bb3944f7cf501761aeae658bd1f9293aa373c71a195064910" dependencies = [ "chrono", "gethostname", @@ -2330,9 +2335,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705096c6f83bf68ea5d357a6aa01829ddbdac531b357b45abeca842938085baa" +checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5" dependencies = [ "ansi_term", "chrono", @@ -2412,9 +2417,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", "idna", @@ -2490,9 +2495,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.73" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" +checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" dependencies = [ "cfg-if", "serde", @@ -2502,9 +2507,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.73" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" +checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" dependencies = [ "bumpalo", "lazy_static", @@ -2517,9 +2522,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" +checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" dependencies = [ "cfg-if", "js-sys", @@ -2529,9 +2534,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.73" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" +checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2539,9 +2544,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.73" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" +checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" dependencies = [ "proc-macro2", "quote", @@ -2552,15 +2557,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.73" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" +checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" [[package]] name = "web-sys" -version = "0.3.50" +version = "0.3.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" +checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" dependencies = [ "js-sys", "wasm-bindgen", @@ -2670,6 +2675,7 @@ dependencies = [ "actix-rt", "actix-service", "actix-web", + "anyhow", "chrono", "claim", "config", @@ -2685,6 +2691,7 @@ dependencies = [ "serde_json", "sha2", "sqlx", + "thiserror", "tokio", "tracing", "tracing-actix-web", diff --git a/Cargo.toml b/Cargo.toml index deac8fd..8bc081e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,14 +26,16 @@ reqwest = { version = "0.11", default-features = false, features = ["json", "rus tracing = "0.1.19" tracing-futures = "0.2.4" tracing-subscriber = { version = "0.2.12", features = ["registry", "env-filter"] } -tracing-bunyan-formatter = "0.1.6" +tracing-bunyan-formatter = "0.2.2" tracing-log = "0.1.1" +thiserror = "1.0.24" serde-aux = "1.0.1" unicode-segmentation = "1.7.1" validator = "0.12.0" rand = { version = "0.8", features=["std_rng"] } sha2 = { version = "0.9" } tracing-actix-web = "0.4.0-beta.4" +anyhow = "1.0.40" [dev-dependencies] once_cell = "1.7.2" diff --git a/src/routes/subscriptions.rs b/src/routes/subscriptions.rs index bacf8d0..405d8cf 100644 --- a/src/routes/subscriptions.rs +++ b/src/routes/subscriptions.rs @@ -1,7 +1,9 @@ use crate::domain::{NewSubscriber, SubscriberEmail, SubscriberName}; use crate::email_client::EmailClient; use crate::startup::ApplicationBaseUrl; -use actix_web::{web, HttpResponse}; +use actix_web::http::StatusCode; +use actix_web::{web, HttpResponse, ResponseError}; +use anyhow::Context; use chrono::Utc; use rand::distributions::Alphanumeric; use rand::{thread_rng, Rng}; @@ -25,6 +27,29 @@ impl TryInto for FormData { } } +#[derive(thiserror::Error)] +pub enum SubscribeError { + #[error("{0}")] + ValidationError(String), + #[error(transparent)] + UnexpectedError(#[from] anyhow::Error), +} + +impl std::fmt::Debug for SubscribeError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + error_chain_fmt(self, f) + } +} + +impl ResponseError for SubscribeError { + fn status_code(&self) -> StatusCode { + match self { + SubscribeError::ValidationError(_) => StatusCode::BAD_REQUEST, + SubscribeError::UnexpectedError(_) => StatusCode::INTERNAL_SERVER_ERROR, + } + } +} + #[tracing::instrument( name = "Adding a new subscriber", skip(form, pool, email_client, base_url), @@ -38,27 +63,23 @@ pub async fn subscribe( pool: web::Data, email_client: web::Data, base_url: web::Data, -) -> Result { - let new_subscriber = form - .0 - .try_into() - .map_err(|_| HttpResponse::BadRequest().finish())?; +) -> Result { + let new_subscriber = form.0.try_into().map_err(SubscribeError::ValidationError)?; let mut transaction = pool .begin() .await - .map_err(|_| HttpResponse::InternalServerError().finish())?; + .context("Failed to acquire a Postgres connection from the pool")?; let subscriber_id = insert_subscriber(&mut transaction, &new_subscriber) .await - .map_err(|_| HttpResponse::InternalServerError().finish())?; - // We are swallowing the error for the time being. + .context("Failed to insert new subscriber in the database.")?; let subscription_token = generate_subscription_token(); store_token(&mut transaction, subscriber_id, &subscription_token) .await - .map_err(|_| HttpResponse::InternalServerError().finish())?; + .context("Failed to store the confirmation token for a new subscriber.")?; transaction .commit() .await - .map_err(|_| HttpResponse::InternalServerError().finish())?; + .context("Failed to commit SQL transaction to store a new subscriber.")?; send_confirmation_email( &email_client, new_subscriber, @@ -66,7 +87,7 @@ pub async fn subscribe( &subscription_token, ) .await - .map_err(|_| HttpResponse::InternalServerError().finish())?; + .context("Failed to send a confirmation email.")?; Ok(HttpResponse::Ok().finish()) } @@ -125,11 +146,7 @@ pub async fn insert_subscriber( Utc::now() ) .execute(transaction) - .await - .map_err(|e| { - tracing::error!("Failed to execute query: {:?}", e); - e - })?; + .await?; Ok(subscriber_id) } @@ -141,7 +158,7 @@ pub async fn store_token( transaction: &mut Transaction<'_, Postgres>, subscriber_id: Uuid, subscription_token: &str, -) -> Result<(), sqlx::Error> { +) -> Result<(), StoreTokenError> { sqlx::query!( r#" INSERT INTO subscription_tokens (subscription_token, subscriber_id) @@ -152,9 +169,42 @@ pub async fn store_token( ) .execute(transaction) .await - .map_err(|e| { - tracing::error!("Failed to execute query: {:?}", e); - e - })?; + .map_err(StoreTokenError)?; + Ok(()) +} + +pub struct StoreTokenError(sqlx::Error); + +impl std::error::Error for StoreTokenError { + fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { + Some(&self.0) + } +} + +impl std::fmt::Debug for StoreTokenError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + error_chain_fmt(self, f) + } +} + +impl std::fmt::Display for StoreTokenError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!( + f, + "A database failure was encountered while trying to store a subscription token." + ) + } +} + +pub fn error_chain_fmt( + e: &impl std::error::Error, + f: &mut std::fmt::Formatter<'_>, +) -> std::fmt::Result { + writeln!(f, "{}\n", e)?; + let mut current = e.source(); + while let Some(cause) = current { + writeln!(f, "Caused by:\n\t{}", cause)?; + current = cause.source(); + } Ok(()) } diff --git a/src/routes/subscriptions_confirm.rs b/src/routes/subscriptions_confirm.rs index c8e8290..1fb9a99 100644 --- a/src/routes/subscriptions_confirm.rs +++ b/src/routes/subscriptions_confirm.rs @@ -1,4 +1,7 @@ -use actix_web::{web, HttpResponse}; +use crate::routes::error_chain_fmt; +use actix_web::http::StatusCode; +use actix_web::{web, HttpResponse, ResponseError}; +use anyhow::Context; use sqlx::PgPool; use uuid::Uuid; @@ -7,24 +10,42 @@ pub struct Parameters { subscription_token: String, } +#[derive(thiserror::Error)] +pub enum ConfirmationError { + #[error(transparent)] + UnexpectedError(#[from] anyhow::Error), + #[error("There is no subscriber associated with the provided token.")] + UnknownToken, +} + +impl std::fmt::Debug for ConfirmationError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + error_chain_fmt(self, f) + } +} + +impl ResponseError for ConfirmationError { + fn status_code(&self) -> StatusCode { + match self { + Self::UnknownToken => StatusCode::UNAUTHORIZED, + Self::UnexpectedError(_) => StatusCode::INTERNAL_SERVER_ERROR, + } + } +} + #[tracing::instrument(name = "Confirm a pending subscriber", skip(parameters, pool))] pub async fn confirm( parameters: web::Query, pool: web::Data, -) -> Result { - let id = get_subscriber_id_from_token(&pool, ¶meters.subscription_token) +) -> Result { + let subscriber_id = get_subscriber_id_from_token(&pool, ¶meters.subscription_token) .await - .map_err(|_| HttpResponse::InternalServerError().finish())?; - match id { - // Non-existing token! - None => Err(HttpResponse::Unauthorized().finish()), - Some(subscriber_id) => { - confirm_subscriber(&pool, subscriber_id) - .await - .map_err(|_| HttpResponse::InternalServerError().finish())?; - Ok(HttpResponse::Ok().finish()) - } - } + .context("Failed to retrieve the subscriber id associated with the provided token.")? + .ok_or(ConfirmationError::UnknownToken)?; + confirm_subscriber(&pool, subscriber_id) + .await + .context("Failed to update the subscriber status to `confirmed`.")?; + Ok(HttpResponse::Ok().finish()) } #[tracing::instrument(name = "Mark subscriber as confirmed", skip(subscriber_id, pool))] @@ -34,11 +55,7 @@ pub async fn confirm_subscriber(pool: &PgPool, subscriber_id: Uuid) -> Result<() subscriber_id, ) .execute(pool) - .await - .map_err(|e| { - tracing::error!("Failed to execute query: {:?}", e); - e - })?; + .await?; Ok(()) } @@ -52,10 +69,6 @@ pub async fn get_subscriber_id_from_token( subscription_token, ) .fetch_optional(pool) - .await - .map_err(|e| { - tracing::error!("Failed to execute query: {:?}", e); - e - })?; + .await?; Ok(result.map(|r| r.subscriber_id)) } diff --git a/tests/api/subscriptions.rs b/tests/api/subscriptions.rs index 53045cb..3b2e169 100644 --- a/tests/api/subscriptions.rs +++ b/tests/api/subscriptions.rs @@ -41,6 +41,24 @@ async fn subscribe_persists_the_new_subscriber() { assert_eq!(saved.status, "pending_confirmation"); } +#[actix_rt::test] +async fn subscribe_fails_if_there_is_a_fatal_database_error() { + // Arrange + let app = spawn_app().await; + let body = "name=le%20guin&email=ursula_le_guin%40gmail.com"; + // Sabotage the database + sqlx::query!("ALTER TABLE subscriptions DROP COLUMN email;",) + .execute(&app.db_pool) + .await + .unwrap(); + + // Act + let response = app.post_subscriptions(body.into()).await; + + // Assert + assert_eq!(response.status().as_u16(), 500); +} + #[actix_rt::test] async fn subscribe_sends_a_confirmation_email_for_valid_data() { // Arrange