diff --git a/server/src/api/auth.rs b/server/src/api/auth.rs index 6bb75e9..edf0d28 100644 --- a/server/src/api/auth.rs +++ b/server/src/api/auth.rs @@ -52,7 +52,7 @@ pub(super) async fn sign_up( user_data: Json, cookies: &CookieJar<'_>, ) -> ApiResult<()> { - let user_data = user::ActiveModel::new(&user_data.name, &user_data.password)? + let user_data = users::ActiveModel::new(&user_data.name, &user_data.password)? .insert(db as &DatabaseConnection) .await .map_err(Error::from)?; diff --git a/server/src/api/tracks.rs b/server/src/api/tracks.rs index 7c59ca2..e78904f 100644 --- a/server/src/api/tracks.rs +++ b/server/src/api/tracks.rs @@ -31,7 +31,7 @@ pub(super) async fn all_tracks( async fn get_track_check_user( db: &DatabaseConnection, track_id: i32, - user: &user::Model, + user: &users::Model, ) -> Result, Either> { if let Some(Some(user)) = user .find_related(Tracks) diff --git a/server/src/entities/mod.rs b/server/src/entities/mod.rs index 2facb82..c9107ae 100644 --- a/server/src/entities/mod.rs +++ b/server/src/entities/mod.rs @@ -6,5 +6,5 @@ pub mod groups; pub mod ticks; pub mod track2_groups; pub mod tracks; -pub mod user; pub mod user_tracks; +pub mod users; diff --git a/server/src/entities/prelude.rs b/server/src/entities/prelude.rs index ee9de0e..5b17141 100644 --- a/server/src/entities/prelude.rs +++ b/server/src/entities/prelude.rs @@ -4,5 +4,5 @@ pub use super::groups::Entity as Groups; pub use super::ticks::Entity as Ticks; pub use super::track2_groups::Entity as Track2Groups; pub use super::tracks::Entity as Tracks; -pub use super::user::Entity as User; pub use super::user_tracks::Entity as UserTracks; +pub use super::users::Entity as Users; diff --git a/server/src/entities/tracks.rs b/server/src/entities/tracks.rs index 4b1b7f3..b3dfde0 100644 --- a/server/src/entities/tracks.rs +++ b/server/src/entities/tracks.rs @@ -46,9 +46,9 @@ impl Related for Entity { } } -impl Related for Entity { +impl Related for Entity { fn to() -> RelationDef { - super::user_tracks::Relation::User.def() + super::user_tracks::Relation::Users.def() } fn via() -> Option { Some(super::user_tracks::Relation::Tracks.def().rev()) diff --git a/server/src/entities/user_tracks.rs b/server/src/entities/user_tracks.rs index 45214d7..a244d53 100644 --- a/server/src/entities/user_tracks.rs +++ b/server/src/entities/user_tracks.rs @@ -22,13 +22,13 @@ pub enum Relation { )] Tracks, #[sea_orm( - belongs_to = "super::user::Entity", + belongs_to = "super::users::Entity", from = "Column::UserId", - to = "super::user::Column::Id", + to = "super::users::Column::Id", on_update = "NoAction", on_delete = "NoAction" )] - User, + Users, } impl Related for Entity { @@ -37,9 +37,9 @@ impl Related for Entity { } } -impl Related for Entity { +impl Related for Entity { fn to() -> RelationDef { - Relation::User.def() + Relation::Users.def() } } diff --git a/server/src/entities/user.rs b/server/src/entities/users.rs similarity index 89% rename from server/src/entities/user.rs rename to server/src/entities/users.rs index 0eae7c1..c79c5de 100644 --- a/server/src/entities/user.rs +++ b/server/src/entities/users.rs @@ -5,7 +5,7 @@ use std::default::default; use bcrypt::*; // TODO Add option for argon2 https://docs.rs/argon2/latest/argon2/ use either::Either::{self, Left, Right}; -use rocket::response::status::Unauthorized; +use rocket::http::Status; use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; @@ -17,7 +17,7 @@ use crate::{ use super::tracks; #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] -#[sea_orm(table_name = "user")] +#[sea_orm(table_name = "users")] pub struct Model { #[sea_orm(primary_key)] #[serde(skip_deserializing)] @@ -43,7 +43,7 @@ impl Related for Entity { } fn via() -> Option { - Some(super::user_tracks::Relation::User.def().rev()) + Some(super::user_tracks::Relation::Users.def().rev()) } } @@ -65,11 +65,8 @@ impl ActiveModel { impl Model { pub fn check_password( self, - password: String, - ) -> std::result::Result, ErrorResponder>> { match verify(password, &self.password_hash) { Ok(true) => Ok(self), - Ok(false) => Err(Left(Unauthorized(None))), Err(err) => Err(Right(Error::from(err).into())), } } diff --git a/server/src/migrator/m20230626_083036_create_users_table.rs b/server/src/migrator/m20230626_083036_create_users_table.rs index 6c8e7b7..7e77a64 100644 --- a/server/src/migrator/m20230626_083036_create_users_table.rs +++ b/server/src/migrator/m20230626_083036_create_users_table.rs @@ -9,17 +9,17 @@ impl MigrationTrait for Migration { manager .create_table( Table::create() - .table(User::Table) + .table(Users::Table) .if_not_exists() .col( - ColumnDef::new(User::Id) + ColumnDef::new(Users::Id) .integer() .not_null() .auto_increment() .primary_key(), ) - .col(ColumnDef::new(User::Name).string().not_null()) - .col(ColumnDef::new(User::PasswordHash).string().not_null()) + .col(ColumnDef::new(Users::Name).string().unique_key().not_null()) + .col(ColumnDef::new(Users::PasswordHash).string().not_null()) .to_owned(), ) .await @@ -27,14 +27,14 @@ impl MigrationTrait for Migration { async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> { manager - .drop_table(Table::drop().table(User::Table).to_owned()) + .drop_table(Table::drop().table(Users::Table).to_owned()) .await } } /// Learn more at https://docs.rs/sea-query#iden #[derive(Iden)] -pub(crate) enum User { +pub(crate) enum Users { Table, Id, Name, diff --git a/server/src/migrator/m20230626_150551_associate_users_and_tracks.rs b/server/src/migrator/m20230626_150551_associate_users_and_tracks.rs index 186de49..b2bfcfd 100644 --- a/server/src/migrator/m20230626_150551_associate_users_and_tracks.rs +++ b/server/src/migrator/m20230626_150551_associate_users_and_tracks.rs @@ -1,5 +1,5 @@ use super::{ - m20230606_000001_create_tracks_table::Tracks, m20230626_083036_create_users_table::User, + m20230606_000001_create_tracks_table::Tracks, m20230626_083036_create_users_table::Users, }; use sea_orm_migration::prelude::*; @@ -27,7 +27,7 @@ impl MigrationTrait for Migration { ForeignKey::create() .name("fk-user_tracks-user_id") .from(UserTracks::Table, UserTracks::UserId) - .to(User::Table, User::Id), + .to(Users::Table, Users::Id), ) .foreign_key( ForeignKey::create()