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
@@ -0,0 +1,62 @@
+package userimpl
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/events"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/sqlstore/db"
+	"github.com/grafana/grafana/pkg/services/user"
+)
+
+type store interface {
+	Insert(context.Context, *user.User) (int64, error)
+	Get(context.Context, *user.User) (*user.User, error)
+}
+
+type sqlStore struct {
+	db db.DB
+}
+
+func (ss *sqlStore) Insert(ctx context.Context, cmd *user.User) (int64, error) {
+	var userID int64
+	var err error
+	err = ss.db.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
+		sess.UseBool("is_admin")
+
+		if userID, err = sess.Insert(cmd); err != nil {
+			return err
+		}
+		sess.PublishAfterCommit(&events.UserCreated{
+			Timestamp: cmd.Created,
+			Id:        cmd.ID,
+			Name:      cmd.Name,
+			Login:     cmd.Login,
+			Email:     cmd.Email,
+		})
+		return nil
+	})
+	if err != nil {
+		return 0, err
+	}
+	return userID, nil
+}
+
+func (ss *sqlStore) Get(ctx context.Context, cmd *user.User) (*user.User, error) {
+	var usr *user.User
+	err := ss.db.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
+		exists, err := sess.Where("email=? OR login=?", cmd.Email, cmd.Login).Get(&user.User{})
+		if !exists {
+			return models.ErrUserNotFound
+		}
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+	return usr, nil
+}
@@ -0,0 +1,57 @@
+package userimpl
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/user"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestIntegrationUserDataAccess(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	ss := sqlstore.InitTestDB(t)
+	userStore := sqlStore{db: ss}
+
+	t.Run("user not found", func(t *testing.T) {
+		_, err := userStore.Get(context.Background(),
+			&user.User{
+				Email: "test@email.com",
+				Name:  "test1",
+				Login: "test1",
+			},
+		)
+		require.Error(t, err, models.ErrUserNotFound)
+	})
+
+	t.Run("insert user", func(t *testing.T) {
+		_, err := userStore.Insert(context.Background(),
+			&user.User{
+				Email:   "test@email.com",
+				Name:    "test1",
+				Login:   "test1",
+				Created: time.Now(),
+				Updated: time.Now(),
+			},
+		)
+		require.NoError(t, err)
+	})
+
+	t.Run("get user", func(t *testing.T) {
+		_, err := userStore.Get(context.Background(),
+			&user.User{
+				Email: "test@email.com",
+				Name:  "test1",
+				Login: "test1",
+			},
+		)
+		require.NoError(t, err)
+	})
+}
@@ -0,0 +1,121 @@
+package userimpl
+
+import (
+	"context"
+	"errors"
+	"time"
+
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/sqlstore/db"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+type Service struct {
+	store      store
+	orgService org.Service
+}
+
+func ProvideService(db db.DB, orgService org.Service) user.Service {
+	return &Service{
+		store: &sqlStore{
+			db: db,
+		},
+		orgService: orgService,
+	}
+}
+
+func (s *Service) Create(ctx context.Context, cmd *user.CreateUserCommand) (*user.User, error) {
+	cmdOrg := org.GetOrgIDForNewUserCommand{
+		Email:        cmd.Email,
+		Login:        cmd.Login,
+		OrgID:        cmd.OrgID,
+		OrgName:      cmd.OrgName,
+		SkipOrgSetup: cmd.SkipOrgSetup,
+	}
+	orgID, err := s.orgService.GetIDForNewUser(ctx, cmdOrg)
+	cmd.OrgID = orgID
+	if err != nil {
+		return nil, err
+	}
+
+	if cmd.Email == "" {
+		cmd.Email = cmd.Login
+	}
+	usr := &user.User{
+		Login: cmd.Login,
+		Email: cmd.Email,
+	}
+	usr, err = s.store.Get(ctx, usr)
+	if err != nil && !errors.Is(err, models.ErrUserNotFound) {
+		return usr, err
+	}
+
+	// create user
+	usr = &user.User{
+		Email:            cmd.Email,
+		Name:             cmd.Name,
+		Login:            cmd.Login,
+		Company:          cmd.Company,
+		IsAdmin:          cmd.IsAdmin,
+		IsDisabled:       cmd.IsDisabled,
+		OrgID:            cmd.OrgID,
+		EmailVerified:    cmd.EmailVerified,
+		Created:          time.Now(),
+		Updated:          time.Now(),
+		LastSeenAt:       time.Now().AddDate(-10, 0, 0),
+		IsServiceAccount: cmd.IsServiceAccount,
+	}
+
+	salt, err := util.GetRandomString(10)
+	if err != nil {
+		return nil, err
+	}
+	usr.Salt = salt
+	rands, err := util.GetRandomString(10)
+	if err != nil {
+		return nil, err
+	}
+	usr.Rands = rands
+
+	if len(cmd.Password) > 0 {
+		encodedPassword, err := util.EncodePassword(cmd.Password, usr.Salt)
+		if err != nil {
+			return nil, err
+		}
+		usr.Password = encodedPassword
+	}
+
+	_, err = s.store.Insert(ctx, usr)
+	if err != nil {
+		return nil, err
+	}
+
+	// create org user link
+	if !cmd.SkipOrgSetup {
+		orgUser := org.OrgUser{
+			OrgID:   orgID,
+			UserID:  usr.ID,
+			Role:    org.ROLE_ADMIN,
+			Created: time.Now(),
+			Updated: time.Now(),
+		}
+
+		if setting.AutoAssignOrg && !usr.IsAdmin {
+			if len(cmd.DefaultOrgRole) > 0 {
+				orgUser.Role = org.RoleType(cmd.DefaultOrgRole)
+			} else {
+				orgUser.Role = org.RoleType(setting.AutoAssignOrgRole)
+			}
+		}
+		_, err = s.orgService.InsertUser(ctx, &orgUser)
+		if err != nil {
+			//  HERE ADD DELETE USER
+			return usr, err
+		}
+	}
+
+	return usr, nil
+}
@@ -0,0 +1,41 @@
+package userimpl
+
+import (
+	"context"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/services/org/orgtest"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/stretchr/testify/require"
+)
+
+func TestUserService(t *testing.T) {
+	userStore := newUserStoreFake()
+	orgService := orgtest.NewOrgServiceFake()
+	userService := Service{
+		store:      userStore,
+		orgService: orgService,
+	}
+
+	t.Run("create user", func(t *testing.T) {
+		_, err := userService.Create(context.Background(), &user.CreateUserCommand{})
+		require.NoError(t, err)
+	})
+}
+
+type FakeUserStore struct {
+	ExpectedUser  *user.User
+	ExpectedError error
+}
+
+func newUserStoreFake() *FakeUserStore {
+	return &FakeUserStore{}
+}
+
+func (f *FakeUserStore) Get(ctx context.Context, query *user.User) (*user.User, error) {
+	return f.ExpectedUser, f.ExpectedError
+}
+
+func (f *FakeUserStore) Insert(ctx context.Context, query *user.User) (int64, error) {
+	return 0, f.ExpectedError
+}