Allow creating and updating (user|org) names with dots (#4925)

In #4690, we made it possible to create usernames from SSO signups that include dots. But that would have failed, as I found out working on this, due to a database constraint that needed to be updated.

Additionally, it was still not possible to change or manually create an account with a username that
includes a dot in the UI. This PR fixes that too.

For consistency, we allow dots in org names as well.

Fixes #4909, #4920

CHANGELOG.md

@@ -46,7 +46,7 @@ All notable changes to Sourcegraph are documented in this file.
 
 ### Changed
 
-- Usernames can now contain the `.` character (#4690).
+- Usernames and org names can now contain the `.` character (#4674).
 
 ### Added
 

cmd/frontend/db/schema.md

@@ -256,7 +256,7 @@ Indexes:
 Check constraints:
     "orgs_display_name_max_length" CHECK (char_length(display_name) <= 255)
     "orgs_name_max_length" CHECK (char_length(name::text) <= 255)
-    "orgs_name_valid_chars" CHECK (name ~ '^[a-zA-Z0-9](?:[a-zA-Z0-9]|-(?=[a-zA-Z0-9]))*$'::citext)
+    "orgs_name_valid_chars" CHECK (name ~ '^[a-zA-Z0-9](?:[a-zA-Z0-9]|[-.](?=[a-zA-Z0-9]))*$'::citext)
 Referenced by:
     TABLE "names" CONSTRAINT "names_org_id_fkey" FOREIGN KEY (org_id) REFERENCES orgs(id) ON UPDATE CASCADE ON DELETE CASCADE
     TABLE "org_invitations" CONSTRAINT "org_invitations_org_id_fkey" FOREIGN KEY (org_id) REFERENCES orgs(id)
@@ -612,7 +612,7 @@ Indexes:
 Check constraints:
     "users_display_name_max_length" CHECK (char_length(display_name) <= 255)
     "users_username_max_length" CHECK (char_length(username::text) <= 255)
-    "users_username_valid_chars" CHECK (username ~ '^[a-zA-Z0-9](?:[a-zA-Z0-9]|-(?=[a-zA-Z0-9]))*$'::citext)
+    "users_username_valid_chars" CHECK (username ~ '^[a-zA-Z0-9](?:[a-zA-Z0-9]|[-.](?=[a-zA-Z0-9]))*$'::citext)
 Referenced by:
     TABLE "access_tokens" CONSTRAINT "access_tokens_creator_user_id_fkey" FOREIGN KEY (creator_user_id) REFERENCES users(id)
     TABLE "access_tokens" CONSTRAINT "access_tokens_subject_user_id_fkey" FOREIGN KEY (subject_user_id) REFERENCES users(id)

cmd/frontend/db/users_test.go

@@ -28,14 +28,21 @@ var usernamesForTests = []struct {
 	{"deadmau5", true},
 	{"deadmau-5", true},
 	{"3blindmice", true},
+	{"nick.com", true},
+	{"nick.com.uk", true},
+	{"nick.com-put-er", true},
 	{"777", true},
 	{"7-7", true},
 	{"long-butnotquitelongenoughtoreachlimit", true},
 
+	{".nick", false},
+	{"-nick", false},
 	{"nick-", false},
+	{"nick.", false},
 	{"nick--s", false},
 	{"nick--sny", false},
-	{"nick.com", false},
+	{"nick..sny", false},
+	{"nick.-sny", false},
 	{"nick_s", false},
 	{"_", false},
 	{"_nick", false},

migrations/1528395581_allows_dots_in_usernames.down.sql

@@ -0,0 +1,13 @@
+BEGIN;
+
+ALTER TABLE orgs
+DROP CONSTRAINT orgs_name_valid_chars,
+ADD CONSTRAINT orgs_name_valid_chars
+CHECK (name ~ '^[a-zA-Z0-9](?:[a-zA-Z0-9]|-(?=[a-zA-Z0-9]))*$');
+
+ALTER TABLE users
+DROP CONSTRAINT users_username_valid_chars,
+ADD CONSTRAINT users_username_valid_chars
+CHECK (username ~ '^[a-zA-Z0-9](?:[a-zA-Z0-9]|-(?=[a-zA-Z0-9]))*$');
+
+COMMIT;

migrations/1528395581_allows_dots_in_usernames.up.sql

@@ -0,0 +1,13 @@
+BEGIN;
+
+ALTER TABLE orgs
+DROP CONSTRAINT orgs_name_valid_chars,
+ADD CONSTRAINT orgs_name_valid_chars
+CHECK (name ~ '^[a-zA-Z0-9](?:[a-zA-Z0-9]|[-.](?=[a-zA-Z0-9]))*$');
+
+ALTER TABLE users
+DROP CONSTRAINT users_username_valid_chars,
+ADD CONSTRAINT users_username_valid_chars
+CHECK (username ~ '^[a-zA-Z0-9](?:[a-zA-Z0-9]|[-.](?=[a-zA-Z0-9]))*$');
+
+COMMIT;

web/src/org/new/NewOrganizationPage.tsx

@@ -109,8 +109,8 @@ export class NewOrganizationPage extends React.Component<Props, State> {
                             aria-describedby="new-org-page__form-name-help"
                         />
                         <small id="new-org-page__form-name-help" className="form-text text-muted">
-                            An organization name consists of letters, numbers, hyphens (-) and may not begin or end with
-                            a hyphen
+                            An organization name consists of letters, numbers, hyphens (-), dots (.) and may not begin
+                            or end with a hyphen nor a dot.
                         </small>
                     </div>
 

web/src/site-admin/SiteAdminCreateUserPage.tsx

@@ -127,6 +127,10 @@ export class SiteAdminCreateUserPage extends React.Component<Props, State> {
                                 disabled={this.state.loading}
                                 autoFocus={true}
                             />
+                            <small className="form-text text-muted">
+                                A username consists of letters, numbers, hyphens (-), dots (.) and may not begin or end
+                                with a hyphen nor a dot.
+                            </small>
                         </div>
                         <div className="form-group site-admin-create-user-page__form-group">
                             <label htmlFor="site-admin-create-user-page__form-email">Email</label>

web/src/user/index.ts

@@ -1,7 +1,7 @@
 /**
  * Regular expression to identify valid username.
  */
-export const VALID_USERNAME_REGEXP = /^[a-zA-Z0-9](?:[a-zA-Z0-9]|-(?=[a-zA-Z0-9]))*$/.source
+export const VALID_USERNAME_REGEXP = /^[a-zA-Z0-9](?:[a-zA-Z0-9]|[-.](?=[a-zA-Z0-9]))*$/.source
 
 /** Maximum allowed length for a username. */
 export const USERNAME_MAX_LENGTH = 255

web/src/user/settings/profile/UserSettingsProfilePage.tsx

@@ -200,9 +200,9 @@ export class UserSettingsProfilePage extends React.Component<Props, State> {
                                 }
                                 aria-describedby="user-settings-profile-page__form-username-help"
                             />
-                            <small id="user-settings-profile-page__form-username-help" className="form-text text-muted">
-                                A username consists of letters, numbers, hyphens (-) and may not begin or end with a
-                                hyphen
+                            <small className="form-text text-muted">
+                                A username consists of letters, numbers, hyphens (-), dots (.) and may not begin or end
+                                with a hyphen nor a dot.
                             </small>
                         </div>
                         <div className="form-group">