tsk-71: Add token expiration checks (#78)

Closes #71

Reviewed-on: #78
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

.gitea/workflows/tag_release.yaml

@@ -1,23 +1,24 @@
 name: Release Tagging
 
 on:
-  pull_request:
+  push:
     branches:
       - main
+      - next-v0.8
 
 jobs:
   release:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0 # Important for git describe --tags
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.88.0
+          toolchain: 1.90.0
           components: cargo
 
       - name: Extract Version from Cargo.toml
@@ -25,12 +26,15 @@ jobs:
         run: |
           VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/')
           PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
-          BRANCH_REF="${GITHUB_REF}"
+          BRANCH_REF="${{ gitea.ref }}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
-          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
+          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111"
-          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-111"
+
+          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE"
+
           echo "Version: $VERSION"
           echo "Hash: $PROJECT_COMMIT_HASH"
+          echo "Branh ref: $BRANCH_REF"
           echo "Branch: $BRANCH_NAME"
           echo "Tag Release: $PROJECT_TAG_RELEASE"
 

.gitea/workflows/workflow.yaml

@@ -7,36 +7,37 @@ on:
   pull_request:
     branches:
       - main 
+      - next-v0.8
 
 jobs:
   check:
     name: Check
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.88.0
+          toolchain: 1.90.0
       - run: cargo check
 
   test:
     name: Test Suite
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.88.0
+          toolchain: 1.90.0
       - run: cargo test
 
   fmt:
     name: Rustfmt
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.88.0
+          toolchain: 1.90.0
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
 
@@ -44,10 +45,10 @@ jobs:
     name: Clippy
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.88.0
+          toolchain: 1.90.0
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings
 
@@ -55,10 +56,10 @@ jobs:
     name: build
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.88.0
+          toolchain: 1.90.0
       - run: cargo build
 
 

Cargo.lock

@@ -149,7 +149,7 @@ checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 
 [[package]]
 name = "icarus_models"
-version = "0.6.7"
+version = "0.7.3"
 dependencies = [
  "josekit",
  "rand",

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "icarus_models"
-version = "0.6.7"
+version = "0.7.3"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.90"
 description = "models used for the icarus project"
 license = "MIT"
 

src/coverart.rs

@@ -7,22 +7,22 @@ pub struct CoverArt {
     pub id: uuid::Uuid,
     pub title: String,
     #[serde(skip)]
-    pub path: String,
+    pub directory: String,
+    pub filename: String,
     #[serde(skip)]
     pub data: Vec<u8>,
     pub song_id: uuid::Uuid,
 }
 
 pub mod init {
-    use crate::coverart::CoverArt;
+    use super::CoverArt;
 
-    pub fn init_coverart_only_path(path: String) -> CoverArt {
+    /// Initializes the CoverArt with just the directory and filename
+    pub fn init_coverart_dir_and_filename(directory: &str, filename: &str) -> CoverArt {
         CoverArt {
-            id: uuid::Uuid::nil(),
+            directory: String::from(directory),
-            title: String::new(),
+            filename: String::from(filename),
-            path: path.clone(),
+            ..Default::default()
-            data: Vec::new(),
-            song_id: uuid::Uuid::nil(),
         }
     }
 }
@@ -30,18 +30,23 @@ pub mod init {
 impl CoverArt {
     /// Saves the coverart to the filesystem
     pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
-        match std::fs::File::create(&self.path) {
+        match self.get_path() {
+            Ok(path) => match std::fs::File::create(&path) {
                 Ok(mut file) => match file.write_all(&self.data) {
                     Ok(_) => Ok(()),
                     Err(err) => Err(err),
                 },
                 Err(err) => Err(err),
+            },
+            Err(err) => Err(err),
         }
     }
 
     /// Removes the coverart from the filesystem
     pub fn remove_from_filesystem(&self) -> Result<(), std::io::Error> {
-        let p = std::path::Path::new(&self.path);
+        match self.get_path() {
+            Ok(path) => {
+                let p = std::path::Path::new(&path);
                 if p.exists() {
                     match std::fs::remove_file(p) {
                         Ok(_) => Ok(()),
@@ -53,6 +58,35 @@ impl CoverArt {
                     ))
                 }
             }
+            Err(err) => Err(err),
+        }
+    }
+
+    /// Gets the path of the CoverArt
+    pub fn get_path(&self) -> Result<String, std::io::Error> {
+        if self.directory.is_empty() {
+            return Err(std::io::Error::other("Directory has not been initialized"));
+        } else if self.filename.is_empty() {
+            return Err(std::io::Error::other("Filename has not bee initialized"));
+        }
+
+        let directory = &self.directory;
+        let last_index = directory.len() - 1;
+
+        if let Some(character) = directory.chars().nth(last_index) {
+            let buffer = if character != '/' {
+                directory.clone() + "/"
+            } else {
+                directory.clone()
+            };
+
+            Ok(buffer + &self.filename.clone())
+        } else {
+            Err(std::io::Error::other(
+                "Could not access last character of directory",
+            ))
+        }
+    }
 }
 
 pub mod io {
@@ -60,7 +94,8 @@ pub mod io {
 
     /// Gets the raw data of the cover art
     pub fn to_data(coverart: &super::CoverArt) -> Result<Vec<u8>, std::io::Error> {
-        let path: &String = &coverart.path;
+        match coverart.get_path() {
+            Ok(path) => {
                 let mut file = std::fs::File::open(path)?;
                 let mut buffer = Vec::new();
                 match file.read_to_end(&mut buffer) {
@@ -68,6 +103,9 @@ pub mod io {
                     Err(err) => Err(err),
                 }
             }
+            Err(err) => Err(err),
+        }
+    }
 }
 
 #[cfg(test)]
@@ -76,9 +114,11 @@ mod tests {
 
     #[test]
     fn test_cover_art_image() {
-        let path: String = String::from("somepath");
+        let dir = String::from("./");
-        let coverart = coverart::init::init_coverart_only_path(path.clone());
+        let filename = String::from("CoverArt.png");
+        let coverart = coverart::init::init_coverart_dir_and_filename(&dir, &filename);
 
-        assert_eq!(path, coverart.path);
+        assert_eq!(dir, coverart.directory);
+        assert_eq!(filename, coverart.filename);
     }
 }

src/login_result.rs

@@ -2,7 +2,7 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct LoginResult {
     pub id: uuid::Uuid,
     pub username: String,
@@ -12,20 +12,14 @@ pub struct LoginResult {
     pub expiration: i64,
 }
 
-impl Default for LoginResult {
-    fn default() -> Self {
-        LoginResult {
-            id: uuid::Uuid::nil(),
-            username: String::new(),
-            token: String::new(),
-            token_type: String::new(),
-            expiration: -1,
-        }
-    }
-}
-
 impl LoginResult {
-    pub fn _to_json(&self) -> Result<String, serde_json::Error> {
+    pub fn to_json(&self) -> Result<String, serde_json::Error> {
         serde_json::to_string_pretty(&self)
     }
+
+    pub fn token_expired(&self) -> bool {
+        let current_time = time::OffsetDateTime::now_utc();
+        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
+        current_time > expired
+    }
 }

src/song.rs

@@ -39,8 +39,8 @@ pub struct Song {
     pub track_count: i32,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub audio_type: String,
-    #[serde(skip_serializing_if = "String::is_empty")]
+    #[serde(with = "time::serde::rfc3339::option")]
-    pub date_created: String,
+    pub date_created: Option<time::OffsetDateTime>,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub filename: String,
     #[serde(skip_serializing_if = "init::is_uuid_nil")]
@@ -71,21 +71,22 @@ impl Song {
 
     pub fn song_path(&self) -> Result<String, std::io::Error> {
         if self.directory.is_empty() {
-            return Err(std::io::Error::other("Directory does not exist"));
+            return Err(std::io::Error::other("Directory has not been initialized"));
+        } else if self.filename.is_empty() {
+            return Err(std::io::Error::other("Filename has not bee initialized"));
         }
 
         let directory = &self.directory;
-        let mut buffer: String = directory.clone();
         let last_index = directory.len() - 1;
 
         if let Some(character) = directory.chars().nth(last_index) {
-            if character != '/' {
+            let buffer: String = if character != '/' {
-                buffer += "/";
+                directory.clone() + "/"
-            }
+            } else {
+                directory.clone()
+            };
 
-            buffer += &self.filename.clone();
+            Ok(buffer + &self.filename.clone())
-
-            Ok(buffer)
         } else {
             Err(std::io::Error::other(
                 "Could not access last character of directory",

src/token.rs

@@ -2,7 +2,7 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Token {
     pub scope: String,
     pub expiration: i64,
@@ -27,23 +27,16 @@ pub struct AccessToken {
     pub message: String,
 }
 
-impl Default for Token {
+impl AccessToken {
-    fn default() -> Self {
+    /// Get the token fit for Bearer authentication
-        Token {
+    pub fn bearer_token(&self) -> String {
-            scope: String::new(),
+        format!("Bearer {}", self.token)
-            expiration: -1,
-            audience: String::new(),
-            issuer: String::new(),
-            issued: -1,
-        }
-    }
     }
 
-impl AccessToken {
+    pub fn token_expired(&self) -> bool {
-    pub fn bearer_token(&self) -> String {
+        let current_time = time::OffsetDateTime::now_utc();
-        let mut token: String = String::from("Bearer ");
+        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
-        token += &self.token.clone();
+        current_time > expired
-        token
     }
 }
 
@@ -52,9 +45,10 @@ impl Token {
         serde_json::to_string_pretty(&self)
     }
 
-    // TODO: Implement
     pub fn token_expired(&self) -> bool {
-        false
+        let current_time = time::OffsetDateTime::now_utc();
+        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
+        current_time > expired
     }
 
     pub fn contains_scope(&self, des_scope: &String) -> bool {