From 890c2862327e959411671001c8cc59b319ea57c0 Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Fri, 29 Mar 2019 10:36:20 +0000 Subject: api before/after response hooks --- system/api/handlers.go | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'system/api') diff --git a/system/api/handlers.go b/system/api/handlers.go index 20356e9..29707fe 100644 --- a/system/api/handlers.go +++ b/system/api/handlers.go @@ -100,7 +100,31 @@ func contentsHandler(res http.ResponseWriter, req *http.Request) { return } + // assert hookable + get := it() + hook, ok := get.(item.Hookable) + if !ok { + log.Println("[Response] error: Type", t, "does not implement item.Hookable or embed item.Item.") + res.WriteHeader(http.StatusBadRequest) + return + } + + // hook before response + err = hook.BeforeAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling BeforeAPIResponse:", err) + res.WriteHeader(http.StatusInternalServerError) + return + } + sendData(res, req, j) + + // hook after response + err = hook.AfterAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling AfterAPIResponse:", err) + return + } } func contentHandler(res http.ResponseWriter, req *http.Request) { @@ -156,7 +180,31 @@ func contentHandler(res http.ResponseWriter, req *http.Request) { return } + // assert hookable + get := p + hook, ok := get.(item.Hookable) + if !ok { + log.Println("[Response] error: Type", t, "does not implement item.Hookable or embed item.Item.") + res.WriteHeader(http.StatusBadRequest) + return + } + + // hook before response + err = hook.BeforeAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling BeforeAPIResponse:", err) + res.WriteHeader(http.StatusInternalServerError) + return + } + sendData(res, req, j) + + // hook after response + err = hook.AfterAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling AfterAPIResponse:", err) + return + } } func contentHandlerBySlug(res http.ResponseWriter, req *http.Request) { @@ -206,7 +254,32 @@ func contentHandlerBySlug(res http.ResponseWriter, req *http.Request) { return } + // assert hookable + get := p + hook, ok := get.(item.Hookable) + if !ok { + log.Println("[Response] error: Type", t, "does not implement item.Hookable or embed item.Item.") + res.WriteHeader(http.StatusBadRequest) + return + } + + // hook before response + err = hook.BeforeAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling BeforeAPIResponse:", err) + res.WriteHeader(http.StatusInternalServerError) + return + } + sendData(res, req, j) + + // hook after response + err = hook.AfterAPIResponse(res, req) + if err != nil { + log.Println("[Response] error calling AfterAPIResponse:", err) + return + } + } func uploadsHandler(res http.ResponseWriter, req *http.Request) { -- cgit v1.2.3 From 7063494d6c82e784878b6fca79e9442c43578954 Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Fri, 29 Mar 2019 12:05:42 +0000 Subject: passing data to hooks --- system/api/handlers.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'system/api') 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 -- cgit v1.2.3 From 878d593ef5da1435c83bf7bb229f8619c1cab9ff Mon Sep 17 00:00:00 2001 From: Ollie Phillips Date: Thu, 4 Apr 2019 15:30:15 +0100 Subject: removed []byte return on AfterAPIResponse, not needed) --- system/api/handlers.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'system/api') diff --git a/system/api/handlers.go b/system/api/handlers.go index 41c7ee5..99db799 100644 --- a/system/api/handlers.go +++ b/system/api/handlers.go @@ -120,7 +120,7 @@ func contentsHandler(res http.ResponseWriter, req *http.Request) { sendData(res, req, j) // hook after response - _, err = hook.AfterAPIResponse(res, req, j) + err = hook.AfterAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling AfterAPIResponse:", err) return @@ -200,7 +200,7 @@ func contentHandler(res http.ResponseWriter, req *http.Request) { sendData(res, req, j) // hook after response - _, err = hook.AfterAPIResponse(res, req, j) + err = hook.AfterAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling AfterAPIResponse:", err) return @@ -274,7 +274,7 @@ func contentHandlerBySlug(res http.ResponseWriter, req *http.Request) { sendData(res, req, j) // hook after response - _, err = hook.AfterAPIResponse(res, req, j) + err = hook.AfterAPIResponse(res, req, j) if err != nil { log.Println("[Response] error calling AfterAPIResponse:", err) return -- cgit v1.2.3