Skip to content

Add route-data to coerce-request compile failure #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Deraen wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −12
Open

Add route-data to coerce-request compile failure #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/reitit-core/src/reitit/coercion.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
"A router :compile implementation which reads the `:parameters`
and `:coercion` data to create compiled coercers into Match under
`:result. A pre-requisite to use [[coerce!]]."
[[_ {:keys [parameters coercion]}] opts]
[[_ {:keys [parameters coercion] :as match}] opts]
(if (and parameters coercion)
(request-coercers coercion parameters opts)))

Expand Down
31 changes: 20 additions & 11 deletions modules/reitit-ring/src/reitit/ring/coercion.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,33 @@
and :parameters from route data, otherwise does not mount."
{:name ::coerce-request
:spec ::rs/parameters
:compile (fn [{:keys [coercion parameters]} opts]
:compile (fn [{:keys [coercion parameters] :as route-data} opts]
(cond
;; no coercion, skip
(not coercion) nil
;; just coercion, don't mount
(not parameters) {}
;; mount
:else
(if-let [coercers (coercion/request-coercers coercion parameters opts)]
(fn [handler]
(fn
([request]
(let [coerced (coercion/coerce-request coercers request)]
(handler (impl/fast-assoc request :parameters coerced))))
([request respond raise]
(let [coerced (coercion/coerce-request coercers request)]
(handler (impl/fast-assoc request :parameters coerced) respond raise)))))
{})))})
(try
(if-let [coercers (coercion/request-coercers coercion parameters opts)]
(fn [handler]
(fn
([request]
(let [coerced (coercion/coerce-request coercers request)]
(handler (impl/fast-assoc request :parameters coerced))))
([request 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))

@ikitommi ikitommi Nov 2, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reitit/exception/fail! could be used instead?

@Deraen Deraen Nov 2, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't currently take cause as parameter.

;; 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
"Middleware for pluggable response coercion.
Expand Down