From 66e9acc6510a22b1436ab95a9de362b3859daf47 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 24 May 2022 16:09:17 +0200 Subject: [PATCH] Use utlis function to void nil pointer panics Co-authored-by: kobergj --- extensions/graph/pkg/middleware/auth.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/extensions/graph/pkg/middleware/auth.go b/extensions/graph/pkg/middleware/auth.go index 8d64b70f2ad..98117b32b36 100644 --- a/extensions/graph/pkg/middleware/auth.go +++ b/extensions/graph/pkg/middleware/auth.go @@ -74,10 +74,8 @@ func Auth(opts ...account.Option) func(http.Handler) http.Handler { ctx = revactx.ContextSetToken(ctx, t) ctx = revactx.ContextSetUser(ctx, u) ctx = gmmetadata.Set(ctx, opkgm.AccountID, u.Id.OpaqueId) - if u.Opaque != nil { - if roles, ok := u.Opaque.Map["roles"]; ok { - ctx = gmmetadata.Set(ctx, opkgm.RoleIDs, string(roles.Value)) - } + if role := utils.ReadPlainFromOpaque(ctx, u.Opaque, "roles"); role != "" { + ctx = gmmetadata.Set(ctx, opkgm.RoleIDs, role) } ctx = metadata.AppendToOutgoingContext(ctx, revactx.TokenHeader, t)