Compare commits

..

5 Commits

Author SHA1 Message Date
phoenix 19b785e010 tsk-73: Workflow fix 2025-10-18 21:17:36 -04:00
phoenix 3437ee7c5b tsk-73: Updated tag release workflow 2025-10-18 21:12:29 -04:00
phoenix bd26afdddf Version bump 2025-10-18 21:02:13 -04:00
phoenix 580f5e9be7 tsk-73: Code cleanup:
:
2025-10-18 21:00:38 -04:00
phoenix 3ee3ac737b tsk-73: Change type of date_created to an option of time::OffsetDateTime 2025-10-18 20:57:21 -04:00
5 changed files with 38 additions and 26 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
name: Release Tagging
on:
push:
pull_request:
branches:
- main
- next-v0.8
@@ -26,7 +26,7 @@ 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="${{ gitea.ref }}"
BRANCH_REF="${GITHUB_REF}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111"
Generated
+1 -1
View File
@@ -149,7 +149,7 @@ checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
[[package]]
name = "icarus_models"
version = "0.7.3"
version = "0.7.2"
dependencies = [
"josekit",
"rand",
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "icarus_models"
version = "0.7.3"
version = "0.7.2"
edition = "2024"
rust-version = "1.90"
description = "models used for the icarus project"
+16 -10
View File
@@ -2,7 +2,7 @@ use std::default::Default;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
#[derive(Clone, Debug, Deserialize, Serialize, utoipa::ToSchema)]
pub struct LoginResult {
pub id: uuid::Uuid,
pub username: String,
@@ -12,14 +12,20 @@ pub struct LoginResult {
pub expiration: i64,
}
impl LoginResult {
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
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> {
serde_json::to_string_pretty(&self)
}
}
+18 -12
View File
@@ -2,7 +2,7 @@ use std::default::Default;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Token {
pub scope: String,
pub expiration: i64,
@@ -27,16 +27,23 @@ pub struct AccessToken {
pub message: String,
}
impl AccessToken {
/// Get the token fit for Bearer authentication
pub fn bearer_token(&self) -> String {
format!("Bearer {}", self.token)
impl Default for Token {
fn default() -> Self {
Token {
scope: String::new(),
expiration: -1,
audience: String::new(),
issuer: String::new(),
issued: -1,
}
}
}
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
impl AccessToken {
pub fn bearer_token(&self) -> String {
let mut token: String = String::from("Bearer ");
token += &self.token.clone();
token
}
}
@@ -45,10 +52,9 @@ impl Token {
serde_json::to_string_pretty(&self)
}
// TODO: Implement
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
false
}
pub fn contains_scope(&self, des_scope: &String) -> bool {