pass context as argument to Config.Get (#30)

0xsequence · Nov 29, 2024 · 3a60b41 · 3a60b41
1 parent 724a470
commit 3a60b41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/common.go b/common.go
@@ -61,7 +61,7 @@ type ProjectStore interface {
 type Config[T any] map[string]map[string]T
 
 // Get returns the config value for the given request.
-func (c Config[T]) Get(path string) (v T, err error) {
+func (c Config[T]) Get(_ context.Context, path string) (v T, err error) {
 	if c == nil {
 		return v, fmt.Errorf("config is nil")
 	}

diff --git a/middleware.go b/middleware.go
@@ -221,13 +221,14 @@ func AccessControl(acl Config[ACL], cfg Options) func(next http.Handler) http.Ha
 
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			acl, err := acl.Get(r.URL.Path)
+			ctx := r.Context()
+			acl, err := acl.Get(ctx, r.URL.Path)
 			if err != nil {
 				cfg.ErrHandler(r, w, proto.ErrUnauthorized.WithCausef("get acl: %w", err))
 				return
 			}
 
-			if session, _ := GetSessionType(r.Context()); !acl.Includes(session) {
+			if session, _ := GetSessionType(ctx); !acl.Includes(session) {
 				err := proto.ErrPermissionDenied
 				if session == proto.SessionType_Public {
 					err = proto.ErrUnauthorized