From 12fa5d2c3e3cdb433a2dbb3e17b6953d22a7428a Mon Sep 17 00:00:00 2001 From: Alex Guerrieri Date: Thu, 31 Oct 2024 18:52:16 +0100 Subject: [PATCH] move to the top --- middleware.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/middleware.go b/middleware.go index dfd2062..a7486c6 100644 --- a/middleware.go +++ b/middleware.go @@ -88,12 +88,6 @@ func Session[T any](cfg Options[T]) func(next http.Handler) http.Handler { return } - serviceClaim, _ := claims["service"].(string) - accountClaim, _ := claims["account"].(string) - adminClaim, _ := claims["admin"].(bool) - projectClaim, _ := claims["project"].(float64) - - // Origin check if originClaim, _ := claims["ogn"].(string); originClaim != "" { originClaim = strings.TrimSuffix(originClaim, "/") originHeader := strings.TrimSuffix(r.Header.Get("Origin"), "/") @@ -103,6 +97,11 @@ func Session[T any](cfg Options[T]) func(next http.Handler) http.Handler { } } + serviceClaim, _ := claims["service"].(string) + accountClaim, _ := claims["account"].(string) + adminClaim, _ := claims["admin"].(bool) + projectClaim, _ := claims["project"].(float64) + switch { case serviceClaim != "": ctx = WithService(ctx, serviceClaim)