Marcus-Arcadius
diff --git a/‎coderd/database/databasefake/databasefake.go
Lines changed: 1 addition & 1 deletion b/‎coderd/database/databasefake/databasefake.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/database/dump.sql
Lines changed: 2 additions & 0 deletions b/‎coderd/database/dump.sql
Lines changed: 2 additions & 0 deletions
diff --git a/‎coderd/database/migrations/000054_email_case.down.sql b/‎coderd/database/migrations/000054_email_case.down.sql
diff --git a/‎coderd/database/migrations/000054_email_case.up.sql
Lines changed: 1 addition & 0 deletions b/‎coderd/database/migrations/000054_email_case.up.sql
Lines changed: 1 addition & 0 deletions
diff --git a/‎coderd/database/queries.sql.go
Lines changed: 1 addition & 1 deletion b/‎coderd/database/queries.sql.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/database/queries/users.sql
Lines changed: 1 addition & 1 deletion b/‎coderd/database/queries/users.sql
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/database/unique_constraint.go
Lines changed: 1 addition & 0 deletions b/‎coderd/database/unique_constraint.go
Lines changed: 1 addition & 0 deletions
diff --git a/‎coderd/users_test.go
Lines changed: 8 additions & 0 deletions b/‎coderd/users_test.go
Lines changed: 8 additions & 0 deletions
@@ -311,7 +311,7 @@ func (q *fakeQuerier) GetUserByEmailOrUsername(_ context.Context, arg database.G
 	defer q.mutex.RUnlock()
 
 	for _, user := range q.users {
-		if (user.Email == arg.Email || user.Username == arg.Username) && user.Deleted == arg.Deleted {
+		if (strings.EqualFold(user.Email, arg.Email) || strings.EqualFold(user.Username, arg.Username)) && user.Deleted == arg.Deleted {
 			return user, nil
 		}
 	}
 
@@ -0,0 +1 @@
+CREATE UNIQUE INDEX IF NOT EXISTS users_email_lower_idx ON users USING btree (lower(email)) WHERE (deleted = false);
@@ -17,7 +17,7 @@ SELECT
 FROM
 	users
 WHERE
-	(LOWER(username) = LOWER(@username) OR email = @email)
+	(LOWER(username) = LOWER(@username) OR LOWER(email) = LOWER(@email))
 	AND deleted = @deleted
 LIMIT
 	1;
 
@@ -256,11 +256,19 @@ func TestPostLogin(t *testing.T) {
 		}
 		_, err := client.CreateFirstUser(ctx, req)
 		require.NoError(t, err)
+
 		_, err = client.LoginWithPassword(ctx, codersdk.LoginWithPasswordRequest{
 			Email:    req.Email,
 			Password: req.Password,
 		})
 		require.NoError(t, err)
+
+		// Login should be case insensitive
+		_, err = client.LoginWithPassword(ctx, codersdk.LoginWithPasswordRequest{
+			Email:    strings.ToUpper(req.Email),
+			Password: req.Password,
+		})
+		require.NoError(t, err)
 	})
 
 	t.Run("Lifetime&Expire", func(t *testing.T) {
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ func (q *fakeQuerier) GetUserByEmailOrUsername(_ context.Context, arg database.G`
`311`	`311`	`defer q.mutex.RUnlock()`
`312`	`312`
`313`	`313`	`for _, user := range q.users {`
`314`		`- if (user.Email == arg.Email \|\| user.Username == arg.Username) && user.Deleted == arg.Deleted {`
	`314`	`+ if (strings.EqualFold(user.Email, arg.Email) \|\| strings.EqualFold(user.Username, arg.Username)) && user.Deleted == arg.Deleted {`
`315`	`315`	`return user, nil`
`316`	`316`	`}`
`317`	`317`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+CREATE UNIQUE INDEX IF NOT EXISTS users_email_lower_idx ON users USING btree (lower(email)) WHERE (deleted = false);`