Compare commits

..

5 Commits

Author SHA1 Message Date
194cd9e622 tsk-71: Removed function
All checks were successful
Rust Build / Rustfmt (pull_request) Successful in 41s
Rust Build / Test Suite (pull_request) Successful in 43s
Rust Build / Clippy (pull_request) Successful in 43s
Rust Build / build (pull_request) Successful in 42s
Rust Build / Check (pull_request) Successful in 51s
2025-10-18 22:02:32 -04:00
25d2e38133 tsk-71: Added methods for token expiration
All checks were successful
Rust Build / Test Suite (pull_request) Successful in 53s
Rust Build / Rustfmt (pull_request) Successful in 39s
Rust Build / Clippy (pull_request) Successful in 46s
Rust Build / build (pull_request) Successful in 38s
Rust Build / Check (pull_request) Successful in 38s
2025-10-18 21:56:24 -04:00
6851fdfdde tsk-71: Updated tag release triggering 2025-10-18 21:49:38 -04:00
79758b2631 tsk-71: Simplify bearer_token() method 2025-10-18 21:49:18 -04:00
51c8b5c7b3 tsk-73: Change data type of song from string to date (#77)
All checks were successful
Release Tagging / release (push) Successful in 42s
Release Tagging / release (pull_request) Successful in 1m4s
Rust Build / Check (pull_request) Successful in 34s
Rust Build / Clippy (pull_request) Successful in 31s
Rust Build / Test Suite (pull_request) Successful in 58s
Rust Build / Rustfmt (pull_request) Successful in 1m2s
Rust Build / build (pull_request) Successful in 35s
Closes #73

Reviewed-on: #77
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-10-19 01:45:35 +00:00
2 changed files with 14 additions and 22 deletions

View File

@@ -1,7 +1,7 @@
name: Release Tagging name: Release Tagging
on: on:
pull_request: push:
branches: branches:
- main - main
- next-v0.8 - next-v0.8
@@ -27,8 +27,7 @@ jobs:
VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/') VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/')
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10) PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
BRANCH_REF="${{ gitea.ref }}" BRANCH_REF="${{ gitea.ref }}"
BRANCH_REF_NAME="${{ gitea.ref_name }}" BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
BRANCH_NAME="${{ gitea.ref_type }}"
PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111" PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111"
echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE" echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE"
@@ -36,7 +35,6 @@ jobs:
echo "Version: $VERSION" echo "Version: $VERSION"
echo "Hash: $PROJECT_COMMIT_HASH" echo "Hash: $PROJECT_COMMIT_HASH"
echo "Branh ref: $BRANCH_REF" echo "Branh ref: $BRANCH_REF"
echo "Branh ref name: $BRANCH_REF_NAME"
echo "Branch: $BRANCH_NAME" echo "Branch: $BRANCH_NAME"
echo "Tag Release: $PROJECT_TAG_RELEASE" echo "Tag Release: $PROJECT_TAG_RELEASE"

View File

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