domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Adds MustChangePassword to user create/edit API, defaults to true (#6193)

Browse source 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
This commit is contained in:
John Olheiser 2019-02-27 13:37:57 -06:00 • committed by Lauris BH
parent b1ffe7e47b
commit 7548037a64
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
routers/api/v1/admin/user.go
View file

@ -56,12 +56,16 @@ func CreateUser(ctx *context.APIContext, form api.CreateUserOption) {
// "422":
// "$ref": "#/responses/validationError"
u := &models.User{
Name: form.Username,
FullName: form.FullName,
Email: form.Email,
Passwd: form.Password,
IsActive: true,
LoginType: models.LoginPlain,
Name: form.Username,
FullName: form.FullName,
Email: form.Email,
Passwd: form.Password,
MustChangePassword: true,
IsActive: true,
LoginType: models.LoginPlain,
}
if form.MustChangePassword != nil {
u.MustChangePassword = *form.MustChangePassword
}
parseLoginSource(ctx, u, form.SourceID, form.LoginName)
@ -135,6 +139,10 @@ func EditUser(ctx *context.APIContext, form api.EditUserOption) {
u.HashPassword(form.Password)
}
if form.MustChangePassword != nil {
u.MustChangePassword = *form.MustChangePassword
}
u.LoginName = form.LoginName
u.FullName = form.FullName
u.Email = form.Email