public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Authlib: Use types package rather than claims (#99243)

Browse Source
This commit is contained in:
Ryan McKinley
2025-01-21 12:06:55 +03:00
committed by GitHub
parent b2d0359e72
commit 680e6bc1f8
149 changed files with 394 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/resource/grpc/authenticator.go
+4 -5
View File
@@ -9,8 +9,7 @@ import (
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
authClaims "github.com/grafana/authlib/claims"
"github.com/grafana/authlib/types"
"github.com/grafana/grafana/pkg/apimachinery/identity"
"github.com/grafana/grafana/pkg/infra/tracing"
)
@@ -74,7 +73,7 @@ func (f *Authenticator) decodeMetadata(meta metadata.MD) (identity.Requester, er
// TODO, remove after this has been deployed to unified storage
if getter(mdUserID) == "" {
var err error
user.Type = authClaims.TypeUser
user.Type = types.TypeUser
user.UserID, err = strconv.ParseInt(getter("grafana-userid"), 10, 64)
if err != nil {
return nil, status.Error(codes.Unauthenticated, "invalid user id")
@@ -86,7 +85,7 @@ func (f *Authenticator) decodeMetadata(meta metadata.MD) (identity.Requester, er
return user, nil
}
typ, id, err := authClaims.ParseTypeID(getter(mdUserID))
typ, id, err := types.ParseTypeID(getter(mdUserID))
if err != nil {
return nil, status.Error(codes.Unauthenticated, "invalid user id")
}
@@ -96,7 +95,7 @@ func (f *Authenticator) decodeMetadata(meta metadata.MD) (identity.Requester, er
return nil, status.Error(codes.Unauthenticated, "invalid user id")
}
_, uid, err := authClaims.ParseTypeID(getter(mdUserUID))
_, uid, err := types.ParseTypeID(getter(mdUserUID))
if err != nil {
return nil, status.Error(codes.Unauthenticated, "invalid user uid")
}