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

ApiKeyGenPrefix: rename package (#65623)

Browse Source 
* Rename package to satokengen to make it clearer that it is for service
account tokens
This commit is contained in:
Karl Persson
2023-03-30 17:04:10 +02:00
committed by GitHub
parent 3cd3bb00ec
commit e4d998dc1a
13 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/authn/clients/api_key.go
+3 -3
View File
@@ -7,7 +7,7 @@ import (
"time"
"github.com/grafana/grafana/pkg/components/apikeygen"
apikeygenprefix "github.com/grafana/grafana/pkg/components/apikeygenprefixed"
"github.com/grafana/grafana/pkg/components/satokengen"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/apikey"
"github.com/grafana/grafana/pkg/services/authn"
@@ -85,7 +85,7 @@ func (s *APIKey) Authenticate(ctx context.Context, r *authn.Request) (*authn.Ide
func (s *APIKey) getAPIKey(ctx context.Context, token string) (*apikey.APIKey, error) {
fn := s.getFromToken
if !strings.HasPrefix(token, apikeygenprefix.GrafanaPrefix) {
if !strings.HasPrefix(token, satokengen.GrafanaPrefix) {
fn = s.getFromTokenLegacy
}
@@ -98,7 +98,7 @@ func (s *APIKey) getAPIKey(ctx context.Context, token string) (*apikey.APIKey, e
}
func (s *APIKey) getFromToken(ctx context.Context, token string) (*apikey.APIKey, error) {
decoded, err := apikeygenprefix.Decode(token)
decoded, err := satokengen.Decode(token)
if err != nil {
return nil, err
}