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,78 @@
+package orgimpl
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/sqlstore/db"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+type Service struct {
+	store store
+	cfg   *setting.Cfg
+	log   log.Logger
+}
+
+func ProvideService(db db.DB, cfg *setting.Cfg) org.Service {
+	return &Service{
+		store: &sqlStore{
+			db:      db,
+			dialect: db.GetDialect(),
+		},
+		cfg: cfg,
+		log: log.New("org service"),
+	}
+}
+
+func (s *Service) GetIDForNewUser(ctx context.Context, cmd org.GetOrgIDForNewUserCommand) (int64, error) {
+	var orga org.Org
+	if cmd.SkipOrgSetup {
+		return -1, nil
+	}
+
+	if setting.AutoAssignOrg && cmd.OrgID != 0 {
+		_, err := s.store.Get(ctx, cmd.OrgID)
+		if err != nil {
+			return -1, err
+		}
+		return cmd.OrgID, nil
+	}
+
+	orgName := cmd.OrgName
+	if len(orgName) == 0 {
+		orgName = util.StringsFallback2(cmd.Email, cmd.Login)
+	}
+
+	if setting.AutoAssignOrg {
+		orga, err := s.store.Get(ctx, int64(s.cfg.AutoAssignOrgId))
+		if err != nil {
+			return 0, err
+		}
+		if orga.ID != 0 {
+			return orga.ID, nil
+		}
+		if setting.AutoAssignOrgId != 1 {
+			s.log.Error("Could not create user: organization ID does not exist", "orgID",
+				setting.AutoAssignOrgId)
+			return 0, fmt.Errorf("could not create user: organization ID %d does not exist",
+				setting.AutoAssignOrgId)
+		}
+		orga.Name = MainOrgName
+		orga.ID = int64(setting.AutoAssignOrgId)
+	} else {
+		orga.Name = orgName
+	}
+	orga.Created = time.Now()
+	orga.Updated = time.Now()
+
+	return s.store.Insert(ctx, &orga)
+}
+
+func (s *Service) InsertUser(ctx context.Context, orguser *org.OrgUser) (int64, error) {
+	return s.store.InsertUser(ctx, orguser)
+}