public/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-22 20:00:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Enforce system defaults in CreateUser

Browse Source 
Allow for overwrites with CreateUserOverwriteOptions
This commit is contained in:
Jimmy Praet
2022-04-02 11:57:41 +02:00
parent 9020faa3ce
commit 1f8710eea1
15 changed files with 139 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/admin.go
View File

@@ -25,6 +25,7 @@ import (
repo_module "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/storage"
"code.gitea.io/gitea/modules/util"
auth_service "code.gitea.io/gitea/services/auth"
"code.gitea.io/gitea/services/auth/source/oauth2"
"code.gitea.io/gitea/services/auth/source/smtp"
@@ -563,13 +564,15 @@ func runCreateUser(c *cli.Context) error {
Name: username,
Email: c.String("email"),
Passwd: password,
IsActive: true,
IsAdmin: c.Bool("admin"),
MustChangePassword: changePassword,
Theme: setting.UI.DefaultTheme,
}
if err := user_model.CreateUser(u); err != nil {
overwriteDefault := &user_model.CreateUserOverwriteOptions{
IsActive: util.OptionalBoolTrue,
}
if err := user_model.CreateUser(u, overwriteDefault); err != nil {
return fmt.Errorf("CreateUser: %v", err)
}