Auth: use IdentityType from authlib (#91763)

This commit is contained in:
Ryan McKinley
2024-08-12 09:26:53 +03:00
committed by GitHub
parent faf7cb9312
commit 21d4a4f49e
70 changed files with 230 additions and 212 deletions
+7 -7
View File
@@ -99,7 +99,7 @@ func (i *Identity) GetInternalID() (int64, error) {
}
// GetIdentityType implements Requester.
func (i *Identity) GetIdentityType() identity.IdentityType {
func (i *Identity) GetIdentityType() claims.IdentityType {
return i.UID.Type()
}
@@ -243,9 +243,9 @@ func (i *Identity) HasRole(role org.RoleType) bool {
func (i *Identity) HasUniqueId() bool {
typ := i.GetID().Type()
return typ == identity.TypeUser ||
typ == identity.TypeServiceAccount ||
typ == identity.TypeAPIKey
return typ == claims.TypeUser ||
typ == claims.TypeServiceAccount ||
typ == claims.TypeAPIKey
}
func (i *Identity) IsAuthenticatedBy(providers ...string) bool {
@@ -273,7 +273,7 @@ func (i *Identity) SignedInUser() *user.SignedInUser {
AuthID: i.AuthID,
AuthenticatedBy: i.AuthenticatedBy,
IsGrafanaAdmin: i.GetIsGrafanaAdmin(),
IsAnonymous: i.ID.IsType(identity.TypeAnonymous),
IsAnonymous: i.ID.IsType(claims.TypeAnonymous),
IsDisabled: i.IsDisabled,
HelpFlags1: i.HelpFlags1,
LastSeenAt: i.LastSeenAt,
@@ -283,14 +283,14 @@ func (i *Identity) SignedInUser() *user.SignedInUser {
FallbackType: i.ID.Type(),
}
if i.ID.IsType(identity.TypeAPIKey) {
if i.ID.IsType(claims.TypeAPIKey) {
id, _ := i.ID.ParseInt()
u.ApiKeyID = id
} else {
id, _ := i.ID.UserID()
u.UserID = id
u.UserUID = i.UID.ID()
u.IsServiceAccount = i.ID.IsType(identity.TypeServiceAccount)
u.IsServiceAccount = i.ID.IsType(claims.TypeServiceAccount)
}
return u