Auth: Refactor auth package (#58920)

* Auth: move interface to its own file

* Auth: move to test package

* Auth: move quota consts to auth file

* Auth: move service to impl package

* Auth: move interfaces and related models to auth package

* Auth: Create sub package and type alias to avoid circular dependency

pkg/models/context.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/models/usertoken"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
@@ -15,7 +16,7 @@ import (
 type ReqContext struct {
 	*web.Context
 	*user.SignedInUser
-	UserToken *UserToken
+	UserToken *usertoken.UserToken
 
 	IsSignedIn     bool
 	IsRenderCall   bool

pkg/models/user_token.go

@@ -1,81 +0,0 @@
-package models
-
-import (
-	"context"
-	"errors"
-	"net"
-
-	"github.com/grafana/grafana/pkg/registry"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-// Typed errors
-var (
-	ErrUserTokenNotFound = errors.New("user token not found")
-)
-
-// CreateTokenErr represents a token creation error; used in Enterprise
-type CreateTokenErr struct {
-	StatusCode  int
-	InternalErr error
-	ExternalErr string
-}
-
-func (e *CreateTokenErr) Error() string {
-	if e.InternalErr != nil {
-		return e.InternalErr.Error()
-	}
-	return "failed to create token"
-}
-
-type TokenExpiredError struct {
-	UserID  int64
-	TokenID int64
-}
-
-func (e *TokenExpiredError) Error() string { return "user token expired" }
-
-type TokenRevokedError struct {
-	UserID                int64
-	TokenID               int64
-	MaxConcurrentSessions int64
-}
-
-func (e *TokenRevokedError) Error() string { return "user token revoked" }
-
-// UserToken represents a user token
-type UserToken struct {
-	Id            int64
-	UserId        int64
-	AuthToken     string
-	PrevAuthToken string
-	UserAgent     string
-	ClientIp      string
-	AuthTokenSeen bool
-	SeenAt        int64
-	RotatedAt     int64
-	CreatedAt     int64
-	UpdatedAt     int64
-	RevokedAt     int64
-	UnhashedToken string
-}
-
-type RevokeAuthTokenCmd struct {
-	AuthTokenId int64 `json:"authTokenId"`
-}
-
-// UserTokenService are used for generating and validating user tokens
-type UserTokenService interface {
-	CreateToken(ctx context.Context, user *user.User, clientIP net.IP, userAgent string) (*UserToken, error)
-	LookupToken(ctx context.Context, unhashedToken string) (*UserToken, error)
-	TryRotateToken(ctx context.Context, token *UserToken, clientIP net.IP, userAgent string) (bool, error)
-	RevokeToken(ctx context.Context, token *UserToken, soft bool) error
-	RevokeAllUserTokens(ctx context.Context, userId int64) error
-	GetUserToken(ctx context.Context, userId, userTokenId int64) (*UserToken, error)
-	GetUserTokens(ctx context.Context, userId int64) ([]*UserToken, error)
-	GetUserRevokedTokens(ctx context.Context, userId int64) ([]*UserToken, error)
-}
-
-type UserTokenBackgroundService interface {
-	registry.BackgroundService
-}

pkg/models/usertoken/user_token.go

@@ -0,0 +1,26 @@
+package usertoken
+
+type TokenRevokedError struct {
+	UserID                int64
+	TokenID               int64
+	MaxConcurrentSessions int64
+}
+
+func (e *TokenRevokedError) Error() string { return "user token revoked" }
+
+// UserToken represents a user token
+type UserToken struct {
+	Id            int64
+	UserId        int64
+	AuthToken     string
+	PrevAuthToken string
+	UserAgent     string
+	ClientIp      string
+	AuthTokenSeen bool
+	SeenAt        int64
+	RotatedAt     int64
+	CreatedAt     int64
+	UpdatedAt     int64
+	RevokedAt     int64
+	UnhashedToken string
+}