retain original email

- retain email registered with when github email is modified

Author: mugoh

src/models/user.rs

@@ -54,7 +54,6 @@ impl<'a> NewUser<'a> {
         email: Option<&'a str>,
         conn: &PgConnection,
     ) -> QueryResult<User> {
-        use crate::schema::emails::columns::user_id;
         use crate::schema::users::dsl::*;
         use diesel::dsl::sql;
         use diesel::insert_into;
@@ -91,9 +90,7 @@ impl<'a> NewUser<'a> {
 
                 let token = insert_into(emails::table)
                     .values(&new_email)
-                    .on_conflict(user_id)
-                    .do_update()
-                    .set(&new_email)
+                    .on_conflict_do_nothing()
                     .returning(emails::token)
                     .get_result::<String>(conn)
                     .optional()?;

src/tests/user.rs

@@ -514,11 +514,13 @@ fn test_confirm_user_email() {
 
     // Simulate logging in via GitHub. Don't use app.db_new_user because it inserts a verified
     // email directly into the database and we want to test the verification flow here.
+    let email = "cow@mammals@milk";
+
     let user = app.db(|conn| {
         let u = NewUser {
             ..new_user("arbitrary_username")
         };
-        let u = u.create_or_update(None, conn).unwrap();
+        let u = u.create_or_update(Some(email), conn).unwrap();
         MockCookieUser::new(&app, u)
     });
     let user_model = user.as_model();
@@ -533,7 +535,7 @@ fn test_confirm_user_email() {
     user.confirm_email(&email_token);
 
     let json = user.show_me();
-    assert_eq!(json.user.email.unwrap(), "[email protected]");
+    assert_eq!(json.user.email.unwrap(), "cow@mammals@milk");
     assert!(json.user.email_verified);
     assert!(json.user.email_verification_sent);
 }
@@ -552,11 +554,12 @@ fn test_existing_user_email() {
 
     // Simulate logging in via GitHub. Don't use app.db_new_user because it inserts a verified
     // email directly into the database and we want to test the verification flow here.
+    let email = "[email protected]";
     let user = app.db(|conn| {
         let u = NewUser {
             ..new_user("arbitrary_username")
         };
-        let u = u.create_or_update(None, conn).unwrap();
+        let u = u.create_or_update(Some(email), conn).unwrap();
         update(Email::belonging_to(&u))
             // Users created before we added verification will have
             // `NULL` in the `token_generated_at` column.

src/tests/util.rs

@@ -135,7 +135,7 @@ impl TestApp {
         use diesel::prelude::*;
 
         let user = self.db(|conn| {
-            let email = "[email protected]";
+            let email = "[email protected]";
 
             let user = crate::new_user(username)
                 .create_or_update(None, conn)