IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Sessions: Remove invalid session cookie if it's invalid/expired/missing (#59556)

Browse Source 
only remove invalid session cookie if it's invalid/expired/missing
This commit is contained in:
Jo
2022-11-30 14:33:19 +00:00
committed by GitHub
parent 10a83714c8
commit fee50be1bb
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/services/auth/auth.go
View File

@@ -3,6 +3,7 @@ package auth
import (
"context"
"errors"
"fmt"
"net"
"github.com/grafana/grafana/pkg/models/usertoken"
@@ -18,10 +19,14 @@ const (
// Typed errors
var (
ErrUserTokenNotFound = errors.New("user token not found")
ErrUserTokenNotFound = errors.New("user token not found")
ErrInvalidSessionToken = usertoken.ErrInvalidSessionToken
)
type TokenRevokedError = usertoken.TokenRevokedError
type (
TokenRevokedError = usertoken.TokenRevokedError
UserToken = usertoken.UserToken
)
// CreateTokenErr represents a token creation error; used in Enterprise
type CreateTokenErr struct {
@@ -42,9 +47,11 @@ type TokenExpiredError struct {
TokenID int64
}
func (e *TokenExpiredError) Error() string { return "user token expired" }
func (e *TokenExpiredError) Unwrap() error { return ErrInvalidSessionToken }
type UserToken = usertoken.UserToken
func (e *TokenExpiredError) Error() string {
return fmt.Sprintf("%s: user token expired", ErrInvalidSessionToken)
}
type RevokeAuthTokenCmd struct {
AuthTokenId int64 `json:"authTokenId"`