drop session-prefix from session types

.github/workflows/rust.yml

@@ -124,16 +124,16 @@ jobs:
             features: moka-store,sqlite-store
             docker: false
 
-          - store: mysql_store
-            features: diesel-store,diesel/mysql
-            docker: true
-
           - store: postgres_store
-            features: diesel-store,diesel/postgres
+            features: diesel-postgres-store
+
+            docker: true
+          - store: mysql_store
+            features: diesel-mysql-store
             docker: true
 
           - store: diesel_store
-            features: diesel-store
+            features: diesel-sqlite-store
             docker: false
 
     steps:

Cargo.toml

@@ -19,14 +19,24 @@ tokio-rt = ["tokio/rt"]
 tokio-time = ["tokio/time"]
 continuously-delete-expired = ["tokio-rt", "tokio-time"]
 memory-store = []
+
+moka-store = ["moka"]
+
 redis-store = ["fred", "rmp-serde"]
+
 mongodb-store = ["mongodb", "bson", "rmp-serde"]
+
+# SQLx feature flags.
 sqlx-store = ["sqlx", "rmp-serde"]
 sqlite-store = ["sqlx/sqlite", "sqlx-store"]
 postgres-store = ["sqlx/postgres", "sqlx-store"]
 mysql-store = ["sqlx/mysql", "sqlx-store"]
-moka-store = ["moka"]
+
+# Diesel feature flags.
 diesel-store = ["dep:diesel", "tokio/rt", "rmp-serde"]
+diesel-sqlite-store = ["diesel-store", "diesel/sqlite"]
+diesel-postgres-store = ["diesel-store", "diesel/postgres"]
+diesel-mysql-store = ["diesel-store", "diesel/mysql"]
 
 [dependencies]
 async-trait = "0.1.73"

examples/counter-concurrent.rs

@@ -7,7 +7,7 @@ use http::StatusCode;
 use serde::{Deserialize, Serialize};
 use time::Duration;
 use tower::ServiceBuilder;
-use tower_sessions::{MemoryStore, Session, SessionExpiry, SessionManagerLayer};
+use tower_sessions::{Expiry, MemoryStore, Session, SessionManagerLayer};
 
 const COUNTER_KEY: &str = "counter";
 
@@ -24,7 +24,7 @@ async fn main() {
         .layer(
             SessionManagerLayer::new(session_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::days(1))),
+                .with_expiry(Expiry::InactivityDuration(Duration::days(1))),
         );
 
     let app = Router::new()

examples/counter-extractor.rs

@@ -9,7 +9,7 @@ use http::{request::Parts, StatusCode};
 use serde::{Deserialize, Serialize};
 use time::Duration;
 use tower::ServiceBuilder;
-use tower_sessions::{MemoryStore, Session, SessionExpiry, SessionManagerLayer};
+use tower_sessions::{Expiry, MemoryStore, Session, SessionManagerLayer};
 
 const COUNTER_KEY: &str = "counter";
 
