tsk-90: Version bump

Closes #85

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

.gitea/workflows/tag_release.yaml

@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   release:

Cargo.lock

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

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icarus_models"
-version = "0.9.0"
+version = "0.9.2"
 edition = "2024"
 rust-version = "1.90"
 description = "models used for the icarus project"

src/coverart.rs

@@ -11,6 +11,7 @@ pub struct CoverArt {
     #[serde(skip)]
     pub directory: String,
     pub filename: String,
+    pub file_type: String,
     #[serde(skip)]
     pub data: Vec<u8>,
     pub song_id: uuid::Uuid,
@@ -86,20 +87,20 @@ impl CoverArt {
 
 /// Generates filename for a CoverArt
 pub fn generate_filename(
-    typ: crate::types::CoverArtTypes,
+    typ: crate::types::CoverArtType,
     randomize: bool,
 ) -> Result<String, std::io::Error> {
     let file_extension = match typ {
-        crate::types::CoverArtTypes::PngExtension => {
+        crate::types::CoverArtType::PngExtension => {
             String::from(crate::constants::file_extensions::image::PNGEXTENSION)
         }
-        crate::types::CoverArtTypes::JpegExtension => {
+        crate::types::CoverArtType::JpegExtension => {
             String::from(crate::constants::file_extensions::image::JPEGEXTENSION)
         }
-        crate::types::CoverArtTypes::JpgExtension => {
+        crate::types::CoverArtType::JpgExtension => {
             String::from(crate::constants::file_extensions::image::JPGEXTENSION)
         }
-        crate::types::CoverArtTypes::None => {
+        crate::types::CoverArtType::None => {
             return Err(std::io::Error::other("Unsupported CoverArtTypes"));
         }
     };

src/song.rs

@@ -126,24 +126,21 @@ impl Song {
 }
 
 /// Generates a filename. In order to save a song to the filesystem
-pub fn generate_filename(
+pub fn generate_filename(typ: types::MusicType, randomize: bool) -> Result<String, std::io::Error> {
-    typ: types::MusicTypes,
-    randomize: bool,
-) -> Result<String, std::io::Error> {
     let file_extension = match typ {
-        types::MusicTypes::DefaultMusicExtension => {
+        types::MusicType::DefaultMusicExtension => {
             String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION)
         }
-        types::MusicTypes::WavExtension => {
+        types::MusicType::WavExtension => {
             String::from(constants::file_extensions::audio::WAVEXTENSION)
         }
-        types::MusicTypes::FlacExtension => {
+        types::MusicType::FlacExtension => {
             String::from(constants::file_extensions::audio::FLACEXTENSION)
         }
-        types::MusicTypes::MPThreeExtension => {
+        types::MusicType::MPThreeExtension => {
             String::from(constants::file_extensions::audio::MPTHREEEXTENSION)
         }
-        types::MusicTypes::None => return Err(std::io::Error::other("Unsupported MusicTypes")),
+        types::MusicType::None => return Err(std::io::Error::other("Unsupported MusicTypes")),
     };
 
     let filename: String = if randomize {

src/token.rs

@@ -1,8 +1,8 @@
 use std::default::Default;
 
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, serde::Serialize)]
 pub struct Token {
     pub scope: String,
     pub expiration: i64,
@@ -11,7 +11,7 @@ pub struct Token {
     pub issued: i64,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, serde::Serialize)]
 pub struct AccessToken {
     #[serde(alias = "init::is_uuid_nil")]
     pub user_id: uuid::Uuid,
@@ -27,6 +27,21 @@ pub struct AccessToken {
     pub message: String,
 }
 
+#[derive(Clone, Debug, serde::Serialize, Deserialize)]
+pub struct UserClaims {
+    pub iss: String,
+    pub aud: String, // Audience
+    pub sub: String, // Subject (user ID)
+    #[serde(deserialize_with = "deserialize_i64_from_f64")]
+    pub exp: i64, // Expiration time (UTC timestamp)
+    #[serde(deserialize_with = "deserialize_i64_from_f64")]
+    pub iat: i64, // Issued at (UTC timestamp)
+    // pub azp: String,
+    // pub gty: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub roles: Option<Vec<String>>, // Optional roles
+}
+
 impl AccessToken {
     /// Get the token fit for Bearer authentication
     pub fn bearer_token(&self) -> String {
@@ -56,6 +71,25 @@ impl Token {
     }
 }
 
+fn deserialize_i64_from_f64<'de, D>(deserializer: D) -> Result<i64, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let val = f64::deserialize(deserializer)?;
+    // Handle NaN and infinity cases
+    if val.is_nan() || val.is_infinite() {
+        return Err(serde::de::Error::custom("invalid float value"));
+    }
+    // Round to nearest integer and convert
+    let rounded = val.round();
+    // Check if the rounded value can fit in i64
+    if rounded < (i64::MIN as f64) || rounded > (i64::MAX as f64) {
+        Err(serde::de::Error::custom("float out of i64 range"))
+    } else {
+        Ok(rounded as i64)
+    }
+}
+
 pub fn get_issued() -> time::Result<time::OffsetDateTime> {
     Ok(time::OffsetDateTime::now_utc())
 }

tests/tests.rs

@@ -107,7 +107,7 @@ mod song_tests {
         };
 
         assert_eq!(song.directory.is_empty(), false);
-        match song::generate_filename(types::MusicTypes::FlacExtension, true) {
+        match song::generate_filename(types::MusicType::FlacExtension, true) {
             Ok(filename) => {
                 song_cpy.filename = filename;
             }