move to the top

0xsequence · Oct 31, 2024 · 12fa5d2 · 12fa5d2
1 parent a735f66
commit 12fa5d2
Showing 1 changed file with 5 additions and 6 deletions.
diff --git 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)