From 710c4bbba144970ba2d755d41b6b5ad3e12e4487 Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Sat, 9 Jun 2018 11:13:58 -0400
Subject: [PATCH] ns reloading fixes for http sessions and views/sente
 components

---
 project.clj                 |  1 -
 src/mtgcoll/core.clj        | 23 +++++++++++++----------
 src/mtgcoll/views/core.clj  |  2 +-
 src/mtgcoll/views/sente.clj |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/project.clj b/project.clj
index 40b4a61..35d6acd 100644
--- a/project.clj
+++ b/project.clj
@@ -20,7 +20,6 @@
                  [gered/webtools.reagent "0.1.1"]
                  [hiccup "1.0.5"]
                  [honeysql "0.7.0"]
-                 [luminus/ring-ttl-session "0.3.1"]
                  [mount "0.1.12"]
                  [org.clojure/clojure "1.8.0"]
                  [org.clojure/clojurescript "1.8.51"]
diff --git a/src/mtgcoll/core.clj b/src/mtgcoll/core.clj
index 65777f1..b4b152b 100644
--- a/src/mtgcoll/core.clj
+++ b/src/mtgcoll/core.clj
@@ -6,12 +6,12 @@
     [compojure.core :refer [routes GET POST]]
     [compojure.route :as route]
     [immutant.web :as immutant]
+    [immutant.web.middleware :refer [wrap-session]]
     [mount.core :as mount :refer [defstate]]
     [ring.middleware.defaults :refer [wrap-defaults site-defaults]]
     [ring.middleware.format :refer [wrap-restful-format]]
     [ring.middleware.reload :refer [wrap-reload]]
     [ring.middleware.webjars :refer [wrap-webjars]]
-    [ring-ttl-session.core :refer [ttl-memory-store]]
     [taoensso.sente.server-adapters.immutant :refer [sente-web-server-adapter]]
     [mtgcoll.cli :as cli]
     [mtgcoll.config :as config]
@@ -26,18 +26,21 @@
     [mtgcoll.routes.lists :refer [list-routes]]
     [mtgcoll.routes.auth :refer [auth-routes]]))
 
+(def app-routes
+  (routes
+    auth-routes
+    collection-routes
+    list-routes
+    image-routes
+    main-page-routes
+    (route/not-found "not found")))
+
 (def handler
-  (-> (routes
-        auth-routes
-        collection-routes
-        list-routes
-        image-routes
-        main-page-routes
-        (route/resources "/")
-        (route/not-found "not found"))
+  (-> #'app-routes
       (wrap-restful-format :formats [:json-kw])
       (sente/wrap-sente "/chsk")
-      (wrap-defaults (assoc-in site-defaults [:session :store] (ttl-memory-store (* 60 30))))
+      (wrap-defaults (assoc-in site-defaults [:session] false))
+      (wrap-session)
       (wrap-webjars)))
 
 (defstate ^{:on-reload :noop} http-server
diff --git a/src/mtgcoll/views/core.clj b/src/mtgcoll/views/core.clj
index d8475e0..a9207ba 100644
--- a/src/mtgcoll/views/core.clj
+++ b/src/mtgcoll/views/core.clj
@@ -93,7 +93,7 @@
         user-profile (get-in request [:session :user])]
     (log/warn "Unauthorized view subscription attempt: " view-id ", " parameters " - user profile: " user-profile)))
 
-(defstate view-system
+(defstate ^{:on-reload :noop} view-system
   :start (let [vs (atom nil)]
            (vr/init! vs sente-socket
                      {:views                     views
diff --git a/src/mtgcoll/views/sente.clj b/src/mtgcoll/views/sente.clj
index 24b44f0..01b2fd3 100644
--- a/src/mtgcoll/views/sente.clj
+++ b/src/mtgcoll/views/sente.clj
@@ -4,7 +4,7 @@
     [taoensso.sente :as sente]
     [taoensso.sente.server-adapters.immutant :refer [sente-web-server-adapter]]))
 
-(defstate sente-socket
+(defstate ^{:on-reload :noop} sente-socket
   :start (sente/make-channel-socket!
            sente-web-server-adapter
            {:user-id-fn        (fn [request] (get-in request [:params :client-id]))