Revert "Remove form validation for json request and fix some other bugs"

This reverts commit f2b5744.

Author: wxiaoguang

models/db/name.go

@@ -72,25 +72,6 @@ func (err ErrNameCharsNotAllowed) Unwrap() error {
 	return util.ErrInvalidArgument
 }
 
-type ErrNameTooLong struct {
-	Name      string
-	MaxLength int
-}
-
-func (err ErrNameTooLong) Error() string {
-	return fmt.Sprintf("name is too long [name: %s, max length: %d]", err.Name, err.MaxLength)
-}
-
-// Unwrap unwraps this as a ErrInvalid err
-func (err ErrNameTooLong) Unwrap() error {
-	return util.ErrInvalidArgument
-}
-
-func IsErrNameTooLong(err error) bool {
-	_, ok := err.(ErrNameTooLong)
-	return ok
-}
-
 // IsUsableName checks if name is reserved or pattern of name is not allowed
 // based on given reserved names and patterns.
 // Names are exact match, patterns can be a prefix or suffix match with placeholder '*'.

models/user/user.go

@@ -618,13 +618,8 @@ var (
 	reservedUserPatterns = []string{"*.keys", "*.gpg", "*.rss", "*.atom", "*.png"}
 )
 
-const MaxUsableUsernameLength = 40
-
 // IsUsableUsername returns an error when a username is reserved
 func IsUsableUsername(name string) error {
-	if len(name) > MaxUsableUsernameLength {
-		return db.ErrNameTooLong{Name: name, MaxLength: MaxUsableUsernameLength}
-	}
 	// Validate username make sure it satisfies requirement.
 	if !validation.IsValidUsername(name) {
 		// Note: usually this error is normally caught up earlier in the UI

options/locale/locale_en-US.ini

@@ -2812,10 +2812,8 @@ team_permission_desc = Permission
 team_unit_desc = Allow Access to Repository Sections
 team_unit_disabled = (Disabled)
 
-form.username_been_taken = The organization name "%s" has already been taken.
 form.name_reserved = The organization name "%s" is reserved.
 form.name_pattern_not_allowed = The pattern "%s" is not allowed in an organization name.
-form.name_too_long = The organization name "%[1]s" is too long, max size is %[2]d
 form.create_org_not_allowed = You are not allowed to create an organization.
 
 settings = Settings

routers/web/org/setting.go

@@ -220,31 +220,30 @@ func Labels(ctx *context.Context) {
 
 // SettingsRename response for renaming organization
 func SettingsRename(ctx *context.Context) {
+	form := web.GetForm(ctx).(*forms.RenameOrgForm)
 	org := ctx.Org.Organization
-	oldOrgName := ctx.FormString("org_name")
-	newOrgName := ctx.FormString("new_org_name")
 
-	if org.Name != oldOrgName {
+	if org.Name != form.OrgName {
 		ctx.Flash.Error(ctx.Tr("form.enterred_invalid_org_name"))
 		ctx.JSONRedirect(ctx.Org.OrgLink + "/settings")
 		return
 	}
 
-	if org.Name == newOrgName {
+	if org.Name == form.NewOrgName {
 		ctx.Flash.Error(ctx.Tr("org.settings.rename_no_change"))
 		ctx.JSONRedirect(ctx.Org.OrgLink + "/settings")
 		return
 	}
 
-	if err := user_service.RenameUser(ctx, org.AsUser(), newOrgName); err != nil {
+	oldOrgName := org.Name
+
+	if err := user_service.RenameUser(ctx, org.AsUser(), form.NewOrgName); err != nil {
 		if user_model.IsErrUserAlreadyExist(err) {
-			ctx.Flash.Error(ctx.Tr("org.form.username_been_taken", newOrgName))
+			ctx.Flash.Error(ctx.Tr("form.username_been_taken"))
 		} else if db.IsErrNameReserved(err) {
-			ctx.Flash.Error(ctx.Tr("org.form.name_reserved", newOrgName))
+			ctx.Flash.Error(ctx.Tr("repo.form.name_reserved"))
 		} else if db.IsErrNamePatternNotAllowed(err) {
-			ctx.Flash.Error(ctx.Tr("org.form.name_pattern_not_allowed", newOrgName))
-		} else if db.IsErrNameTooLong(err) {
-			ctx.Flash.Error(ctx.Tr("org.form.name_too_long", newOrgName, user_model.MaxUsableUsernameLength))
+			ctx.Flash.Error(ctx.Tr("repo.form.name_pattern_not_allowed"))
 		} else {
 			log.Error("RenameOrganization: %v", err)
 			ctx.Flash.Error(util.Iif(ctx.Doer.IsAdmin, err.Error(), string(ctx.Tr("org.settings.rename_failed"))))

routers/web/web.go

@@ -964,7 +964,7 @@ func registerWebRoutes(m *web.Router) {
 					addSettingsVariablesRoutes()
 				}, actions.MustEnableActions)
 
-				m.Post("/rename", org.SettingsRename)
+				m.Post("/rename", web.Bind(forms.RenameOrgForm{}), org.SettingsRename)
 				m.Post("/delete", org.SettingsDelete)
 
 				m.Group("/packages", func() {

services/forms/org.go

@@ -52,6 +52,18 @@ func (f *UpdateOrgSettingForm) Validate(req *http.Request, errs binding.Errors)
 	return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
 }
 
+type RenameOrgForm struct {
+	OrgName    string `binding:"Required;Username;MaxSize(40)"`
+	NewOrgName string `binding:"Required;Username;MaxSize(40)"`
+}
+
+// ___________
+// \__    ___/___ _____    _____
+//   |    |_/ __ \\__  \  /     \
+//   |    |\  ___/ / __ \|  Y Y  \
+//   |____| \___  >____  /__|_|  /
+//              \/     \/      \/
+
 // CreateTeamForm form for creating team
 type CreateTeamForm struct {
 	TeamName         string `binding:"Required;AlphaDashDot;MaxSize(255)"`

services/forms/user_form.go

@@ -62,7 +62,7 @@ type InstallForm struct {
 
 	PasswordAlgorithm string
 
-	AdminName          string `binding:"OmitEmpty;Username;MaxSize(40)" locale:"install.admin_name"`
+	AdminName          string `binding:"OmitEmpty;Username;MaxSize(30)" locale:"install.admin_name"`
 	AdminPasswd        string `binding:"OmitEmpty;MaxSize(255)" locale:"install.admin_password"`
 	AdminConfirmPasswd string
 	AdminEmail         string `binding:"OmitEmpty;MinSize(3);MaxSize(254);Include(@)" locale:"install.admin_email"`