Merge branch 'main' into wip/path-routing-for-channels

1 files changed, 6 insertions, 14 deletions

diff --git a/src/login/mod.rs b/src/login/mod.rs
index f272f80..98cc3d7 100644
--- a/src/login/mod.rs
+++ b/src/login/mod.rs
@@ -1,22 +1,14 @@
 #[cfg(test)]
 pub mod app;
+pub mod event;
 pub mod extract;
+mod history;
 mod id;
 pub mod password;
 pub mod repo;
 mod routes;
+mod snapshot;
 
-pub use self::{id::Id, password::Password, routes::router};
-
-// This also implements FromRequestParts (see `./extract.rs`). As a result, it
-// can be used as an extractor for endpoints that want to require login, or for
-// endpoints that need to behave differently depending on whether the client is
-// or is not logged in.
-#[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
-pub struct Login {
-    pub id: Id,
-    pub name: String,
-    // The omission of the hashed password is deliberate, to minimize the
-    // chance that it ends up tangled up in debug output or in some other chunk
-    // of logic elsewhere.
-}
+pub use self::{
+    event::Event, history::History, id::Id, password::Password, routes::router, snapshot::Login,
+};