Compare commits
5 Commits
next-v0.8
...
v0.7.2-77-
Author | SHA1 | Date | |
---|---|---|---|
19b785e010
|
|||
3437ee7c5b
|
|||
bd26afdddf
|
|||
580f5e9be7
|
|||
3ee3ac737b
|
@@ -1,7 +1,7 @@
|
|||||||
name: Release Tagging
|
name: Release Tagging
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- next-v0.8
|
- next-v0.8
|
||||||
@@ -26,7 +26,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
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="${GITHUB_REF}"
|
||||||
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
|
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
|
||||||
PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111"
|
PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111"
|
||||||
|
|
||||||
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -149,7 +149,7 @@ checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "icarus_models"
|
name = "icarus_models"
|
||||||
version = "0.7.3"
|
version = "0.7.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"josekit",
|
"josekit",
|
||||||
"rand",
|
"rand",
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "icarus_models"
|
name = "icarus_models"
|
||||||
version = "0.7.3"
|
version = "0.7.2"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
rust-version = "1.90"
|
rust-version = "1.90"
|
||||||
description = "models used for the icarus project"
|
description = "models used for the icarus project"
|
||||||
|
@@ -2,7 +2,7 @@ use std::default::Default;
|
|||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
|
#[derive(Clone, Debug, Deserialize, Serialize, utoipa::ToSchema)]
|
||||||
pub struct LoginResult {
|
pub struct LoginResult {
|
||||||
pub id: uuid::Uuid,
|
pub id: uuid::Uuid,
|
||||||
pub username: String,
|
pub username: String,
|
||||||
@@ -12,14 +12,20 @@ pub struct LoginResult {
|
|||||||
pub expiration: i64,
|
pub expiration: i64,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl LoginResult {
|
impl Default for LoginResult {
|
||||||
pub fn to_json(&self) -> Result<String, serde_json::Error> {
|
fn default() -> Self {
|
||||||
serde_json::to_string_pretty(&self)
|
LoginResult {
|
||||||
}
|
id: uuid::Uuid::nil(),
|
||||||
|
username: String::new(),
|
||||||
pub fn token_expired(&self) -> bool {
|
token: String::new(),
|
||||||
let current_time = time::OffsetDateTime::now_utc();
|
token_type: String::new(),
|
||||||
let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
|
expiration: -1,
|
||||||
current_time > expired
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LoginResult {
|
||||||
|
pub fn _to_json(&self) -> Result<String, serde_json::Error> {
|
||||||
|
serde_json::to_string_pretty(&self)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
30
src/token.rs
30
src/token.rs
@@ -2,7 +2,7 @@ use std::default::Default;
|
|||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
||||||
pub struct Token {
|
pub struct Token {
|
||||||
pub scope: String,
|
pub scope: String,
|
||||||
pub expiration: i64,
|
pub expiration: i64,
|
||||||
@@ -27,16 +27,23 @@ pub struct AccessToken {
|
|||||||
pub message: String,
|
pub message: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AccessToken {
|
impl Default for Token {
|
||||||
/// Get the token fit for Bearer authentication
|
fn default() -> Self {
|
||||||
pub fn bearer_token(&self) -> String {
|
Token {
|
||||||
format!("Bearer {}", self.token)
|
scope: String::new(),
|
||||||
|
expiration: -1,
|
||||||
|
audience: String::new(),
|
||||||
|
issuer: String::new(),
|
||||||
|
issued: -1,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn token_expired(&self) -> bool {
|
impl AccessToken {
|
||||||
let current_time = time::OffsetDateTime::now_utc();
|
pub fn bearer_token(&self) -> String {
|
||||||
let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
|
let mut token: String = String::from("Bearer ");
|
||||||
current_time > expired
|
token += &self.token.clone();
|
||||||
|
token
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,10 +52,9 @@ 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 {
|
||||||
let current_time = time::OffsetDateTime::now_utc();
|
false
|
||||||
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 {
|
||||||
|
Reference in New Issue
Block a user