src/token_stuff/mod.rs

@@ -19,21 +19,15 @@ pub fn get_key() -> Result<String, dotenvy::Error> {
 }
 
 pub fn get_issued() -> time::Result<time::OffsetDateTime> {
-    let now = time::OffsetDateTime::now_utc();
+    Ok(time::OffsetDateTime::now_utc())
-    // let epoch = time::OffsetDateTime::UNIX_EPOCH;
-    // let since_the_epoch = now - epoch;
-    // Ok(since_the_epoch)
-    Ok(now)
 }
 
 pub fn get_expiration(issued: &time::OffsetDateTime) -> Result<time::OffsetDateTime, time::Error> {
     let duration_expire = time::Duration::hours(4);
-    let expiration = *issued + duration_expire;
+    Ok(*issued + duration_expire)
-    Ok(expiration)
 }
 
 mod util {
-    // use std::time;
     pub fn time_to_std_time(
         provided_time: &time::OffsetDateTime,
     ) -> Result<std::time::SystemTime, std::time::SystemTimeError> {
@@ -52,15 +46,7 @@ pub fn create_token(provided_key: &String) -> Result<(String, i64), josekit::Jos
     payload.set_audience(vec![AUDIENCE]);
     match get_issued() {
         Ok(issued) => {
-            /*
-            let expire = duration.whole_seconds();
-            let _ = payload.set_claim(
-                "issued",
-                Some(serde_json::to_value(expire.to_string()).unwrap()),
-            );
-            */
             let expire = get_expiration(&issued).unwrap();
-            // payload.set_issued_at(std::time::Duration::try_from(duration).unwrap());
             payload.set_issued_at(&util::time_to_std_time(&issued).unwrap());
             payload.set_expires_at(&util::time_to_std_time(&expire).unwrap());
 
@@ -70,12 +56,10 @@ pub fn create_token(provided_key: &String) -> Result<(String, i64), josekit::Jos
                 provided_key.to_owned()
             };
 
-            let duration = expire - time::OffsetDateTime::UNIX_EPOCH;
-
             let signer = Hs256.signer_from_bytes(key.as_bytes()).unwrap();
             Ok((
                 josekit::jwt::encode_with_signer(&payload, &header, &signer).unwrap(),
-                duration.whole_seconds(),
+                (expire - time::OffsetDateTime::UNIX_EPOCH).whole_seconds(),
             ))
         }
         Err(e) => Err(josekit::JoseError::InvalidClaim(e.into())),