Compare commits
7 Commits
25d2e38133
...
v0.7.2--0e
| Author | SHA1 | Date | |
|---|---|---|---|
|
0edda1a23f
|
|||
|
933c9b7f34
|
|||
|
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
|
||||||
@@ -27,7 +27,8 @@ 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_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
|
BRANCH_REF_NAME=${{ gitea.ref_name }}
|
||||||
|
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"
|
||||||
@@ -35,6 +36,7 @@ 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"
|
||||||
|
|
||||||
|
|||||||
16
src/token.rs
16
src/token.rs
@@ -40,15 +40,10 @@ impl Default for Token {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl AccessToken {
|
impl AccessToken {
|
||||||
/// Get the token fit for Bearer authentication
|
|
||||||
pub fn bearer_token(&self) -> String {
|
pub fn bearer_token(&self) -> String {
|
||||||
format!("Bearer {}", self.token)
|
let mut token: String = String::from("Bearer ");
|
||||||
}
|
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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,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