Skip to content

Commit

Permalink
move service out of core (#146)
Browse files Browse the repository at this point in the history
Because the service is not needed for core any longer, we can relocate
it, thus lightening the core crate a bit.
  • Loading branch information
maxcountryman committed Jan 22, 2024
1 parent 6359e76 commit e54ab80
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 31 deletions.
18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,16 @@ time = "0.3.30"
tokio = { version = "1.32.0", default-features = false, features = ["sync"] }

[dependencies]
tower-sessions-core = { workspace = true, features = ["axum-core"] }
async-trait = "0.1.73"
http = "1.0"
tokio = { version = "1.32.0", features = ["sync"] }
tower-layer = "0.3.2"
tower-service = "0.3.2"
tower-sessions-core = { workspace = true }
tower-sessions-memory-store = { workspace = true, optional = true }
tracing = { version = "0.1.40", features = ["log"] }
tower-cookies = "0.10.0"
time = { version = "0.3.29", features = ["serde"] }

[dev-dependencies]
async-trait = "0.1.74"
Expand All @@ -75,14 +83,6 @@ tokio-test = "0.4.3"
tower = "0.4.13"
tower-cookies = "0.10.0"
tower-sessions-core = { workspace = true, features = ["deletion-task"] }
tower-sessions-moka-store = "0.9.1"
tower-sessions-mongodb-store = "0.9.1"
tower-sessions-redis-store = "0.9.1"
tower-sessions-sqlx-store = { version = "0.9.2", features = [
"sqlite",
"postgres",
"mysql",
] }

[[example]]
name = "counter"
Expand Down
8 changes: 6 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -433,14 +433,18 @@
#![forbid(unsafe_code)]
#![cfg_attr(docsrs, feature(doc_cfg))]

pub use tower_sessions_core::{cookie, service, session, session_store};
pub use tower_cookies::cookie;
pub use tower_sessions_core::{session, session_store};
#[doc(inline)]
pub use tower_sessions_core::{
service::{SessionManager, SessionManagerLayer},
session::{Expiry, Session},
session_store::{CachingSessionStore, ExpiredDeletion, SessionStore},
};
#[cfg(feature = "memory-store")]
#[cfg_attr(docsrs, doc(cfg(feature = "memory-store")))]
#[doc(inline)]
pub use tower_sessions_memory_store::MemoryStore;

pub use crate::service::{SessionManager, SessionManagerLayer};

pub mod service;
File renamed without changes.
19 changes: 5 additions & 14 deletions tower-sessions-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ authors.workspace = true
repository.workspace = true

[features]
default = ["axum-core"]
default = []
axum-core = ["dep:axum-core"]
deletion-task = ["tokio/time"]

[dependencies]
async-trait = "0.1.73"
axum-core = { version = "0.4.0", optional = true }
async-trait = { workspace = true }
axum-core = { version = "0.4", optional = true }
base64 = "0.21.7"
futures = { version = "0.3.28", default-features = false, features = [
"async-await",
Expand All @@ -25,20 +25,11 @@ parking_lot = { version = "0.12.1", features = ["serde"] }
rand = "0.8.5"
serde = { version = "1.0.189", features = ["derive", "rc"] }
serde_json = "1.0.107"
thiserror = "1.0.49"
thiserror = { workspace = true }
time = { version = "0.3.29", features = ["serde"] }
tokio = { version = "1.32.0", features = ["sync"] }
tower-cookies = "0.10.0"
tower-layer = "0.3.2"
tower-service = "0.3.2"
tokio = { workspace = true }
tracing = { version = "0.1.40", features = ["log"] }

[dev-dependencies]
tower-sessions = { workspace = true }
tower-sessions-sqlx-store = { version = "0.9.2", features = [
"postgres",
"sqlite",
"mysql",
] }
tower-sessions-moka-store = { version = "0.9.1" }
tokio-test = "0.4.3"
4 changes: 0 additions & 4 deletions tower-sessions-core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
pub use tower_cookies::cookie;

#[doc(inline)]
pub use self::{
service::{SessionManager, SessionManagerLayer},
session::{Expiry, Session},
session_store::{CachingSessionStore, ExpiredDeletion, SessionStore},
};

#[cfg(feature = "axum-core")]
#[cfg_attr(docsrs, doc(cfg(feature = "axum-core")))]
pub mod extract;
pub mod service;
pub mod session;
pub mod session_store;
3 changes: 1 addition & 2 deletions tower-sessions-core/src/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ use std::{

use serde::{de::DeserializeOwned, Deserialize, Serialize};
use serde_json::Value;
use time::Duration;
use time::{Duration, OffsetDateTime};
use tokio::sync::{Mutex, MutexGuard};
use tower_cookies::cookie::time::OffsetDateTime;

use crate::{session_store, SessionStore};

Expand Down

0 comments on commit e54ab80

Please sign in to comment.