@@ -49,7 +49,7 @@ async fn main() {
         .layer(
             SessionManagerLayer::new(session_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+                .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
         );
 
     let app = Router::new()

examples/counter.rs

@@ -7,7 +7,7 @@ use http::StatusCode;
 use serde::{Deserialize, Serialize};
 use time::Duration;
 use tower::ServiceBuilder;
-use tower_sessions::{MemoryStore, Session, SessionExpiry, SessionManagerLayer};
+use tower_sessions::{Expiry, MemoryStore, Session, SessionManagerLayer};
 
 const COUNTER_KEY: &str = "counter";
 
@@ -24,7 +24,7 @@ async fn main() {
         .layer(
             SessionManagerLayer::new(session_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+                .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
         );
 
     let app = Router::new()

examples/diesel-store-with-custom-table.rs

@@ -15,7 +15,7 @@ use tower::ServiceBuilder;
 use tower_sessions::{
     diesel_store::{DieselStore, DieselStoreError, SessionTable},
     session_store::ExpiredDeletion,
-    Session, SessionExpiry, SessionManagerLayer,
+    Expiry, Session, SessionManagerLayer,
 };
 
 const COUNTER_KEY: &str = "counter";
@@ -58,8 +58,8 @@ impl SessionTable<SqliteConnection> for self::my_sessions::table {
         // or create the table via normal diesel migrations on startup and leave that
         // function empty
         conn.batch_execute(
-            "CREATE TABLE `my_sessions` (`id` TEXT PRIMARY KEY NOT NULL, `expiry_date` TEXT \
-             NOT NULL, `data` BLOB NOT NULL);",
+            "CREATE TABLE `my_sessions` (`id` TEXT PRIMARY KEY NOT NULL, `expiry_date` TEXT NOT \
+             NULL, `data` BLOB NOT NULL);",
         )?;
         Ok(())
     }
@@ -87,7 +87,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .layer(
             SessionManagerLayer::new(session_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+                .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
         );
 
     let app = Router::new()

examples/diesel-store.rs

@@ -12,8 +12,7 @@ use serde::{Deserialize, Serialize};
 use time::Duration;
 use tower::ServiceBuilder;
 use tower_sessions::{
-    diesel_store::DieselStore, session_store::ExpiredDeletion, Session, SessionExpiry,
-    SessionManagerLayer,
+    diesel_store::DieselStore, session_store::ExpiredDeletion, Expiry, Session, SessionManagerLayer,
 };
 
 const COUNTER_KEY: &str = "counter";
@@ -43,7 +42,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .layer(
             SessionManagerLayer::new(session_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+                .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
         );
 
     let app = Router::new()

examples/moka-postgres-store.rs

@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 use time::Duration;
 use tower::ServiceBuilder;
 use tower_sessions::{
-    sqlx::PgPool, CachingSessionStore, MokaStore, PostgresStore, Session, SessionExpiry,
+    sqlx::PgPool, CachingSessionStore, Expiry, MokaStore, PostgresStore, Session,
     SessionManagerLayer,
 };
 
@@ -35,7 +35,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .layer(
             SessionManagerLayer::new(caching_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+                .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
         );
 
     let app = Router::new()

examples/mongodb-store.rs

@@ -7,7 +7,7 @@ use http::StatusCode;
 use serde::{Deserialize, Serialize};
 use time::Duration;
 use tower::ServiceBuilder;
-use tower_sessions::{mongodb::Client, MongoDBStore, Session, SessionExpiry, SessionManagerLayer};
+use tower_sessions::{mongodb::Client, Expiry, MongoDBStore, Session, SessionManagerLayer};
 
 const COUNTER_KEY: &str = "counter";
 
@@ -26,7 +26,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .layer(
             SessionManagerLayer::new(session_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+                .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
         );
 
     let app = Router::new()

examples/mysql-store.rs

@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 use time::Duration;
 use tower::ServiceBuilder;
 use tower_sessions::{
-    session_store::ExpiredDeletion, sqlx::MySqlPool, MySqlStore, Session, SessionExpiry,
+    session_store::ExpiredDeletion, sqlx::MySqlPool, Expiry, MySqlStore, Session,
     SessionManagerLayer,
 };
 
@@ -37,7 +37,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .layer(
             SessionManagerLayer::new(session_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+                .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
         );
 
     let app = Router::new()

examples/postgres-store.rs

@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 use time::Duration;
 use tower::ServiceBuilder;
 use tower_sessions::{
-    session_store::ExpiredDeletion, sqlx::PgPool, PostgresStore, Session, SessionExpiry,
+    session_store::ExpiredDeletion, sqlx::PgPool, Expiry, PostgresStore, Session,
     SessionManagerLayer,
 };
 
@@ -37,7 +37,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .layer(
             SessionManagerLayer::new(session_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+                .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
         );
 
     let app = Router::new()

examples/redis-store.rs

@@ -7,7 +7,7 @@ use http::StatusCode;
 use serde::{Deserialize, Serialize};
 use time::Duration;
 use tower::ServiceBuilder;
-use tower_sessions::{fred::prelude::*, RedisStore, Session, SessionExpiry, SessionManagerLayer};
+use tower_sessions::{fred::prelude::*, Expiry, RedisStore, Session, SessionManagerLayer};
 
 const COUNTER_KEY: &str = "counter";
 
@@ -29,7 +29,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .layer(
             SessionManagerLayer::new(session_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+                .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
         );
 
     let app = Router::new()

examples/sqlite-store.rs

@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 use time::Duration;
 use tower::ServiceBuilder;
 use tower_sessions::{
-    session_store::ExpiredDeletion, sqlx::SqlitePool, Session, SessionExpiry, SessionManagerLayer,
+    session_store::ExpiredDeletion, sqlx::SqlitePool, Expiry, Session, SessionManagerLayer,
     SqliteStore,
 };
 
@@ -36,7 +36,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .layer(
             SessionManagerLayer::new(session_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+                .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
         );
 
     let app = Router::new()

examples/strongly-typed.rs

@@ -9,7 +9,7 @@ use http::{request::Parts, StatusCode};
 use serde::{Deserialize, Serialize};
 use time::{Duration, OffsetDateTime};
 use tower::ServiceBuilder;
-use tower_sessions::{MemoryStore, Session, SessionExpiry, SessionManagerLayer};
+use tower_sessions::{Expiry, MemoryStore, Session, SessionManagerLayer};
 use uuid::Uuid;
 
 #[derive(Clone, Deserialize, Serialize)]
@@ -117,7 +117,7 @@ async fn main() {
         .layer(
             SessionManagerLayer::new(session_store)
                 .with_secure(false)
-                .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+                .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
         );
 
     let app = Router::new()

src/cookie_config.rs

@@ -1,7 +1,7 @@
 //! Defines the configuration for the cookie belonging to the session.
 use tower_cookies::{cookie::SameSite, Cookie};
 
-use crate::{session::SessionExpiry, Session};
+use crate::{session::Expiry, Session};
 
 /// Defines the configuration for the cookie belonging to the session.
 #[derive(Debug, Clone)]
@@ -26,7 +26,7 @@ pub struct CookieConfig {
     pub same_site: SameSite,
 
     /// Specifies the maximum age of the session.
-    pub expiry: Option<SessionExpiry>,
+    pub expiry: Option<Expiry>,
 
     /// Indicates whether the cookie should only be transmitted over secure
     /// (HTTPS) connections.

src/diesel_store.rs

@@ -325,7 +325,7 @@ where
 
     async fn load(
         &self,
-        session_id: &crate::session::SessionId,
+        session_id: &crate::session::Id,
     ) -> Result<Option<crate::Session>, Self::Error> {
         let session_id = session_id.to_string();
         let pool = self.pool.clone();
@@ -350,7 +350,7 @@ where
         Ok(res)
     }
 
-    async fn delete(&self, session_id: &crate::session::SessionId) -> Result<(), Self::Error> {
+    async fn delete(&self, session_id: &crate::session::Id) -> Result<(), Self::Error> {
         let session_id = session_id.to_string();
         let pool = self.pool.clone();
         tokio::task::spawn_blocking(move || {

src/lib.rs

@@ -39,7 +39,7 @@
 //! use serde::{Deserialize, Serialize};
 //! use time::Duration;
 //! use tower::ServiceBuilder;
-//! use tower_sessions::{MemoryStore, Session, SessionExpiry, SessionManagerLayer};
+//! use tower_sessions::{Expiry, MemoryStore, Session, SessionManagerLayer};
 //!
 //! const COUNTER_KEY: &str = "counter";
 //!
@@ -56,7 +56,7 @@
 //!         .layer(
 //!             SessionManagerLayer::new(session_store)
 //!                 .with_secure(false)
-//!                 .with_expiry(SessionExpiry::InactivityDuration(Duration::seconds(10))),
+//!                 .with_expiry(Expiry::InactivityDuration(Duration::seconds(10))),
 //!         );
 //!
 //!     let app = Router::new()
@@ -505,7 +505,7 @@ pub use self::sqlx_store::SqlxStoreError;
 pub use self::{
     cookie_config::CookieConfig,
     service::{SessionManager, SessionManagerLayer},
-    session::{Session, SessionExpiry},
+    session::{Expiry, Session},
     session_store::{CachingSessionStore, ExpiredDeletion, SessionStore},
 };
 

src/memory_store.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use parking_lot::Mutex;
 
 use crate::{
-    session::{Session, SessionId},
+    session::{Id, Session},
     SessionStore,
 };
 
@@ -19,7 +19,7 @@ use crate::{
 /// MemoryStore::default();
 /// ```
 #[derive(Clone, Debug, Default)]
-pub struct MemoryStore(Arc<Mutex<HashMap<SessionId, Session>>>);
+pub struct MemoryStore(Arc<Mutex<HashMap<Id, Session>>>);
 
 #[async_trait]
 impl SessionStore for MemoryStore {
@@ -30,11 +30,11 @@ impl SessionStore for MemoryStore {
         Ok(())
     }
 
-    async fn load(&self, session_id: &SessionId) -> Result<Option<Session>, Self::Error> {
+    async fn load(&self, session_id: &Id) -> Result<Option<Session>, Self::Error> {
         Ok(self.0.lock().get(session_id).cloned())
     }
 
-    async fn delete(&self, session_id: &SessionId) -> Result<(), Self::Error> {
+    async fn delete(&self, session_id: &Id) -> Result<(), Self::Error> {
         self.0.lock().remove(session_id);
         Ok(())
     }