From 3463292e3ccf44a2a76792670948be6bcfad06c5 Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Sun, 22 Jul 2018 09:00:14 +0100
Subject: [PATCH] Finished work on backing out passing session to layout.

---
 project.clj                                | 6 ++++--
 resources/sql/youyesyet.postgres.sql       | 2 +-
 src/clj/youyesyet/middleware.clj           | 9 ++++++---
 src/clj/youyesyet/routes/issue_experts.clj | 2 --
 src/clj/youyesyet/routes/logged_in.clj     | 5 +++--
 src/clj/youyesyet/routes/roles.clj         | 5 -----
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/project.clj b/project.clj
index 1a41985..7868e2b 100644
--- a/project.clj
+++ b/project.clj
@@ -54,7 +54,7 @@
   :main ^:skip-aot youyesyet.core
   :migratus {:store :database :db ~(get (System/getenv) "DATABASE_URL")}
 
-  :plugins [;;[lein-adl ["0.1.1"]]
+  :plugins [;;[lein-adl ["0.1.2"]]
             [lein-cljsbuild "1.1.4"]
             [lein-codox "0.10.3"]
             [lein-cprop "1.0.1"]
@@ -109,7 +109,9 @@
 
 
   :profiles {:uberjar {:omit-source true
-                       :prep-tasks ["adl" "compile" ["cljsbuild" "once" "min"]]
+                       :prep-tasks [;;"adl"
+                                     "compile"
+                                     ["cljsbuild" "once" "min"]]
                        :cljsbuild
                        {:builds
                         {:min
diff --git a/resources/sql/youyesyet.postgres.sql b/resources/sql/youyesyet.postgres.sql
index 0c9f60c..e54ce0e 100644
--- a/resources/sql/youyesyet.postgres.sql
+++ b/resources/sql/youyesyet.postgres.sql
@@ -5,7 +5,7 @@
 --	
 --	auto-generated by [Application Description Language framework] 
 --	
---	(https://github.com/simon-brooke/adl) at 20180721T133846.002Z 
+--	(https://github.com/simon-brooke/adl) at 20180721T171142.862Z 
 --	
 --	A web-app intended to be used by canvassers
 --	  campaigning for a 'Yes' vote in the second independence
diff --git a/src/clj/youyesyet/middleware.clj b/src/clj/youyesyet/middleware.clj
index 5e28726..c47697d 100644
--- a/src/clj/youyesyet/middleware.clj
+++ b/src/clj/youyesyet/middleware.clj
@@ -70,18 +70,21 @@
   (fn [request]
     (if-let [user (-> request :session :user)]
       (binding [*user* user]
+        (log/debug "*user* bound as: " *user*)
         (handler request))
-      (handler request))))
+      (do
+        (log/debug "No user found in session")
+        (handler request)))))
 
 
 (defn wrap-base [handler]
   (-> ((:middleware defaults) handler)
+      wrap-user
       wrap-webjars
       (wrap-defaults
         (-> site-defaults
             (assoc-in [:security :anti-forgery] false)
             (assoc-in  [:session :store] (ttl-memory-store (* 60 30)))))
       wrap-context
-      wrap-internal-error
-      wrap-user))
+      wrap-internal-error))
 
diff --git a/src/clj/youyesyet/routes/issue_experts.clj b/src/clj/youyesyet/routes/issue_experts.clj
index f73b801..3989dca 100644
--- a/src/clj/youyesyet/routes/issue_experts.clj
+++ b/src/clj/youyesyet/routes/issue_experts.clj
@@ -42,7 +42,6 @@
 (defn list-page [request]
   (layout/render
     "issue-expert/list.html"
-;;    (:session request)
     (let [user (:user (:session request))]
     {:title "Open requests"
      :user user
@@ -69,7 +68,6 @@
                  db/*db* {:id (:visit_id record)})))]
     (layout/render
       "issue-expert/request.html"
-  ;;    (:session request)
       {:title (str "Request from " (:name elector) " at " (:date visit))
        :user (:user (:session request))
        :visit visit
diff --git a/src/clj/youyesyet/routes/logged_in.clj b/src/clj/youyesyet/routes/logged_in.clj
index 1c4c140..8c33dc6 100644
--- a/src/clj/youyesyet/routes/logged_in.clj
+++ b/src/clj/youyesyet/routes/logged_in.clj
@@ -50,7 +50,6 @@
   (let [record (-> request :session :user)]
   (layout/render
     "auto/form-canvassers-Canvasser.html"
-;;    (:session request)
     {:title (str "Profile for " (-> request :session :user :fullname))
      :record record
      :elector_id
@@ -116,7 +115,9 @@
 
 (defn handle-logout
   [request]
-  (dissoc (response/found "home") :user :roles))
+  (let [r (response/found "home")]
+    (assoc r :session (dissoc (:session r) :user))))
+
 
 
 (defroutes logged-in-routes
diff --git a/src/clj/youyesyet/routes/roles.clj b/src/clj/youyesyet/routes/roles.clj
index 851bc58..4e9912b 100644
--- a/src/clj/youyesyet/routes/roles.clj
+++ b/src/clj/youyesyet/routes/roles.clj
@@ -26,7 +26,6 @@
     (log/info (str "Roles routing page; user is " user "; roles are " roles))
     (cond
       roles (layout/render "roles.html"
-;;                        ;;    (:session request)
                            {:title (str "Welcome " (:fullname user) ", what do you want to do?")
                             :user user
                             :roles (map #(assoc % :link (safe-name (:name %) :sql)) roles)})
@@ -38,7 +37,6 @@
   [request]
   (layout/render
     (support/resolve-template "application-index.html")
-;;    (:session request)
     {:title "Administrative menu"}))
 
 
@@ -49,7 +47,6 @@
   [request]
   (layout/render
     (support/resolve-template "application-index.html")
-;;    (:session request)
     {:title "Administrative menu"}))
 
 
@@ -57,7 +54,6 @@
   [request]
   (layout/render
    "roles/canvasser.html"
-;;    (:session request)
    {}))
 
 
@@ -65,7 +61,6 @@
   [request]
   (layout/render
    "roles/team-orgenisers.html"
-;;   request
    {}))