fix: access token being sent for all resolvers

ericzorn93 · Jan 6, 2025 · 10e3791 · 10e3791
1 parent 6650d30
commit 10e3791
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/apps/services/accounts-graphql/internal/graph/resolvers/accounts.resolvers.go b/apps/services/accounts-graphql/internal/graph/resolvers/accounts.resolvers.go
diff --git a/libs/backend/auth/context.go b/libs/backend/auth/context.go
@@ -18,13 +18,13 @@ type authMiddlewareContextKey struct{}
 // AuthMiddlewareContextKey will be used to obtain and set context auth
 var AuthMiddlewareContextKey authMiddlewareContextKey = authMiddlewareContextKey{}
 
-// SetClaims will assign the custom claims to the conext
-func SetClaims(ctx context.Context, claims *validator.ValidatedClaims) context.Context {
+// SetClaimsToContext will assign the custom claims to the conext
+func SetClaimsToContext(ctx context.Context, claims *validator.ValidatedClaims) context.Context {
 	return context.WithValue(ctx, ClaimsKey, claims.CustomClaims.(*CustomClaims))
 }
 
-// GetClaims will pull the custom claims out of the context
-func GetClaims(ctx context.Context) (*CustomClaims, error) {
+// GetClaimsFromContext will pull the custom claims out of the context
+func GetClaimsFromContext(ctx context.Context) (*CustomClaims, error) {
 	claims := ctx.Value(ClaimsKey)
 	customClaimsValidated, ok := claims.(*CustomClaims)
 

diff --git a/libs/backend/auth/interceptors.go b/libs/backend/auth/interceptors.go
@@ -63,7 +63,8 @@ func (a AuthInerceptor) Incoming() connect.UnaryInterceptorFunc {
 				)
 			}
 
-			ctx = SetClaims(ctx, claims.(*validator.ValidatedClaims))
+			// Set the validated custom claims to the context
+			ctx = SetClaimsToContext(ctx, claims.(*validator.ValidatedClaims))
 
 			return next(ctx, req)
 		})