From 2c5edbdb307cd66919f40486cc9b8d9200e1a77b Mon Sep 17 00:00:00 2001 From: Bwko Date: Sun, 9 Jul 2017 01:44:02 +0200 Subject: [PATCH 1/2] Add option to change username to the admin panel --- integrations/admin_user_test.go | 81 +++++++++++++++++++++++++++++++++ modules/auth/admin.go | 1 + public/js/index.js | 2 + routers/admin/users.go | 8 ++++ templates/admin/user/edit.tmpl | 4 +- 5 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 integrations/admin_user_test.go diff --git a/integrations/admin_user_test.go b/integrations/admin_user_test.go new file mode 100644 index 0000000000000..14e3596b96d8a --- /dev/null +++ b/integrations/admin_user_test.go @@ -0,0 +1,81 @@ +// Copyright 2017 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. + +package integrations + +import ( + "net/http" + "strconv" + "testing" + + "code.gitea.io/gitea/models" + "github.com/stretchr/testify/assert" +) + +func TestAdminViewUsers(t *testing.T) { + prepareTestEnv(t) + + session := loginUser(t, "user1") + req := NewRequest(t, "GET", "/admin/users") + session.MakeRequest(t, req, http.StatusOK) + + session = loginUser(t, "user2") + req = NewRequest(t, "GET", "/admin/users") + session.MakeRequest(t, req, http.StatusForbidden) +} + +func TestAdminViewUser(t *testing.T) { + prepareTestEnv(t) + + session := loginUser(t, "user1") + req := NewRequest(t, "GET", "/admin/users/1") + session.MakeRequest(t, req, http.StatusOK) + + session = loginUser(t, "user2") + req = NewRequest(t, "GET", "/admin/users/1") + session.MakeRequest(t, req, http.StatusForbidden) +} + +func TestAdminEditUser(t *testing.T) { + prepareTestEnv(t) + + testSuccessfullEdit(t, models.User{ID: 2, Name: "newusername", LoginName: "otherlogin", Email: "new@e-mail.gitea"}) +} + +func testSuccessfullEdit(t *testing.T, formData models.User) { + makeRequest(t, formData, http.StatusFound) +} + +func makeRequest(t *testing.T, formData models.User, headerCode int) { + session := loginUser(t, "user1") + csrf := GetCSRF(t, session, "/admin/users/"+strconv.Itoa(int(formData.ID))) + req := NewRequestWithValues(t, "POST", "/admin/users/"+strconv.Itoa(int(formData.ID)), map[string]string{ + "_csrf": csrf, + "user_name": formData.Name, + "login_name": formData.LoginName, + "login_type": "0-0", + "email": formData.Email, + }) + + session.MakeRequest(t, req, headerCode) + user := models.AssertExistsAndLoadBean(t, &models.User{ID: formData.ID}).(*models.User) + assert.Equal(t, formData.Name, user.Name) + assert.Equal(t, formData.LoginName, user.LoginName) + assert.Equal(t, formData.Email, user.Email) +} + +func TestAdminDeleteUser(t *testing.T) { + prepareTestEnv(t) + + session := loginUser(t, "user1") + + csrf := GetCSRF(t, session, "/admin/users/8") + req := NewRequestWithValues(t, "POST", "/admin/users/8/delete", map[string]string{ + "_csrf": csrf, + }) + session.MakeRequest(t, req, http.StatusOK) + + models.AssertNotExistsBean(t, &models.User{ID: 8}) + models.CheckConsistencyFor(t, &models.User{}) +} diff --git a/modules/auth/admin.go b/modules/auth/admin.go index 0bb7d355c45fe..e1b52a9486f18 100644 --- a/modules/auth/admin.go +++ b/modules/auth/admin.go @@ -28,6 +28,7 @@ func (f *AdminCreateUserForm) Validate(ctx *macaron.Context, errs binding.Errors // AdminEditUserForm form for admin to create user type AdminEditUserForm struct { LoginType string `binding:"Required"` + UserName string `binding:"AlphaDashDot;MaxSize(35)"` LoginName string FullName string `binding:"MaxSize(100)"` Email string `binding:"Required;Email;MaxSize(254)"` diff --git a/public/js/index.js b/public/js/index.js index 25915bc2abf2c..73266dff9a7c9 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1015,6 +1015,7 @@ function initAdmin() { $('.admin.edit.user').length > 0) { $('#login_type').change(function () { if ($(this).val().substring(0, 1) == '0') { + $('#user_name').removeAttr('disabled'); $('#login_name').removeAttr('required'); $('.non-local').hide(); $('.local').show(); @@ -1025,6 +1026,7 @@ function initAdmin() { } } else { + $('#user_name').attr('disabled', 'disabled'); $('#login_name').attr('required', 'required'); $('.non-local').show(); $('.local').hide(); diff --git a/routers/admin/users.go b/routers/admin/users.go index d480029143fa6..658536422daf3 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -205,6 +205,14 @@ func EditUserPost(ctx *context.Context, form auth.AdminEditUserForm) { u.EncodePasswd() } + if u.IsLocal() && len(form.UserName) > 0 && u.Name != form.UserName { + if err := models.ChangeUserName(u, form.UserName); err != nil { + ctx.Handle(500, "ChangeUserName", err) + return + } + u.Name = form.UserName + } + u.LoginName = form.LoginName u.FullName = form.FullName u.Email = form.Email diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 4feeef302a40b..e6240625fe3fd 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -9,9 +9,9 @@
{{.CsrfTokenHtml}} -
+
- {{.User.Name}} +
From 93076c0187e003db4b49e076763ebe9c5657621b Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 30 Jan 2019 12:24:37 -0500 Subject: [PATCH 2/2] Update year --- integrations/admin_user_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/admin_user_test.go b/integrations/admin_user_test.go index 14e3596b96d8a..6ad8ba90f3557 100644 --- a/integrations/admin_user_test.go +++ b/integrations/admin_user_test.go @@ -1,4 +1,4 @@ -// Copyright 2017 The Gitea 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.