Use utlis function to void nil pointer panics

Co-authored-by: kobergj <[email protected]>
owncloud · May 24, 2022 · 40b484a · 40b484a
1 parent 0eea228
commit 40b484a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/extensions/graph/pkg/middleware/auth.go b/extensions/graph/pkg/middleware/auth.go
@@ -6,6 +6,7 @@ import (
 	"github.com/cs3org/reva/v2/pkg/auth/scope"
 	revactx "github.com/cs3org/reva/v2/pkg/ctx"
 	"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
+	"github.com/cs3org/reva/v2/pkg/utils"
 	"github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode"
 	"github.com/owncloud/ocis/v2/ocis-pkg/account"
 	opkgm "github.com/owncloud/ocis/v2/ocis-pkg/middleware"
@@ -74,10 +75,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(u.Opaque, "roles"); role != "" {
+				ctx = gmmetadata.Set(ctx, opkgm.RoleIDs, role)
 			}
 			ctx = metadata.AppendToOutgoingContext(ctx, revactx.TokenHeader, t)