Merge pull request #139 from reddevilmidzy/revert-135-dependabot/cargo/rook/secrecy-0.10.3

Revert "chore(deps): bump secrecy from 0.8.0 to 0.10.3 in /rook"

Author: reddevilmidzy

rook/Cargo.lock

@@ -28,7 +28,7 @@ shuttle-runtime = { version = "0.55.0", default-features = false } # see https:/
 shuttle-shared-db = { version = "0.55.0", features = ["postgres", "sqlx"] }
 
 validator = "0.20"
-secrecy = { version = "0.10", features = ["serde"] }
+secrecy = { version = "0.8", features = ["serde"] }
 sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "postgres", "chrono", "uuid"] }
 dotenvy = "0.15"
 chrono = { version = "0.4.41", features = ["serde"] }

rook/Cargo.toml

@@ -1,6 +1,6 @@
 use crate::domain::SubscriberEmail;
 use config::{Config, File, FileFormat};
-use secrecy::SecretBox;
+use secrecy::Secret;
 use serde::Deserialize;
 use std::time::Duration;
 
@@ -20,7 +20,7 @@ pub struct EmailClientSettings {
     pub base_url: String,
     pub sender_email: String,
     #[serde(deserialize_with = "deserialize_secret")]
-    pub authorization_token: SecretBox<String>,
+    pub authorization_token: Secret<String>,
     pub timeout_seconds: u64,
 }
 
@@ -34,12 +34,12 @@ pub struct RepositoryCheckerSettings {
     pub interval_seconds: u64,
 }
 
-fn deserialize_secret<'de, D>(deserializer: D) -> Result<SecretBox<String>, D::Error>
+fn deserialize_secret<'de, D>(deserializer: D) -> Result<Secret<String>, D::Error>
 where
     D: serde::Deserializer<'de>,
 {
     let s = String::deserialize(deserializer)?;
-    Ok(SecretBox::init_with(|| s))
+    Ok(Secret::new(s))
 }
 
 impl EmailClientSettings {

rook/src/configuration.rs

@@ -1,14 +1,14 @@
 use chrono::{DateTime, Duration, Utc};
 use rand::{Rng, rngs::ThreadRng};
-use secrecy::{ExposeSecret, SecretBox};
+use secrecy::{ExposeSecret, Secret};
 use serde::{Deserialize, Serialize};
 use sqlx::{PgPool, postgres::PgQueryResult};
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct EmailVerification {
     pub email: String,
     #[serde(skip_serializing)]
-    pub code: SecretBox<String>,
+    pub code: Secret<String>,
     pub created_at: DateTime<Utc>,
     pub expires_at: DateTime<Utc>,
     pub verified: bool,
@@ -75,12 +75,12 @@ impl EmailVerification {
     }
 }
 
-fn generate_verification_code() -> SecretBox<String> {
+fn generate_verification_code() -> Secret<String> {
     let mut rng = ThreadRng::default();
     let code: String = (0..6)
         .map(|_| rng.random_range(0..10).to_string())
         .collect();
-    SecretBox::init_with(|| code)
+    Secret::new(code)
 }
 
 #[derive(Debug)]
@@ -132,7 +132,7 @@ impl EmailVerificationStore {
 
         Ok(record.map(|r| EmailVerification {
             email: r.email,
-            code: SecretBox::init_with(|| r.verification_code.unwrap_or_default()),
+            code: Secret::new(r.verification_code.unwrap_or_default()),
             created_at: r.verification_code_created_at.unwrap_or_else(Utc::now),
             expires_at: r.verification_code_expires_at.unwrap_or_else(Utc::now),
             verified: r.is_verified,

rook/src/domain/email_verification.rs

@@ -1,20 +1,20 @@
 use crate::domain::SubscriberEmail;
 use reqwest::Client;
-use secrecy::{ExposeSecret, SecretBox};
+use secrecy::{ExposeSecret, Secret};
 use std::time::Duration;
 
 pub struct EmailClient {
     http_client: Client,
     base_url: String,
     sender: SubscriberEmail,
-    authorization_token: SecretBox<String>,
+    authorization_token: Secret<String>,
 }
 
 impl EmailClient {
     pub fn new(
         base_url: String,
         sender: SubscriberEmail,
-        authorization_token: SecretBox<String>,
+        authorization_token: Secret<String>,
         timeout: Duration,
     ) -> Self {
         let http_client = Client::builder().timeout(timeout).build().unwrap();
@@ -130,15 +130,13 @@ mod tests {
     #[tokio::test]
     async fn send_email_sends_the_expected_request() {
         // Arrange
-        // TODO mock server 세팅과 email_client 생성 메서드 추출해서 테스트 코드 간결하게 만들기
         let mock_server = MockServer::start().await;
         let sender = SubscriberEmail::new("sender@example.com").unwrap();
         let recipient = SubscriberEmail::new("recipient@example.com").unwrap();
-        let auth_token = SecretBox::init_with(|| "test-token".to_string());
         let email_client = EmailClient::new(
             mock_server.uri(),
             sender,
-            auth_token,
+            Secret::new("test-token".to_string()),
             Duration::from_secs(10),
         );
 
@@ -180,7 +178,7 @@ mod tests {
         let email_client = EmailClient::new(
             mock_server.uri(),
             sender,
-            SecretBox::init_with(|| "test-token".to_string()),
+            Secret::new("test-token".to_string()),
             Duration::from_secs(10),
         );
 
@@ -214,7 +212,7 @@ mod tests {
         let email_client = EmailClient::new(
             mock_server.uri(),
             sender,
-            SecretBox::init_with(|| "test-token".to_string()),
+            Secret::new("test-token".to_string()),
             Duration::from_secs(10),
         );
 
@@ -246,7 +244,7 @@ mod tests {
         let email_client = EmailClient::new(
             mock_server.uri(),
             sender,
-            SecretBox::init_with(|| "test-token".to_string()),
+            Secret::new("test-token".to_string()),
             Duration::from_secs(10),
         );
 
@@ -285,7 +283,7 @@ mod tests {
         let email_client = EmailClient::new(
             mock_server.uri(),
             sender,
-            SecretBox::init_with(|| "test-token".to_string()),
+            Secret::new("test-token".to_string()),
             Duration::from_secs(10),
         );
 

rook/src/email_client.rs

@@ -16,7 +16,6 @@ use axum::{
     routing::{delete, get, post},
 };
 use chrono::{FixedOffset, Utc};
-use secrecy::{ExposeSecret, SecretBox};
 use sqlx::PgPool;
 use std::{fmt, sync::Arc, time::Duration};
 use tower_http::cors::CorsLayer;
@@ -150,13 +149,7 @@ async fn main(#[shuttle_shared_db::Postgres] pool: PgPool) -> shuttle_axum::Shut
     let email_client = EmailClient::new(
         configuration.email_client.base_url.clone(),
         sender,
-        SecretBox::init_with(|| {
-            configuration
-                .email_client
-                .authorization_token
-                .expose_secret()
-                .clone()
-        }),
+        configuration.email_client.authorization_token.clone(),
         configuration.email_client.timeout(),
     );