bump: textsender_models

Cargo.lock

@@ -1656,7 +1656,7 @@ dependencies = [
 
 [[package]]
 name = "textsender_models"
-version = "0.4.3"
+version = "0.4.10"
 dependencies = [
  "const_format",
  "dotenvy",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "textsender_models"
-version = "0.4.3"
+version = "0.4.10"
 edition = "2024"
 rust-version = "1.96"
 description = "Models used for the textsender project"

src/config/auxiliary/mod.rs

@@ -19,3 +19,26 @@ impl TwilioConfig {
         println!("Number: {:?}", self.phone_number);
     }
 }
+
+// TODO: Remove the async at a later point
+pub async fn load_config() -> Result<TwilioConfig, std::io::Error> {
+    let auth_sid_var = crate::envy::environment::get_env("TWILIO_AUTH_SID").await;
+    let service_sid_var = crate::envy::environment::get_env("TWILIO_SERVICE_SID").await;
+    let auth_token_var = crate::envy::environment::get_env("TWILIO_AUTH_TOKEN").await;
+    let phone_number_var = crate::envy::environment::get_env("TWILIO_PHONE_NUMBER").await;
+
+    if auth_sid_var.value.is_empty()
+        || service_sid_var.value.is_empty()
+        || auth_token_var.value.is_empty()
+        || phone_number_var.value.is_empty()
+    {
+        Err(std::io::Error::other("Config not set"))
+    } else {
+        Ok(TwilioConfig {
+            service_sid: service_sid_var.value,
+            auth_token: auth_token_var.value,
+            account_sid: auth_sid_var.value,
+            phone_number: phone_number_var.value,
+        })
+    }
+}

src/envy/environment.rs

@@ -1,3 +1,5 @@
+// TODO: Functions does not need to be async
+
 pub async fn get_db_url() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::DB_URL;

src/token/mod.rs

@@ -70,11 +70,17 @@ pub struct TokenResource {
 /// Token type
 pub const TOKEN_TYPE: &str = "JWT";
 
+pub struct CreateTokenResult {
+    pub access_token: String,
+    pub issued: i64,
+    pub expires_in: i64,
+}
+
 pub fn create_token(
     key: &String,
     token_resource: &TokenResource,
     duration: time::Duration,
-) -> Result<(String, i64), josekit::JoseError> {
+) -> Result<CreateTokenResult, josekit::JoseError> {
     let mut header = josekit::jws::JwsHeader::new();
     header.set_token_type(TOKEN_TYPE);
 
@@ -102,10 +108,12 @@ pub fn create_token(
             let signer = josekit::jws::alg::hmac::HmacJwsAlgorithm::Hs256
                 .signer_from_bytes(key.as_bytes())
                 .unwrap();
-            Ok((
-                josekit::jwt::encode_with_signer(&payload, &header, &signer).unwrap(),
-                (expire - time::OffsetDateTime::UNIX_EPOCH).whole_seconds(),
-            ))
+
+            Ok(CreateTokenResult {
+                access_token: josekit::jwt::encode_with_signer(&payload, &header, &signer).unwrap(),
+                issued: (expire - time::OffsetDateTime::UNIX_EPOCH).whole_seconds(),
+                expires_in: (issued - time::OffsetDateTime::UNIX_EPOCH).whole_seconds(),
+            })
         }
         Err(e) => Err(josekit::JoseError::InvalidClaim(e.into())),
     }