From 422568ae32fb7bb243a7930de46e72442493e1c8 Mon Sep 17 00:00:00 2001 From: John Olheiser <42128690+jolheiser@users.noreply.github.com> Date: Mon, 25 Feb 2019 01:08:46 -0600 Subject: [PATCH] Add MustChangePassword field to add/edit user for API (#148) Added JetBrains folder to .gitignore Signed-off-by: jolheiser --- .gitignore | 3 +++ gitea/admin_user.go | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 13e3457..42ca3ea 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ _testmain.go *.prof coverage.out + +# JetBrains +.idea diff --git a/gitea/admin_user.go b/gitea/admin_user.go index 089ff29..3e4c5f9 100644 --- a/gitea/admin_user.go +++ b/gitea/admin_user.go @@ -1,4 +1,5 @@ // Copyright 2015 The Gogs Authors. All rights reserved. +// Copyright 2019 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. @@ -21,8 +22,9 @@ type CreateUserOption struct { // swagger:strfmt email Email string `json:"email" binding:"Required;Email;MaxSize(254)"` // required: true - Password string `json:"password" binding:"Required;MaxSize(255)"` - SendNotify bool `json:"send_notify"` + Password string `json:"password" binding:"Required;MaxSize(255)"` + MustChangePassword bool `json:"must_change_password"` + SendNotify bool `json:"send_notify"` } // AdminCreateUser create a user @@ -44,6 +46,7 @@ type EditUserOption struct { // swagger:strfmt email Email string `json:"email" binding:"Required;Email;MaxSize(254)"` Password string `json:"password" binding:"MaxSize(255)"` + MustChangePassword bool `json:"must_change_password"` Website string `json:"website" binding:"MaxSize(50)"` Location string `json:"location" binding:"MaxSize(50)"` Active *bool `json:"active"`