add username for user (#30)

add username for user

Author: sergeysova

Cargo.lock

@@ -30,3 +30,5 @@ num_cpus = "1.10.0"
 ammonia = "2.0.0"
 maplit = "1.0.1"
 md5 = "0.6.1"
+regex = "1.3.1"
+lazy_static = "1.4.0"

Cargo.toml

@@ -10,4 +10,4 @@ until PGPASSWORD=${POSTGRES_PASSWORD} psql -h ${DATABASE_HOST} -U ${POSTGRES_USE
 done
 
 >&2 echo "Postgres is up - executing command"
-cd /app && ls . && diesel migration run && exec $@
+cd /app && diesel migration run && exec $@

docker-entrypoint.sh

@@ -0,0 +1 @@
+ALTER TABLE "users" DROP COLUMN "username";

migrations/2019-09-28-140611_add_username_and_default_username/down.sql

@@ -0,0 +1,8 @@
+ALTER TABLE "users" ADD COLUMN "username" VARCHAR;
+
+UPDATE users
+SET username = CONCAT('id', users.id)
+FROM users comp
+WHERE users.id = comp.id;
+
+ALTER TABLE "users" ALTER COLUMN "username" SET NOT NULL;

migrations/2019-09-28-140611_add_username_and_default_username/up.sql

@@ -1,6 +1,7 @@
 //! Create account
 use actix_base::prelude::*;
 use actix_web::*;
+use uuid::Uuid;
 
 use crate::app_state::DbExecutor;
 use crate::consts;
@@ -38,6 +39,7 @@ impl Handler<AccountCreate> for DbExecutor {
         let new_account = UserNew {
             email: msg.email,
             password: hasher::hash_password(&msg.password, consts::SALT),
+            username: format!("{}", Uuid::new_v4()),
         };
 
         User::create(&self.conn, new_account).ok_or(AccountCreateError::EmailExists)

src/handlers/account/create.rs

@@ -45,7 +45,7 @@ impl Handler<SessionCreate> for DbExecutor {
     type Result = Result<SessionToken, SessionCreateError>;
 
     fn handle(&mut self, msg: SessionCreate, _: &mut Self::Context) -> Self::Result {
-        let credentials = UserNew {
+        let credentials = Credentials {
             email: msg.email,
             password: hasher::hash_password(&msg.password, consts::SALT),
         };

src/handlers/account/login.rs

@@ -13,6 +13,12 @@ pub enum AccountUpdateError {
 
     #[fail(display = "failed_to_update")]
     Failed,
+
+    #[fail(display = "username_empty")]
+    UsernameEmpty,
+
+    #[fail(display = "username_incorrect")]
+    UsernameIncorrect,
 }
 
 impl_response_error_for!(AccountUpdateError as BadRequest);
@@ -23,6 +29,7 @@ pub struct AccountUpdate {
     pub requester_id: i32,
     pub display_name: String,
     pub gravatar_email: String,
+    pub username: String,
 }
 
 impl Message for AccountUpdate {
@@ -33,12 +40,19 @@ impl Handler<AccountUpdate> for DbExecutor {
     type Result = Result<User, AccountUpdateError>;
 
     fn handle(&mut self, msg: AccountUpdate, _: &mut Self::Context) -> Self::Result {
-        User::update(
-            &self.conn,
-            msg.requester_id,
-            msg.display_name,
-            msg.gravatar_email,
-        )
-        .ok_or(AccountUpdateError::Failed)
+        if msg.username.trim().is_empty() {
+            Err(AccountUpdateError::UsernameEmpty)
+        } else if !crate::validators::check_username(msg.username.as_str()) {
+            Err(AccountUpdateError::UsernameIncorrect)
+        } else {
+            User::update(
+                &self.conn,
+                msg.requester_id,
+                msg.display_name,
+                msg.gravatar_email,
+                msg.username,
+            )
+            .ok_or(AccountUpdateError::Failed)
+        }
     }
 }

src/handlers/account/update.rs

@@ -4,7 +4,7 @@ use crate::app_state::DbExecutor;
 use crate::models::*;
 
 pub struct GetCardsByAuthor {
-    pub author_id: i32,
+    pub author_username: String,
 }
 
 impl Message for GetCardsByAuthor {
@@ -15,6 +15,10 @@ impl Handler<GetCardsByAuthor> for DbExecutor {
     type Result = Option<Vec<Card>>;
 
     fn handle(&mut self, msg: GetCardsByAuthor, _ctx: &mut Self::Context) -> Self::Result {
-        Some(Card::find_all_by_author(&self.conn, msg.author_id))
+        if let Some(user) = User::find_by_username(&self.conn, msg.author_username) {
+            Some(Card::find_all_by_author(&self.conn, user.id))
+        } else {
+            None
+        }
     }
 }

src/handlers/users/cards_by_author.rs

@@ -4,7 +4,7 @@ use crate::app_state::DbExecutor;
 use crate::models::*;
 
 pub struct GetUser {
-    pub user_id: i32,
+    pub username: String,
 }
 
 impl Message for GetUser {
@@ -15,6 +15,6 @@ impl Handler<GetUser> for DbExecutor {
     type Result = Option<User>;
 
     fn handle(&mut self, msg: GetUser, _ctx: &mut Self::Context) -> Self::Result {
-        User::find_by_id(&self.conn, msg.user_id)
+        User::find_by_username(&self.conn, msg.username)
     }
 }