Auto merge of #2194 - JohnTitor:case-insensitive, r=Turbo87

Make owner invites case-insensitive

Fixes #2081

r? `@carols10cents`

Author: bors

src/controllers/user/other.rs

@@ -9,7 +9,7 @@ use crate::views::EncodablePublicUser;
 pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
     use self::users::dsl::{gh_login, id, users};
 
-    let name = &req.params()["user_id"].to_lowercase();
+    let name = crate::lower(&req.params()["user_id"]);
     let conn = req.db_conn()?;
     let user: User = users
         .filter(crate::lower(gh_login).eq(name))

src/models/owner.rs

@@ -71,7 +71,7 @@ impl Owner {
             )?))
         } else {
             users::table
-                .filter(users::gh_login.eq(name))
+                .filter(crate::lower(users::gh_login).eq(name.to_lowercase()))
                 .filter(users::gh_id.ne(-1))
                 .order(users::gh_id.desc())
                 .first(conn)

src/tests/owners.rs

@@ -92,9 +92,9 @@ fn new_crate_owner() {
     let crate_to_publish = PublishBuilder::new("foo_owner").version("1.0.0");
     token.enqueue_publish(crate_to_publish).good();
 
-    // Add the second user as an owner
-    let user2 = app.db_new_user("bar");
-    token.add_user_owner("foo_owner", user2.as_model());
+    // Add the second user as an owner (with a different case to make sure that works)
+    let user2 = app.db_new_user("Bar");
+    token.add_user_owner("foo_owner", "BAR");
 
     // accept invitation for user to be added as owner
     let krate: Crate = app.db(|conn| Crate::by_name("foo_owner").first(conn).unwrap());
@@ -104,7 +104,7 @@ fn new_crate_owner() {
     let crates = user2.search_by_user_id(user2.as_model().id);
     assert_eq!(crates.crates.len(), 1);
 
-    // And upload a new crate as the second user
+    // And upload a new version as the second user
     let crate_to_publish = PublishBuilder::new("foo_owner").version("2.0.0");
     user2
         .db_new_token("bar_token")
@@ -119,7 +119,7 @@ fn create_and_add_owner(
     krate: &Crate,
 ) -> MockCookieUser {
     let user = app.db_new_user(username);
-    token.add_user_owner(&krate.name, user.as_model());
+    token.add_user_owner(&krate.name, username);
     user.accept_ownership_invitation(&krate.name, krate.id);
     user
 }
@@ -301,7 +301,7 @@ fn invitations_list() {
     let krate = app.db(|conn| CrateBuilder::new("invited_crate", owner.id).expect_build(conn));
 
     let user = app.db_new_user("invited_user");
-    token.add_user_owner("invited_crate", user.as_model());
+    token.add_user_owner("invited_crate", "invited_user");
 
     let json = user.list_invitations();
     assert_eq!(json.crate_owner_invitations.len(), 1);
@@ -327,7 +327,7 @@ fn test_accept_invitation() {
     let krate = app.db(|conn| CrateBuilder::new("accept_invitation", owner.id).expect_build(conn));
 
     // Invite a new owner
-    owner_token.add_user_owner("accept_invitation", invited_user.as_model());
+    owner_token.add_user_owner("accept_invitation", "user_bar");
 
     // New owner accepts the invitation
     invited_user.accept_ownership_invitation(&krate.name, krate.id);
@@ -354,7 +354,7 @@ fn test_decline_invitation() {
     let krate = app.db(|conn| CrateBuilder::new("decline_invitation", owner.id).expect_build(conn));
 
     // Invite a new owner
-    owner_token.add_user_owner("decline_invitation", invited_user.as_model());
+    owner_token.add_user_owner("decline_invitation", "user_bar");
 
     // Invited user declines the invitation
     invited_user.decline_ownership_invitation(&krate.name, krate.id);
@@ -395,7 +395,7 @@ fn inactive_users_dont_get_invitations() {
 
     let invited_user = app.db_new_user(invited_gh_login);
 
-    owner_token.add_user_owner(krate_name, invited_user.as_model());
+    owner_token.add_user_owner(krate_name, "user_bar");
 
     let json = invited_user.list_invitations();
     assert_eq!(json.crate_owner_invitations.len(), 1);
@@ -419,7 +419,7 @@ fn highest_gh_id_is_most_recent_account_we_know_of() {
         CrateBuilder::new(krate_name, owner.id).expect_build(conn);
     });
 
-    owner_token.add_user_owner(krate_name, invited_user.as_model());
+    owner_token.add_user_owner(krate_name, "user_bar");
 
     let json = invited_user.list_invitations();
     assert_eq!(json.crate_owner_invitations.len(), 1);

src/tests/user.rs

@@ -142,14 +142,14 @@ fn me() {
 #[test]
 fn show() {
     let (app, anon, _) = TestApp::init().with_user();
-    app.db_new_user("bar");
+    app.db_new_user("Bar");
 
     let json: UserShowPublicResponse = anon.get("/api/v1/users/foo").good();
     assert_eq!("foo", json.user.login);
 
-    let json: UserShowPublicResponse = anon.get("/api/v1/users/bar").good();
-    assert_eq!("bar", json.user.login);
-    assert_eq!(Some("https://github.com/bar".into()), json.user.url);
+    let json: UserShowPublicResponse = anon.get("/api/v1/users/bAr").good();
+    assert_eq!("Bar", json.user.login);
+    assert_eq!(Some("https://github.com/Bar".into()), json.user.url);
 }
 
 #[test]

src/tests/util.rs

@@ -543,8 +543,8 @@ impl MockTokenUser {
     }
 
     /// Add a user as an owner for a crate.
-    pub fn add_user_owner(&self, krate_name: &str, user: &User) {
-        self.add_named_owner(krate_name, &user.gh_login).good();
+    pub fn add_user_owner(&self, krate_name: &str, username: &str) {
+        self.add_named_owner(krate_name, username).good();
     }
 }