chore: move user_auth models to (mostly) login service (#62269)

* chore: move user_auth models to (mostly) login service
2026-09-05 04:40:13 -05:00 · 2023-01-27 13:36:54 -05:00
parent 4563111180
commit 9256a520a4
57 changed files with 583 additions and 603 deletions
@@ -1,138 +0,0 @@
-package models
-
-import (
-	"fmt"
-	"time"
-
-	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
-
-	"golang.org/x/oauth2"
-)
-
-type UserAuth struct {
-	Id                int64
-	UserId            int64
-	AuthModule        string
-	AuthId            string
-	Created           time.Time
-	OAuthAccessToken  string
-	OAuthRefreshToken string
-	OAuthIdToken      string
-	OAuthTokenType    string
-	OAuthExpiry       time.Time
-}
-
-type ExternalUserInfo struct {
-	OAuthToken     *oauth2.Token
-	AuthModule     string
-	AuthId         string
-	UserId         int64
-	Email          string
-	Login          string
-	Name           string
-	Groups         []string
-	OrgRoles       map[int64]org.RoleType
-	IsGrafanaAdmin *bool // This is a pointer to know if we should sync this or not (nil = ignore sync)
-	IsDisabled     bool
-	SkipTeamSync   bool
-}
-
-func (e *ExternalUserInfo) String() string {
-	return fmt.Sprintf("%+v", *e)
-}
-
-type LoginInfo struct {
-	AuthModule    string
-	User          *user.User
-	ExternalUser  ExternalUserInfo
-	LoginUsername string
-	HTTPStatus    int
-	Error         error
-}
-
-// RequestURIKey is used as key to save request URI in contexts
-// (used for the Enterprise auditing feature)
-type RequestURIKey struct{}
-
-// ---------------------
-// COMMANDS
-
-type UpsertUserCommand struct {
-	ReqContext   *contextmodel.ReqContext
-	ExternalUser *ExternalUserInfo
-	UserLookupParams
-	SignupAllowed bool
-
-	Result *user.User
-}
-
-type SetAuthInfoCommand struct {
-	AuthModule string
-	AuthId     string
-	UserId     int64
-	OAuthToken *oauth2.Token
-}
-
-type UpdateAuthInfoCommand struct {
-	AuthModule string
-	AuthId     string
-	UserId     int64
-	OAuthToken *oauth2.Token
-}
-
-type DeleteAuthInfoCommand struct {
-	UserAuth *UserAuth
-}
-
-// ----------------------
-// QUERIES
-
-type LoginUserQuery struct {
-	ReqContext *contextmodel.ReqContext
-	Username   string
-	Password   string
-	User       *user.User
-	IpAddress  string
-	AuthModule string
-	Cfg        *setting.Cfg
-}
-
-type GetUserByAuthInfoQuery struct {
-	AuthModule string
-	AuthId     string
-	UserLookupParams
-}
-
-type UserLookupParams struct {
-	// Describes lookup order as well
-	UserID *int64  // if set, will try to find the user by id
-	Email  *string // if set, will try to find the user by email
-	Login  *string // if set, will try to find the user by login
-}
-
-type GetExternalUserInfoByLoginQuery struct {
-	LoginOrEmail string
-
-	Result *ExternalUserInfo
-}
-
-type GetAuthInfoQuery struct {
-	UserId     int64
-	AuthModule string
-	AuthId     string
-
-	Result *UserAuth
-}
-
-type GetUserLabelsQuery struct {
-	UserIDs []int64
-}
-
-type TeamOrgGroupDTO struct {
-	TeamName string `json:"teamName"`
-	OrgName  string `json:"orgName"`
-	GroupDN  string `json:"groupDN"`
-}