summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorOllie Phillips <oliver@eantics.co.uk>2019-03-29 12:05:42 +0000
committerOllie Phillips <oliver@eantics.co.uk>2019-03-29 12:05:42 +0000
commit7063494d6c82e784878b6fca79e9442c43578954 (patch)
tree3e3d9a8b55d08dc548cfb39d8a2f5b7ef1d08c08 /system
parent890c2862327e959411671001c8cc59b319ea57c0 (diff)
passing data to hooks
Diffstat (limited to 'system')
-rw-r--r--system/api/handlers.go12
-rw-r--r--system/item/item.go12
2 files changed, 12 insertions, 12 deletions
diff --git a/system/api/handlers.go b/system/api/handlers.go
index 29707fe..41c7ee5 100644
--- a/system/api/handlers.go
+++ b/system/api/handlers.go
@@ -110,7 +110,7 @@ func contentsHandler(res http.ResponseWriter, req *http.Request) {
}
// hook before response
- err = hook.BeforeAPIResponse(res, req)
+ j, err = hook.BeforeAPIResponse(res, req, j)
if err != nil {
log.Println("[Response] error calling BeforeAPIResponse:", err)
res.WriteHeader(http.StatusInternalServerError)
@@ -120,7 +120,7 @@ func contentsHandler(res http.ResponseWriter, req *http.Request) {
sendData(res, req, j)
// hook after response
- err = hook.AfterAPIResponse(res, req)
+ _, err = hook.AfterAPIResponse(res, req, j)
if err != nil {
log.Println("[Response] error calling AfterAPIResponse:", err)
return
@@ -190,7 +190,7 @@ func contentHandler(res http.ResponseWriter, req *http.Request) {
}
// hook before response
- err = hook.BeforeAPIResponse(res, req)
+ j, err = hook.BeforeAPIResponse(res, req, j)
if err != nil {
log.Println("[Response] error calling BeforeAPIResponse:", err)
res.WriteHeader(http.StatusInternalServerError)
@@ -200,7 +200,7 @@ func contentHandler(res http.ResponseWriter, req *http.Request) {
sendData(res, req, j)
// hook after response
- err = hook.AfterAPIResponse(res, req)
+ _, err = hook.AfterAPIResponse(res, req, j)
if err != nil {
log.Println("[Response] error calling AfterAPIResponse:", err)
return
@@ -264,7 +264,7 @@ func contentHandlerBySlug(res http.ResponseWriter, req *http.Request) {
}
// hook before response
- err = hook.BeforeAPIResponse(res, req)
+ j, err = hook.BeforeAPIResponse(res, req, j)
if err != nil {
log.Println("[Response] error calling BeforeAPIResponse:", err)
res.WriteHeader(http.StatusInternalServerError)
@@ -274,7 +274,7 @@ func contentHandlerBySlug(res http.ResponseWriter, req *http.Request) {
sendData(res, req, j)
// hook after response
- err = hook.AfterAPIResponse(res, req)
+ _, err = hook.AfterAPIResponse(res, req, j)
if err != nil {
log.Println("[Response] error calling AfterAPIResponse:", err)
return
diff --git a/system/item/item.go b/system/item/item.go
index 51ac2a9..8be21ae 100644
--- a/system/item/item.go
+++ b/system/item/item.go
@@ -65,8 +65,8 @@ type Sortable interface {
// to the different lifecycles/events a struct may encounter. Item implements
// Hookable with no-ops so our user can override only whichever ones necessary.
type Hookable interface {
- BeforeAPIResponse(http.ResponseWriter, *http.Request) error
- AfterAPIResponse(http.ResponseWriter, *http.Request) error
+ BeforeAPIResponse(http.ResponseWriter, *http.Request, []byte) ([]byte, error)
+ AfterAPIResponse(http.ResponseWriter, *http.Request, []byte) ([]byte, error)
BeforeAPICreate(http.ResponseWriter, *http.Request) error
AfterAPICreate(http.ResponseWriter, *http.Request) error
@@ -181,13 +181,13 @@ func (i Item) String() string {
}
// BeforeAPIResponse is a no-op to ensure structs which embed Item implement Hookable
-func (i Item) BeforeAPIResponse(res http.ResponseWriter, req *http.Request) error {
- return nil
+func (i Item) BeforeAPIResponse(res http.ResponseWriter, req *http.Request, data []byte) ([]byte, error) {
+ return data, nil
}
// AfterAPIResponse is a no-op to ensure structs which embed Item implement Hookable
-func (i Item) AfterAPIResponse(res http.ResponseWriter, req *http.Request) error {
- return nil
+func (i Item) AfterAPIResponse(res http.ResponseWriter, req *http.Request, data []byte) ([]byte, error) {
+ return data, nil
}
// BeforeAPICreate is a no-op to ensure structs which embed Item implement Hookable