clean up duplicated user creation code (#50178) (#50327)

* clean up duplicated user creation code * remove unused duplicate getOrCreateOrg function * fix up tests (cherry picked from commit 9350ab781c)
2022-06-13 07:12:00 -04:00
parent 5390fa57e9
commit bc2f941004
12 changed files with 49 additions and 217 deletions
@@ -173,12 +173,12 @@ func (ss *SQLStore) ensureMainOrgAndAdminUser() error {
 		// ensure admin user
 		if !ss.Cfg.DisableInitAdminCreation {
 			ss.log.Debug("Creating default admin user")
-			if _, err := ss.createUser(ctx, sess, userCreationArgs{
+			if _, err := ss.createUser(ctx, sess, models.CreateUserCommand{
 				Login:    ss.Cfg.AdminUser,
 				Email:    ss.Cfg.AdminUser + "@localhost",
 				Password: ss.Cfg.AdminPassword,
 				IsAdmin:  true,
-			}, false); err != nil {
+			}); err != nil {
 				return fmt.Errorf("failed to create admin user: %s", err)
 			}