mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-06-22 10:02:15 +00:00
0e283c5485
Turns out this was a one-line fix for each affected field (change the binding from `ValidUrl` to `ValidSiteUrl`), but the tests are rather verbose. The tests are, however, each a simple flow of Create Thing > Try HTTP Website > Try Different Website (notice failure) > Try Different Website With New Config (notice success). I wrote this PR by adding failing tests first, then making the change, for each affected field. Not sure if this should be "feat:" or "fix:" tbh. I figured "fix:" for this PR since IMO the expected behavior is for `VALID_SITE_URL_SCHEMES` to apply in each of these cases, not only for user profiles via the UI form. (Later changed to "feat:" at @limiting-factor's suggestion, based on the observation that this change extends documented behavior.) This PR deals with the server-side validation only. #12991 covers client-side validation (deriving a `pattern` attribute from `VALID_SITE_URL_SCHEMES`, etc.) Closes #5519 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12962 Reviewed-by: limiting-factor <limiting-factor@noreply.codeberg.org>
54 lines
2.5 KiB
Go
54 lines
2.5 KiB
Go
// Copyright 2015 The Gogs Authors. All rights reserved.
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package structs
|
|
|
|
import "time"
|
|
|
|
// CreateUserOption create user options
|
|
type CreateUserOption struct {
|
|
SourceID int64 `json:"source_id"`
|
|
LoginName string `json:"login_name"`
|
|
// required: true
|
|
Username string `json:"username" binding:"Required;Username;MaxSize(40)"`
|
|
FullName string `json:"full_name" binding:"MaxSize(100)"`
|
|
// required: true
|
|
// swagger:strfmt email
|
|
Email string `json:"email" binding:"Required;EmailForAdmin;MaxSize(254)"`
|
|
Password string `json:"password" binding:"MaxSize(255)"`
|
|
MustChangePassword *bool `json:"must_change_password"`
|
|
SendNotify bool `json:"send_notify"`
|
|
Restricted *bool `json:"restricted"`
|
|
Visibility string `json:"visibility" binding:"In(,public,limited,private)"`
|
|
|
|
// For explicitly setting the user creation timestamp. Useful when users are
|
|
// migrated from other systems. When omitted, the user's creation timestamp
|
|
// will be set to "now".
|
|
Created *time.Time `json:"created_at"`
|
|
}
|
|
|
|
// EditUserOption edit user options
|
|
type EditUserOption struct {
|
|
SourceID *int64 `json:"source_id"`
|
|
LoginName *string `json:"login_name"`
|
|
// swagger:strfmt email
|
|
Email *string `json:"email" binding:"MaxSize(254)"`
|
|
FullName *string `json:"full_name" binding:"MaxSize(100)"`
|
|
Password string `json:"password" binding:"MaxSize(255)"`
|
|
MustChangePassword *bool `json:"must_change_password"`
|
|
Website *string `json:"website" binding:"OmitEmpty;ValidSiteUrl;MaxSize(255)"`
|
|
Location *string `json:"location" binding:"MaxSize(50)"`
|
|
Pronouns *string `json:"pronouns" binding:"MaxSize(50)"`
|
|
Description *string `json:"description" binding:"MaxSize(255)"`
|
|
Active *bool `json:"active"`
|
|
Admin *bool `json:"admin"`
|
|
AllowGitHook *bool `json:"allow_git_hook"`
|
|
AllowImportLocal *bool `json:"allow_import_local"`
|
|
MaxRepoCreation *int `json:"max_repo_creation"`
|
|
ProhibitLogin *bool `json:"prohibit_login"`
|
|
AllowCreateOrganization *bool `json:"allow_create_organization"`
|
|
Restricted *bool `json:"restricted"`
|
|
Visibility string `json:"visibility" binding:"In(,public,limited,private)"`
|
|
HideEmail *bool `json:"hide_email"`
|
|
}
|