Merge #1088

1088: Make users::show() case insensitive r=sgrif

Closes #989.

Author: bors-voyager[bot]

migrations/2017-09-26-200549_users_lowercase_index/down.sql

@@ -0,0 +1,3 @@
+DROP INDEX lower_gh_login;
+ALTER TABLE users DROP CONSTRAINT unique_gh_login;
+CREATE INDEX index_users_gh_login ON users (gh_login);

migrations/2017-09-26-200549_users_lowercase_index/up.sql

@@ -0,0 +1,3 @@
+DROP INDEX IF EXISTS index_users_gh_login;
+ALTER TABLE users ADD CONSTRAINT unique_gh_login UNIQUE(gh_login);
+CREATE UNIQUE INDEX lower_gh_login ON users (lower(gh_login));

src/tests/krate.rs

@@ -489,7 +489,7 @@ fn new_wrong_token() {
 }
 
 #[test]
-fn new_bad_names() {
+fn new_bd_names() {
     fn bad_name(name: &str) {
         println!("testing: `{}`", name);
         let (_b, app, middle) = ::app();
@@ -708,10 +708,11 @@ fn new_krate_wrong_user() {
 #[test]
 fn new_krate_bad_name() {
     let (_b, app, middle) = ::app();
-
+    let mut req = ::new_req(app.clone(), "foobar", "2.0.0");
+    let user = ::sign_in(&mut req, &app);
     {
         let mut req = ::new_req(app.clone(), "snow☃", "2.0.0");
-        ::sign_in(&mut req, &app);
+        ::sign_in_as(&mut req, &user);
         let json = bad_resp!(middle.call(&mut req));
         assert!(
             json.errors[0]
@@ -723,7 +724,7 @@ fn new_krate_bad_name() {
     }
     {
         let mut req = ::new_req(app.clone(), "áccênts", "2.0.0");
-        ::sign_in(&mut req, &app);
+        ::sign_in_as(&mut req, &user);
         let json = bad_resp!(middle.call(&mut req));
         assert!(
             json.errors[0]
@@ -1467,35 +1468,37 @@ fn publish_after_yank_max_version() {
 #[test]
 fn bad_keywords() {
     let (_b, app, middle) = ::app();
+    let mut req = ::new_req(app.clone(), "foobar", "1.0.0");
+    let user = ::sign_in(&mut req, &app);
     {
         let krate = ::krate("foo_bad_key");
         let kws = vec!["super-long-keyword-name-oh-no".into()];
         let mut req = ::new_req_with_keywords(app.clone(), krate, "1.0.0", kws);
-        ::sign_in(&mut req, &app);
+        ::sign_in_as(&mut req, &user);
         let mut response = ok_resp!(middle.call(&mut req));
         ::json::<::Bad>(&mut response);
     }
     {
         let krate = ::krate("foo_bad_key2");
         let kws = vec!["?@?%".into()];
         let mut req = ::new_req_with_keywords(app.clone(), krate, "1.0.0", kws);
-        ::sign_in(&mut req, &app);
+        ::sign_in_as(&mut req, &user);
         let mut response = ok_resp!(middle.call(&mut req));
         ::json::<::Bad>(&mut response);
     }
     {
         let krate = ::krate("foo_bad_key_3");
         let kws = vec!["?@?%".into()];
         let mut req = ::new_req_with_keywords(app.clone(), krate, "1.0.0", kws);
-        ::sign_in(&mut req, &app);
+        ::sign_in_as(&mut req, &user);
         let mut response = ok_resp!(middle.call(&mut req));
         ::json::<::Bad>(&mut response);
     }
     {
         let krate = ::krate("foo_bad_key4");
         let kws = vec!["áccênts".into()];
         let mut req = ::new_req_with_keywords(app.clone(), krate, "1.0.0", kws);
-        ::sign_in(&mut req, &app);
+        ::sign_in_as(&mut req, &user);
         let mut response = ok_resp!(middle.call(&mut req));
         ::json::<::Bad>(&mut response);
     }

src/tests/user.rs

@@ -80,6 +80,23 @@ fn show() {
     assert_eq!(Some("https://github.com/bar".into()), json.user.url);
 }
 
+#[test]
+fn show_case_insensitive() {
+    let (_b, app, middle) = ::app();
+    {
+        let conn = t!(app.diesel_database.get());
+
+        t!(
+            NewUser::new(1, "foobar", Some("[email protected]"), None, None, "bar")
+                .create_or_update(&conn)
+        );
+    }
+    let mut req = ::req(app.clone(), Method::Get, "api/v1/users/fOObAr");
+    let mut response = ok_resp!(middle.call(&mut req));
+    let json: UserShowPublicResponse = ::json(&mut response);
+    assert_eq!("foobar", json.user.login);
+}
+
 #[test]
 fn crates_by_user_id() {
     let (_b, app, middle) = ::app();

src/user/mod.rs

@@ -458,9 +458,11 @@ pub fn me(req: &mut Request) -> CargoResult<Response> {
 pub fn show(req: &mut Request) -> CargoResult<Response> {
     use self::users::dsl::{gh_login, users};
 
-    let name = &req.params()["user_id"];
+    let name = &req.params()["user_id"].to_lowercase();
     let conn = req.db_conn()?;
-    let user = users.filter(gh_login.eq(name)).first::<User>(&*conn)?;
+    let user = users
+        .filter(::lower(gh_login).eq(name))
+        .first::<User>(&*conn)?;
 
     #[derive(Serialize)]
     struct R {