Skip to content

AccountView: Allow trailing hyphens and underscores in username #198

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

Merged
stsdc merged 2 commits into from
Dec 29, 2024
Merged

AccountView: Allow trailing hyphens and underscores in username #198

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e99ca0f
AccountView: Allow trailing hyphens and underscores in username
ryonakano Oct 12, 2024
9a8a225
Merge branch 'main' into ryonakano/username-hyphen
stsdc Dec 29, 2024
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
10 changes: 7 additions & 3 deletions src/Views/AccountView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ public class Installer.AccountView : AbstractInstallerView {
if (username_is_taken) {
username_error_revealer.label = _("The chosen username is already taken");
} else if (!username_is_valid) {
username_error_revealer.label = _("A username must only contain lowercase letters and numbers, without spaces");
username_error_revealer.label = _("A username must only contain lowercase letters, numbers, hyphens, and underscores, without spaces");
}

username_error_revealer.reveal_child = true;
Expand Down Expand Up @@ -459,7 +459,7 @@ public class Installer.AccountView : AbstractInstallerView {

private bool is_valid_username (string username) {
try {
if (new Regex ("^[a-z]+[a-z0-9]*$").match (username)) {
if (new Regex ("^[a-z]+[-a-z0-9_]*$").match (username)) {
return true;
}
return false;
Expand All @@ -472,12 +472,16 @@ public class Installer.AccountView : AbstractInstallerView {
private string gen_username (string fullname) {
string username = "";
bool met_alpha = false;
const char[] ALLOWED_MARKS = {
'-',
'_'
};

foreach (char c in fullname.to_ascii ().to_utf8 ()) {
if (c.isalpha ()) {
username += c.to_string ().down ();
met_alpha = true;
} else if (c.isdigit () && met_alpha) {
} else if ((c.isdigit () || c in ALLOWED_MARKS) && met_alpha) {
username += c.to_string ();
}
}
Expand Down
Loading