Use [chi](https://github.com/go-chi/chi) instead of the forked [macaron](https://gitea.com/macaron/macaron). Since macaron and chi have conflicts with session share, this big PR becomes a have-to thing. According my previous idea, we can replace macaron step by step but I'm wrong. :( Below is a list of big changes on this PR. - [x] Define `context.ResponseWriter` interface with an implementation `context.Response`. - [x] Use chi instead of macaron, and also a customize `Route` to wrap chi so that the router usage is similar as before. - [x] Create different routers for `web`, `api`, `internal` and `install` so that the codes will be more clear and no magic . - [x] Use https://github.com/unrolled/render instead of macaron's internal render - [x] Use https://github.com/NYTimes/gziphandler instead of https://gitea.com/macaron/gzip - [x] Use https://gitea.com/go-chi/session which is a modified version of https://gitea.com/macaron/session and removed `nodb` support since it will not be maintained. **BREAK** - [x] Use https://gitea.com/go-chi/captcha which is a modified version of https://gitea.com/macaron/captcha - [x] Use https://gitea.com/go-chi/cache which is a modified version of https://gitea.com/macaron/cache - [x] Use https://gitea.com/go-chi/binding which is a modified version of https://gitea.com/macaron/binding - [x] Use https://github.com/go-chi/cors instead of https://gitea.com/macaron/cors - [x] Dropped https://gitea.com/macaron/i18n and make a new one in `code.gitea.io/gitea/modules/translation` - [x] Move validation form structs from `code.gitea.io/gitea/modules/auth` to `code.gitea.io/gitea/modules/forms` to avoid dependency cycle. - [x] Removed macaron log service because it's not need any more. **BREAK** - [x] All form structs have to be get by `web.GetForm(ctx)` in the route function but not as a function parameter on routes definition. - [x] Move Git HTTP protocol implementation to use routers directly. - [x] Fix the problem that chi routes don't support trailing slash but macaron did. - [x] `/api/v1/swagger` now will be redirect to `/api/swagger` but not render directly so that `APIContext` will not create a html render. Notices: - Chi router don't support request with trailing slash - Integration test `TestUserHeatmap` maybe mysql version related. It's failed on my macOS(mysql 5.7.29 installed via brew) but succeed on CI. Co-authored-by: 6543 <6543@obermui.de>
		
			
				
	
	
		
			123 lines
		
	
	
	
		
			2.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			123 lines
		
	
	
	
		
			2.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // 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 admin
 | |
| 
 | |
| import (
 | |
| 	"testing"
 | |
| 
 | |
| 	"code.gitea.io/gitea/models"
 | |
| 	auth "code.gitea.io/gitea/modules/forms"
 | |
| 	"code.gitea.io/gitea/modules/test"
 | |
| 	"code.gitea.io/gitea/modules/web"
 | |
| 
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| func TestNewUserPost_MustChangePassword(t *testing.T) {
 | |
| 
 | |
| 	models.PrepareTestEnv(t)
 | |
| 	ctx := test.MockContext(t, "admin/users/new")
 | |
| 
 | |
| 	u := models.AssertExistsAndLoadBean(t, &models.User{
 | |
| 		IsAdmin: true,
 | |
| 		ID:      2,
 | |
| 	}).(*models.User)
 | |
| 
 | |
| 	ctx.User = u
 | |
| 
 | |
| 	username := "gitea"
 | |
| 	email := "gitea@gitea.io"
 | |
| 
 | |
| 	form := auth.AdminCreateUserForm{
 | |
| 		LoginType:          "local",
 | |
| 		LoginName:          "local",
 | |
| 		UserName:           username,
 | |
| 		Email:              email,
 | |
| 		Password:           "abc123ABC!=$",
 | |
| 		SendNotify:         false,
 | |
| 		MustChangePassword: true,
 | |
| 	}
 | |
| 
 | |
| 	web.SetForm(ctx, &form)
 | |
| 	NewUserPost(ctx)
 | |
| 
 | |
| 	assert.NotEmpty(t, ctx.Flash.SuccessMsg)
 | |
| 
 | |
| 	u, err := models.GetUserByName(username)
 | |
| 
 | |
| 	assert.NoError(t, err)
 | |
| 	assert.Equal(t, username, u.Name)
 | |
| 	assert.Equal(t, email, u.Email)
 | |
| 	assert.True(t, u.MustChangePassword)
 | |
| }
 | |
| 
 | |
| func TestNewUserPost_MustChangePasswordFalse(t *testing.T) {
 | |
| 
 | |
| 	models.PrepareTestEnv(t)
 | |
| 	ctx := test.MockContext(t, "admin/users/new")
 | |
| 
 | |
| 	u := models.AssertExistsAndLoadBean(t, &models.User{
 | |
| 		IsAdmin: true,
 | |
| 		ID:      2,
 | |
| 	}).(*models.User)
 | |
| 
 | |
| 	ctx.User = u
 | |
| 
 | |
| 	username := "gitea"
 | |
| 	email := "gitea@gitea.io"
 | |
| 
 | |
| 	form := auth.AdminCreateUserForm{
 | |
| 		LoginType:          "local",
 | |
| 		LoginName:          "local",
 | |
| 		UserName:           username,
 | |
| 		Email:              email,
 | |
| 		Password:           "abc123ABC!=$",
 | |
| 		SendNotify:         false,
 | |
| 		MustChangePassword: false,
 | |
| 	}
 | |
| 
 | |
| 	web.SetForm(ctx, &form)
 | |
| 	NewUserPost(ctx)
 | |
| 
 | |
| 	assert.NotEmpty(t, ctx.Flash.SuccessMsg)
 | |
| 
 | |
| 	u, err := models.GetUserByName(username)
 | |
| 
 | |
| 	assert.NoError(t, err)
 | |
| 	assert.Equal(t, username, u.Name)
 | |
| 	assert.Equal(t, email, u.Email)
 | |
| 	assert.False(t, u.MustChangePassword)
 | |
| }
 | |
| 
 | |
| func TestNewUserPost_InvalidEmail(t *testing.T) {
 | |
| 
 | |
| 	models.PrepareTestEnv(t)
 | |
| 	ctx := test.MockContext(t, "admin/users/new")
 | |
| 
 | |
| 	u := models.AssertExistsAndLoadBean(t, &models.User{
 | |
| 		IsAdmin: true,
 | |
| 		ID:      2,
 | |
| 	}).(*models.User)
 | |
| 
 | |
| 	ctx.User = u
 | |
| 
 | |
| 	username := "gitea"
 | |
| 	email := "gitea@gitea.io\r\n"
 | |
| 
 | |
| 	form := auth.AdminCreateUserForm{
 | |
| 		LoginType:          "local",
 | |
| 		LoginName:          "local",
 | |
| 		UserName:           username,
 | |
| 		Email:              email,
 | |
| 		Password:           "abc123ABC!=$",
 | |
| 		SendNotify:         false,
 | |
| 		MustChangePassword: false,
 | |
| 	}
 | |
| 
 | |
| 	web.SetForm(ctx, &form)
 | |
| 	NewUserPost(ctx)
 | |
| 
 | |
| 	assert.NotEmpty(t, ctx.Flash.ErrorMsg)
 | |
| }
 |