From fd8985fd75b085fef9a8f699c17fbe8e59a29cd5 Mon Sep 17 00:00:00 2001 From: Tommi Reiman Date: Mon, 20 Aug 2018 20:49:21 +0300 Subject: [PATCH] pass-through function interceptors --- modules/reitit-core/src/reitit/interceptor.cljc | 1 + modules/reitit-sieppari/src/reitit/interceptor/sieppari.clj | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/reitit-core/src/reitit/interceptor.cljc b/modules/reitit-core/src/reitit/interceptor.cljc index 8b36d518..a5139c0a 100644 --- a/modules/reitit-core/src/reitit/interceptor.cljc +++ b/modules/reitit-core/src/reitit/interceptor.cljc @@ -60,6 +60,7 @@ (into-interceptor [this data opts] (into-interceptor {:name ::handler + ::handler this :enter (fn [ctx] (assoc ctx :response (this (:request ctx))))} data opts)) diff --git a/modules/reitit-sieppari/src/reitit/interceptor/sieppari.clj b/modules/reitit-sieppari/src/reitit/interceptor/sieppari.clj index 53218b8e..e7d0faed 100644 --- a/modules/reitit-sieppari/src/reitit/interceptor/sieppari.clj +++ b/modules/reitit-sieppari/src/reitit/interceptor/sieppari.clj @@ -7,7 +7,11 @@ (reify interceptor/Executor (queue [_ interceptors] - (queue/into-queue interceptors)) + (queue/into-queue + (map + (fn [{:keys [::interceptor/handler] :as interceptor}] + (or handler interceptor)) + interceptors))) (execute [_ interceptors request] (sieppari/execute interceptors request)) (execute [_ interceptors request respond raise]