Split Create User (#50502)

* Split Create User * Use new create user and User from package user * Add service to wire * Making create user work * Replace user from user pkg * One more * Move Insert to orguser Service/Store * Remove unnecessary conversion * Cleaunp * Fix Get User and add fakes * Fixing get org id for user logic, adding fakes and other adjustments * Add some tests for ourguser service and store * Fix insert org logic * Add comment about deprecation * Fix after merge with main * Move orguser service/store to org service/store * Remove orguser from wire * Unimplement new Create user and use User from pkg user * Fix wire generation * Fix lint * Fix lint - use only User and CrateUserCommand from user pkg * Remove User and CreateUserCommand from models * Fix lint 2
2022-06-28 14:32:25 +02:00
parent 2429fe1c70
commit 6c43eb0b4d
105 changed files with 1524 additions and 701 deletions
@@ -3,6 +3,8 @@ package models
 import (
 	"errors"
 	"time"
+
+	"github.com/grafana/grafana/pkg/services/user"
 )

 // Typed errors
@@ -20,61 +22,6 @@ func (p Password) IsWeak() bool {
 	return len(p) <= 4
 }

-type User struct {
-	Id            int64
-	Version       int
-	Email         string
-	Name          string
-	Login         string
-	Password      string
-	Salt          string
-	Rands         string
-	Company       string
-	EmailVerified bool
-	Theme         string
-	HelpFlags1    HelpFlags1
-	IsDisabled    bool
-
-	IsAdmin          bool
-	IsServiceAccount bool
-	OrgId            int64
-
-	Created    time.Time
-	Updated    time.Time
-	LastSeenAt time.Time
-}
-
-func (u *User) NameOrFallback() string {
-	if u.Name != "" {
-		return u.Name
-	}
-	if u.Login != "" {
-		return u.Login
-	}
-	return u.Email
-}
-
-// ---------------------
-// COMMANDS
-
-type CreateUserCommand struct {
-	Email            string
-	Login            string
-	Name             string
-	Company          string
-	OrgId            int64
-	OrgName          string
-	Password         string
-	EmailVerified    bool
-	IsAdmin          bool
-	IsDisabled       bool
-	SkipOrgSetup     bool
-	DefaultOrgRole   string
-	IsServiceAccount bool
-
-	Result User
-}
-
 type UpdateUserCommand struct {
 	Name  string `json:"name"`
 	Email string `json:"email"`
@@ -115,17 +62,17 @@ type SetUsingOrgCommand struct {

 type GetUserByLoginQuery struct {
 	LoginOrEmail string
-	Result       *User
+	Result       *user.User
 }

 type GetUserByEmailQuery struct {
 	Email  string
-	Result *User
+	Result *user.User
 }

 type GetUserByIdQuery struct {
 	Id     int64
-	Result *User
+	Result *user.User
 }

 type GetSignedInUserQuery struct {