Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat(usermgmt): allow usernames with "_", "." #5347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

feat(usermgmt): allow usernames with "_", "." #5347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6df8dd8
feat(usermgmt): allow usernames with "_", "."
ghuntley Dec 8, 2022
9e7c38d
sync backend with same regex
ghuntley Dec 8, 2022
efd9900
update xerrors description
ghuntley Dec 8, 2022
14da3a9
update tests
ghuntley Dec 8, 2022
c971e49
improve user error
ghuntley Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions coderd/httpapi/name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
)

var (
UsernameValidRegex = regexp.MustCompile("^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$")
UsernameValidRegex = regexp.MustCompile("^[a-zA-Z0-9._]+(?:-[a-zA-Z0-9._]+)*$")
usernameReplace = regexp.MustCompile("[^a-zA-Z0-9-]*")

templateDisplayName = regexp.MustCompile(`^[^\s](.*[^\s])?$`)
Expand Down Expand Up @@ -47,7 +47,7 @@ func NameValid(str string) error {
}
matched := UsernameValidRegex.MatchString(str)
if !matched {
return xerrors.New("must be alphanumeric with hyphens")
return xerrors.New("must be alphanumeric with hyphens, underscores or periods")
}
return nil
}
Expand Down
5 changes: 4 additions & 1 deletion coderd/httpapi/name_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ func TestUsernameValid(t *testing.T) {
{"abcdefghijklmnopqrst", true},
{"abcdefghijklmnopqrstu", true},
{"wow-test", true},
{"_domain-user-convention", true},
{"bananas_wow", true},
{"firstname.surname", true},
{"firstname.surname1", true},

{"", false},
{" ", false},
Expand All @@ -48,7 +52,6 @@ func TestUsernameValid(t *testing.T) {
{" 123456789012345678901", false},
{" a1b2c3d4e5f6g7h8i9j0k", false},
{"a1b2c3d4e5f6g7h8i9j0k ", false},
{"bananas_wow", false},
{"test--now", false},

{"123456789012345678901234567890123", false},
Expand Down
4 changes: 2 additions & 2 deletions site/src/util/formUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const Language = {
return name ? `Please enter a ${name.toLowerCase()}.` : "Required"
},
nameInvalidChars: (name: string): string => {
return `${name} must start with a-Z or 0-9 and can contain a-Z, 0-9 or -`
return `${name} must start with 'a-Z' or '0-9' and can contain 'a-Z' '0-9' '_' '.' or '-'`
},
nameTooLong: (name: string, len: number): string => {
return `${name} cannot be longer than ${len} characters`
Expand Down Expand Up @@ -80,7 +80,7 @@ export const onChangeTrimmed =
// REMARK: Keep these consts in sync with coderd/httpapi/httpapi.go
const maxLenName = 32
const templateDisplayNameMaxLength = 64
const usernameRE = /^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$/
const usernameRE = /^[a-zA-Z0-9._]+(?:-[a-zA-Z0-9._]+)*$/
const templateDisplayNameRE = /^[^\s](.*[^\s])?$/

// REMARK: see #1756 for name/username semantics
Expand Down