Compare commits

...

4 Commits

Author SHA1 Message Date
2f36ba30f5 tsk-71: Version bump
Some checks failed
Rust Build / Clippy (pull_request) Successful in 40s
Rust Build / build (pull_request) Successful in 36s
Rust Build / Check (pull_request) Successful in 58s
Rust Build / Rustfmt (pull_request) Failing after 52s
Rust Build / Test Suite (pull_request) Successful in 36s
2025-10-18 22:08:07 -04:00
56205fc0d5 tsk-71: Removed underscore from method 2025-10-18 22:07:52 -04:00
380d28a86e tsk-71: Removed default function 2025-10-18 22:06:38 -04:00
7f4adbdb9d tsk-71: Added expiration check in LoginResult 2025-10-18 22:05:54 -04:00
3 changed files with 10 additions and 15 deletions

2
Cargo.lock generated
View File

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

View File

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

View File

@@ -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,15 @@ 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
}
}