luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-16 16:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add route-data to coerce-request compile failure

Browse source
This commit is contained in:
Juho Teperi 2020-11-02 13:15:07 +02:00
parent 3a6985eb71
commit 62caa9399d
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/reitit-core/src/reitit/coercion.cljc
View file

@ -164,7 +164,7 @@
"A router :compile implementation which reads the `:parameters` "A router :compile implementation which reads the `:parameters`
and `:coercion` data to create compiled coercers into Match under and `:coercion` data to create compiled coercers into Match under
`:result. A pre-requisite to use [[coerce!]]." `:result. A pre-requisite to use [[coerce!]]."
[[_ {:keys [parameters coercion]}] opts] [[_ {:keys [parameters coercion] :as match}] opts]
(if (and parameters coercion) (if (and parameters coercion)
(request-coercers coercion parameters opts))) (request-coercers coercion parameters opts)))

31
modules/reitit-ring/src/reitit/ring/coercion.cljc
View file

@ -24,7 +24,7 @@
and :parameters from route data, otherwise does not mount." and :parameters from route data, otherwise does not mount."
{:name ::coerce-request {:name ::coerce-request
:spec ::rs/parameters :spec ::rs/parameters
:compile (fn [{:keys [coercion parameters]} opts] :compile (fn [{:keys [coercion parameters] :as route-data} opts]
(cond (cond
;; no coercion, skip ;; no coercion, skip
(not coercion) nil (not coercion) nil
@ -32,16 +32,25 @@
(not parameters) {} (not parameters) {}
;; mount ;; mount
:else :else
(if-let [coercers (coercion/request-coercers coercion parameters opts)] (try
(fn [handler] (if-let [coercers (coercion/request-coercers coercion parameters opts)]
(fn (fn [handler]
([request] (fn
(let [coerced (coercion/coerce-request coercers request)] ([request]
(handler (impl/fast-assoc request :parameters coerced)))) (let [coerced (coercion/coerce-request coercers request)]
([request respond raise] (handler (impl/fast-assoc request :parameters coerced))))
(let [coerced (coercion/coerce-request coercers request)] ([request respond raise]
(handler (impl/fast-assoc request :parameters coerced) respond raise))))) (let [coerced (coercion/coerce-request coercers request)]
{})))}) (handler (impl/fast-assoc request :parameters coerced) respond raise)))))
{})
(catch Exception e
(throw (ex-info (str "Coerce-request-middleware failed: " (.getMessage e))
;; TODO: Format error properly
{:type :coerce-request-middleware-fail
;; TODO: Add path?
:data {:route-data (select-keys route-data [:parameters])
:cause-data (ex-data e)}}
e))))))})
(def coerce-response-middleware (def coerce-response-middleware
"Middleware for pluggable response coercion. "Middleware for pluggable response coercion.