[#5614] removed hook.HandlerFunc[T] type

apis/base.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"github.com/pocketbase/pocketbase/core"
-	"github.com/pocketbase/pocketbase/tools/hook"
 	"github.com/pocketbase/pocketbase/tools/router"
 )
 
@@ -50,7 +49,7 @@ func NewRouter(app core.App) (*router.Router[*core.RequestEvent], error) {
 }
 
 // WrapStdHandler wraps Go [http.Handler] into a PocketBase handler func.
-func WrapStdHandler(h http.Handler) hook.HandlerFunc[*core.RequestEvent] {
+func WrapStdHandler(h http.Handler) func(*core.RequestEvent) error {
 	return func(e *core.RequestEvent) error {
 		h.ServeHTTP(e.Response, e.Request)
 		return nil
@@ -58,7 +57,7 @@ func WrapStdHandler(h http.Handler) hook.HandlerFunc[*core.RequestEvent] {
 }
 
 // WrapStdMiddleware wraps Go [func(http.Handler) http.Handle] into a PocketBase middleware func.
-func WrapStdMiddleware(m func(http.Handler) http.Handler) hook.HandlerFunc[*core.RequestEvent] {
+func WrapStdMiddleware(m func(http.Handler) http.Handler) func(*core.RequestEvent) error {
 	return func(e *core.RequestEvent) (err error) {
 		m(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			e.Response = w
@@ -99,7 +98,7 @@ func MustSubFS(fsys fs.FS, dir string) fs.FS {
 //
 //	fsys := os.DirFS("./pb_public")
 //	router.GET("/files/{path...}", apis.Static(fsys, false))
-func Static(fsys fs.FS, indexFallback bool) hook.HandlerFunc[*core.RequestEvent] {
+func Static(fsys fs.FS, indexFallback bool) func(*core.RequestEvent) error {
 	if fsys == nil {
 		panic("Static: the provided fs.FS argument is nil")
 	}

apis/dashboard.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/pocketbase/pocketbase/core"
-	"github.com/pocketbase/pocketbase/tools/hook"
 	"github.com/pocketbase/pocketbase/tools/router"
 )
 
@@ -21,7 +20,7 @@ func stripWildcard(pattern string) string {
 
 // installerRedirect redirects the user to the installer dashboard UI page
 // when the application needs some preliminary configurations to be done.
-func installerRedirect(app core.App, cpPath string) hook.HandlerFunc[*core.RequestEvent] {
+func installerRedirect(app core.App, cpPath string) func(*core.RequestEvent) error {
 	// note: to avoid locks contention it is not concurrent safe but it
 	// is expected to be updated only once during initialization
 	var hasSuperuser bool
@@ -108,7 +107,7 @@ func installerRedirect(app core.App, cpPath string) hook.HandlerFunc[*core.Reque
 //
 // Note: intended to be registered only for the dashboard route
 // to prevent excessive checks for every other route in installerRedirect.
-func dashboardRemoveInstallerParam() hook.HandlerFunc[*core.RequestEvent] {
+func dashboardRemoveInstallerParam() func(*core.RequestEvent) error {
 	return func(e *core.RequestEvent) error {
 		_, hasInstallerParam := e.Request.URL.Query()[installerParam]
 		if !hasInstallerParam {
@@ -127,7 +126,7 @@ func dashboardRemoveInstallerParam() hook.HandlerFunc[*core.RequestEvent] {
 
 // dashboardCacheControl adds default Cache-Control header for all
 // dashboard UI resources (ignoring the root index.html path)
-func dashboardCacheControl() hook.HandlerFunc[*core.RequestEvent] {
+func dashboardCacheControl() func(*core.RequestEvent) error {
 	return func(e *core.RequestEvent) error {
 		if e.Request.PathValue(StaticWildcardParam) != "" {
 			e.Response.Header().Set("Cache-Control", "max-age=1209600, stale-while-revalidate=86400")

apis/middlewares.go

@@ -81,7 +81,7 @@ func RequireAuth(optCollectionNames ...string) *hook.Handler[*core.RequestEvent]
 	}
 }
 
-func requireAuth(optCollectionNames ...string) hook.HandlerFunc[*core.RequestEvent] {
+func requireAuth(optCollectionNames ...string) func(*core.RequestEvent) error {
 	return func(e *core.RequestEvent) error {
 		if e.Auth == nil {
 			return e.UnauthorizedError("The request requires valid record authorization token.", nil)

apis/middlewares_cors.go

@@ -19,7 +19,6 @@ import (
 	"strings"
 
 	"github.com/pocketbase/pocketbase/core"
-	"github.com/pocketbase/pocketbase/tools/hook"
 )
 
 const (
@@ -125,7 +124,7 @@ var DefaultCORSConfig = CORSConfig{
 }
 
 // CORSWithConfig returns a CORS middleware with config.
-func CORSWithConfig(config CORSConfig) hook.HandlerFunc[*core.RequestEvent] {
+func CORSWithConfig(config CORSConfig) func(e *core.RequestEvent) error {
 	// Defaults
 	if len(config.AllowOrigins) == 0 {
 		config.AllowOrigins = DefaultCORSConfig.AllowOrigins

apis/middlewares_gzip.go

@@ -18,7 +18,6 @@ import (
 	"sync"
 
 	"github.com/pocketbase/pocketbase/core"
-	"github.com/pocketbase/pocketbase/tools/hook"
 	"github.com/pocketbase/pocketbase/tools/router"
 )
 
@@ -47,12 +46,12 @@ type GzipConfig struct {
 }
 
 // Gzip returns a middleware which compresses HTTP response using gzip compression scheme.
-func Gzip() hook.HandlerFunc[*core.RequestEvent] {
+func Gzip() func(*core.RequestEvent) error {
 	return GzipWithConfig(GzipConfig{})
 }
 
 // GzipWithConfig returns a middleware which compresses HTTP response using gzip compression scheme.
-func GzipWithConfig(config GzipConfig) hook.HandlerFunc[*core.RequestEvent] {
+func GzipWithConfig(config GzipConfig) func(*core.RequestEvent) error {
 	if config.Level < -2 || config.Level > 9 { // these are consts: gzip.HuffmanOnly and gzip.BestCompression
 		panic(errors.New("invalid gzip level"))
 	}