feat(otter): added sessions page template

gpodder/src/lib.rs

@@ -5,5 +5,6 @@ mod store;
 pub use models::*;
 pub use repository::GpodderRepository;
 pub use store::{
-    AuthErr, AuthStore, DeviceRepository, EpisodeActionRepository, Store, SubscriptionRepository,
+    AuthErr, GpodderAuthStore, GpodderDeviceStore, GpodderEpisodeActionStore, GpodderStore,
+    GpodderSubscriptionStore,
 };

gpodder/src/repository.rs

@@ -6,18 +6,18 @@ use rand::{Rng, rngs::OsRng};
 
 use crate::{
     models,
-    store::{AuthErr, Store},
+    store::{AuthErr, GpodderStore},
 };
 
 const MAX_SESSION_AGE: i64 = 60 * 60 * 24 * 7;
 
 #[derive(Clone)]
 pub struct GpodderRepository {
-    store: Arc<dyn Store + Send + Sync>,
+    store: Arc<dyn GpodderStore + Send + Sync>,
 }
 
 impl GpodderRepository {
-    pub fn new(store: impl Store + Send + Sync + 'static) -> Self {
+    pub fn new(store: impl GpodderStore + Send + Sync + 'static) -> Self {
         Self {
             store: Arc::new(store),
         }

gpodder/src/store.rs

@@ -24,17 +24,18 @@ impl Display for AuthErr {
 
 impl std::error::Error for AuthErr {}
 
-pub trait Store:
+/// API abstraction providing methods for serving the Gpodder API
-    AuthStore + DeviceRepository + SubscriptionRepository + EpisodeActionRepository
+pub trait GpodderStore:
+    GpodderAuthStore + GpodderDeviceStore + GpodderSubscriptionStore + GpodderEpisodeActionStore
 {
 }
 
-impl<T> Store for T where
+impl<T> GpodderStore for T where
-    T: AuthStore + DeviceRepository + SubscriptionRepository + EpisodeActionRepository
+    T: GpodderAuthStore + GpodderDeviceStore + GpodderSubscriptionStore + GpodderEpisodeActionStore
 {
 }
 
-pub trait AuthStore {
+pub trait GpodderAuthStore {
     /// Retrieve the session with the given session ID
     fn get_session(&self, session_id: i64) -> Result<Option<Session>, AuthErr>;
 
@@ -63,7 +64,7 @@ pub trait AuthStore {
     fn remove_old_sessions(&self, min_last_seen: DateTime<Utc>) -> Result<usize, AuthErr>;
 }
 
-pub trait DeviceRepository {
+pub trait GpodderDeviceStore {
     /// Return all devices associated with the user
     fn devices_for_user(&self, user: &User) -> Result<Vec<Device>, AuthErr>;
 
@@ -108,7 +109,7 @@ pub trait DeviceRepository {
     ) -> Result<(Vec<String>, Vec<Vec<String>>), AuthErr>;
 }
 
-pub trait SubscriptionRepository {
+pub trait GpodderSubscriptionStore {
     /// Return the subscriptions for the given device
     fn subscriptions_for_device(
         &self,
@@ -149,7 +150,7 @@ pub trait SubscriptionRepository {
     ) -> Result<(Vec<Subscription>, Vec<Subscription>), AuthErr>;
 }
 
-pub trait EpisodeActionRepository {
+pub trait GpodderEpisodeActionStore {
     /// Insert the given episode actions into the datastore.
     fn add_episode_actions(
         &self,

gpodder_sqlite/src/repository/auth.rs

@@ -22,7 +22,7 @@ impl From<User> for gpodder::User {
     }
 }
 
-impl gpodder::AuthStore for SqliteRepository {
+impl gpodder::GpodderAuthStore for SqliteRepository {
     fn get_user(&self, username: &str) -> Result<Option<gpodder::models::User>, AuthErr> {
         Ok(users::table
             .select(User::as_select())

gpodder_sqlite/src/repository/device.rs

@@ -38,7 +38,7 @@ impl From<gpodder::DeviceType> for DeviceType {
     }
 }
 
-impl gpodder::DeviceRepository for SqliteRepository {
+impl gpodder::GpodderDeviceStore for SqliteRepository {
     fn devices_for_user(
         &self,
         user: &gpodder::User,

gpodder_sqlite/src/repository/episode_action.rs

@@ -71,7 +71,7 @@ fn to_gpodder_action(
     }
 }
 
-impl gpodder::EpisodeActionRepository for SqliteRepository {
+impl gpodder::GpodderEpisodeActionStore for SqliteRepository {
     fn add_episode_actions(
         &self,
         user: &gpodder::User,

gpodder_sqlite/src/repository/subscription.rs

@@ -172,7 +172,7 @@ pub fn update_subscriptions_for_single_device(
     Ok(())
 }
 
-impl gpodder::SubscriptionRepository for SqliteRepository {
+impl gpodder::GpodderSubscriptionStore for SqliteRepository {
     fn subscriptions_for_user(
         &self,
         user: &gpodder::User,

otter/src/server/web/mod.rs

@@ -22,6 +22,11 @@ const SESSION_ID_COOKIE: &str = "sessionid";
 
 pub fn router(ctx: Context) -> Router<Context> {
     Router::new()
+        .route("/sessions", get(get_sessions))
+        .route_layer(axum::middleware::from_fn_with_state(
+            ctx.clone(),
+            auth_web_middleware,
+        ))
         .route("/", get(get_index))
         // .layer(middleware::from_fn_with_state(
         //     ctx.clone(),
@@ -161,3 +166,14 @@ pub async fn auth_web_middleware(
         Err(err) => err.into_response(),
     }
 }
+
+pub async fn get_sessions(
+    State(ctx): State<Context>,
+    headers: HeaderMap,
+) -> TemplateResponse<Page<View>> {
+    View::Sessions(Vec::new())
+        .page(&headers)
+        .headers(&headers)
+        .authenticated(true)
+        .response(&ctx.tera)
+}

otter/src/web/mod.rs

@@ -79,6 +79,10 @@ pub fn initialize_tera() -> tera::Result<tera::Tera> {
             View::Login.template(),
             include_str!("templates/views/login.html"),
         ),
+        (
+            View::Sessions(Vec::new()).template(),
+            include_str!("templates/views/sessions.html"),
+        ),
     ])?;
 
     Ok(tera)

otter/src/web/templates/base.html

@@ -21,12 +21,12 @@ a:hover {
                     </li>
                 </ul>
                 <ul>
-                    <li>
+                    {% if authenticated %}
-                        {% if authenticated %}
+                    <li><a hx-get="/sessions" hx-target="#inner" hx-push-url="true">Sessions</a></li>
-                            <a hx-post="/logout" hx-target="#inner">Logout</a>
+                    <li><a hx-post="/logout" hx-target="#inner">Logout</a></li>
-                        {% else %}
+                    {% else %}
-                            <a hx-get="/login" hx-target="#inner" hx-push-url="true">Login</a>
+                    <li><a hx-get="/login" hx-target="#inner" hx-push-url="true">Login</a></li>
-                        {% endif %}
+                    {% endif %}
                     </li>
                 </ul>
             </nav>

otter/src/web/templates/views/sessions.html

@@ -0,0 +1,18 @@
+<h1>Sessions</h1>
+
+<table>
+    <thead>
+        <tr>
+            <th>User Agent</th>
+            <th>Last seen</th>
+            <th>Action</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <th>Firefox</th>
+            <th>yesterday</th>
+            <th>Remove</th>
+        </tr>
+    </tbody>
+</table>

otter/src/web/view.rs

@@ -3,6 +3,7 @@ use super::Template;
 pub enum View {
     Index,
     Login,
+    Sessions(Vec<gpodder::Session>),
 }
 
 impl Template for View {
@@ -10,10 +11,19 @@ impl Template for View {
         match self {
             Self::Index => "views/index.html",
             Self::Login => "views/login.html",
+            Self::Sessions(_) => "views/sessions.html",
         }
     }
 
     fn render(&self, tera: &tera::Tera) -> tera::Result<String> {
-        tera.render(self.template(), &tera::Context::new())
+        let mut ctx = tera::Context::new();
+
+        // match self {
+        //     Self::Sessions(sessions) => {
+        //         ctx.insert("sessions", sessions);
+        //     }
+        // };
+
+        tera.render(self.template(), &ctx)
     }
 }