Fix routes-interceptor to wrap route/match fn

Co-authored-by: Iain Wood <iain.wood@flexiana.com>
Flexiana · Dec 18, 2023 · d5dccfa · d5dccfa
1 parent c2d9587
commit d5dccfa
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/xiana/handler.clj b/src/xiana/handler.clj
@@ -25,8 +25,11 @@
     ([http-request]
      (let [websocket? (jetty/ws-upgrade-request? http-request)
            state (state/make deps http-request)
-           queue (list #(interceptor.queue/execute % (:router-interceptors deps))
+           enter-routes (map #(select-keys % [:enter :name]) (:router-interceptors deps))
+           leave-routes (map #(select-keys % [:leave :name]) (:router-interceptors deps))
+           queue (list #(interceptor.queue/execute % enter-routes)
                        #(route/match %)
+                       #(interceptor.queue/execute % leave-routes)
                        #(interceptor.queue/execute % (if websocket?
                                                        (:web-socket-interceptors deps)
                                                        (:controller-interceptors deps))))