Make utils as an independent workspace.Also Refactor code and update …

…version to v0.1.3
bloodnighttw · Jul 12, 2024 · adaff60 · adaff60
1 parent 347dfe0
commit adaff60
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 175 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,7 @@
 [workspace]
 members=[
   "reginleif",
+  "reginleif-utils",
   "reginleif-macro"
 ]
 resolver = "2"

diff --git a/reginleif-macro/Cargo.toml b/reginleif-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reginleif-macro"
-version = "0.1.0"
+version = "0.1.3"
 edition = "2021"
 license = "Apache-2.0"
 description = "A macro for generating the Reginleif trait implementation"

diff --git a/reginleif-macro/src/lib.rs b/reginleif-macro/src/lib.rs
@@ -16,7 +16,7 @@ fn impl_expire(ast:ItemStruct) -> TokenStream{
     let ident2 = duration_filed.ident.clone().unwrap();
 
     let token = quote::quote! {
-        impl crate::utils::expiring_data::Expirable for #ident{
+        impl reginleif_utils::expiring_data::Expirable for #ident{
             fn get_duration(&self) -> std::time::Duration {
                 self.#ident2
             }
@@ -40,7 +40,7 @@ pub fn refresh_panic(item:TokenStream) -> TokenStream{
     let ident = ast.ident;
     let token = quote::quote! {
         #[async_trait::async_trait]
-        impl crate::utils::expiring_data::Refreshable for #ident{
+        impl reginleif_utils::expiring_data::Refreshable for #ident{
 
             type Args = ();
 

diff --git a/reginleif/src/utils/expiring_data.rs → reginleif-utils/src/expiring_data.rs b/reginleif/src/utils/expiring_data.rs → reginleif-utils/src/expiring_data.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 use chrono::Local;
 use serde::{Deserialize, Serialize};
-use crate::utils::serde_convert::{local_to_string, string_to_local};
+use crate::serde_convert::{local_to_string, string_to_local};
 use anyhow::Result;
 use async_trait::async_trait;
 
@@ -159,7 +159,7 @@ impl<T> From<T> for ExpiringData<T> where T:Expirable + Refreshable{
 mod test{
     use std::time::Duration;
     use reginleif_macro::{Expirable, NoRefresh};
-    use crate::utils::expiring_data::{ExpiringData, Refreshable};
+    use crate::expiring_data::{ExpiringData, Refreshable};
 
     #[derive(Expirable,NoRefresh,Default)]
     struct TestStruct1{

diff --git a/reginleif/src/utils/serde_convert.rs → reginleif-utils/src/serde_convert.rs b/reginleif/src/utils/serde_convert.rs → reginleif-utils/src/serde_convert.rs
diff --git a/reginleif/Cargo.toml b/reginleif/Cargo.toml
@@ -12,11 +12,11 @@ repository = "https://github.com/bloodnighttw/reginleif"
 [dependencies]
 chrono = "0.4.38"
 serde = { version = "1.0.204", features = ["derive"] }
-serde_with = "3.8.3"
 serde_json = "1.0.120"
 anyhow = "1.0.86"
 tokio = {  version = "1.38.0", features = ["full"] }
-reginleif-macro = {path = "../reginleif-macro", version = "0.1.0"}
+reginleif-utils = {path = "../reginleif-utils", version = "0.1.3"}
+reginleif-macro = {path = "../reginleif-macro", version = "0.1.3"}
 async-trait = "0.1.81"
 reqwest = { version = "0.12.5", features = ["json"] }
 thiserror = "1.0.61"
diff --git a/reginleif/src/auth.rs b/reginleif/src/auth.rs
@@ -15,7 +15,7 @@ mod test{
     use crate::auth::microsoft::{DeviceCode, MicrosoftAuthError};
     use crate::auth::minecraft::{MinecraftAuth, Profile};
     use crate::auth::xbox::{XboxLiveToken, XboxSecurityToken};
-    use crate::utils::expiring_data::ExpiringData;
+    use reginleif_utils::expiring_data::ExpiringData;
 
     #[tokio::test]
     #[ignore]

diff --git a/reginleif/src/auth/account.rs b/reginleif/src/auth/account.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 use crate::auth::microsoft::MicrosoftAuth;
 use crate::auth::minecraft::{MinecraftAuth, Profile};
 use crate::auth::xbox::{XboxLiveToken, XboxSecurityToken};
-use crate::utils::expiring_data::{Expirable, ExpiringData, Refreshable};
+use reginleif_utils::expiring_data::{Expirable, ExpiringData, Refreshable};
 
 
 /// Account

diff --git a/reginleif/src/auth/microsoft.rs b/reginleif/src/auth/microsoft.rs
@@ -5,10 +5,10 @@ use reqwest::Client;
 use reqwest::header::CONTENT_TYPE;
 use serde_json::Value;
 use reginleif_macro::{Expirable, NoRefresh};
-use crate::utils::serde_convert::{duration_to_sec, sec_to_duration};
+use reginleif_utils::serde_convert::{duration_to_sec, sec_to_duration};
 use thiserror::Error;
 use crate::auth::constant::{DEVICECODE_URL, GRANT_TYPE, REFRESH_GRANT_TYPE, SCOPE, TOKEN_URL};
-use crate::utils::expiring_data::{ExpiringData, Refreshable};
+use reginleif_utils::expiring_data::{ExpiringData, Refreshable};
 
 /// The struct contain all the information that oauth2 device code auth flow need.
 /// 

diff --git a/reginleif/src/auth/minecraft.rs b/reginleif/src/auth/minecraft.rs
@@ -5,7 +5,7 @@ use serde_json::json;
 use reginleif_macro::{Expirable, NoRefresh};
 use crate::auth::constant::{MINECRAFT_LOGIN_WITH_XBOX, MINECRAFT_PROFILE};
 use crate::auth::xbox::XboxSecurityToken;
-use crate::utils::serde_convert::{duration_to_sec, sec_to_duration};
+use reginleif_utils::serde_convert::{duration_to_sec, sec_to_duration};
 
 /// Minecraft Auth
 ///