feat: create candidate & generate code,

s autoincrementem application id uchazeče normalne funguje
This commit is contained in:
Sebastian Pravda 2022-10-24 18:36:01 +02:00 committed by EETagent
parent 5bd9535b85
commit d44082d3d8
10 changed files with 81 additions and 29 deletions

View file

@ -1,12 +1,9 @@
#[macro_use] #[macro_use]
extern crate rocket; extern crate rocket;
use rocket::{Rocket, Build};
use rocket::serde::json::Json; use rocket::serde::json::Json;
use rocket::fairing::{self, AdHoc}; use rocket::fairing::{self, AdHoc};
use rocket::form::{ Form}; use rocket::response::status::BadRequest;
use rocket::fs::{relative, FileServer};
use rocket::response::{Flash, Redirect};
use rocket::{Build, Rocket};
use portfolio_core::{Mutation, Query}; use portfolio_core::{Mutation, Query};
use migration::MigratorTrait; use migration::MigratorTrait;
@ -18,18 +15,21 @@ use pool::Db;
pub use entity::candidate; pub use entity::candidate;
pub use entity::candidate::Entity as Candidate; pub use entity::candidate::Entity as Candidate;
use portfolio_core::crypto::{self, random_8_char_string};
#[post("/", data = "<post_form>")] #[post("/", data = "<post_form>")]
async fn create(conn: Connection<'_, Db>, post_form: Json<candidate::Model>) -> Flash<Redirect> { async fn create(conn: Connection<'_, Db>, post_form: Json<candidate::Model>) -> Result<String, BadRequest<String>> {
let db = conn.into_inner(); let db = conn.into_inner();
let form = post_form.into_inner(); let form = post_form.into_inner();
Mutation::create_candidate(db, form) let plain_text_password = random_8_char_string();
Mutation::create_candidate(db, form, &plain_text_password)
.await .await
.expect("could not insert post"); .expect("could not insert post");
Flash::success(Redirect::to("/"), "Post successfully added.") Ok(plain_text_password)
} }
#[get("/hello")] #[get("/hello")]

View file

@ -5,6 +5,9 @@ edition = "2021"
[dependencies] [dependencies]
portfolio-entity = { path = "../entity" } portfolio-entity = { path = "../entity" }
rand = "0.8.5"
rust-argon2 = "1.0.0"
chrono = "0.4.22"
[dependencies.sea-orm] [dependencies.sea-orm]
version = "^0.10.0" version = "^0.10.0"

25
core/src/crypto.rs Normal file
View file

@ -0,0 +1,25 @@
use argon2::{self, Config};
use rand::Rng;
pub fn random_8_char_string() -> String {
rand::thread_rng()
.sample_iter(&rand::distributions::Alphanumeric)
.take(8)
.map(char::from)
.collect::<String>()
}
pub fn hash_password(password_plaint_text: &str) -> String {
let hash = argon2::hash_encoded(
password_plaint_text.as_bytes(),
b"secretlytestingeverything",
&Config::default()
)
.unwrap();
hash
}
pub fn verify_password(password_plaint_text: &str, hash: &str) -> bool {
argon2::verify_encoded(hash, password_plaint_text.as_bytes()).unwrap()
}

View file

@ -1,5 +1,6 @@
mod mutation; mod mutation;
mod query; mod query;
pub mod crypto;
pub use mutation::*; pub use mutation::*;
pub use query::*; pub use query::*;

View file

@ -1,5 +1,6 @@
use ::entity::{candidate, candidate::Entity as Candidate}; use ::entity::{candidate, candidate::Entity as Candidate};
use sea_orm::*; use sea_orm::*;
use crate::crypto::{self, hash_password};
pub struct Mutation; pub struct Mutation;
@ -7,7 +8,19 @@ impl Mutation {
pub async fn create_candidate( pub async fn create_candidate(
db: &DbConn, db: &DbConn,
form_data: candidate::Model, form_data: candidate::Model,
plain_text_password: &String,
) -> Result<candidate::ActiveModel, DbErr> { ) -> Result<candidate::ActiveModel, DbErr> {
todo!() let hashed_password = hash_password(plain_text_password);
candidate::ActiveModel {
application: Set(145 as i32), // TODO NEFUNGUJE
code: Set(hashed_password),
public_key: Set("lorem ipsum pub key".to_string()),
private_key: Set("lorem ipsum priv key".to_string()),
created_at: Set(chrono::offset::Local::now().naive_local()),
updated_at: Set(chrono::offset::Local::now().naive_local()),
..Default::default()
}
.save(db)
.await
} }
} }

View file

@ -1,10 +1,8 @@
//! SeaORM Entity. Generated by sea-orm-codegen 0.9.3 //! SeaORM Entity. Generated by sea-orm-codegen 0.9.3
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
use rocket::serde::{Deserialize, Serialize};
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
#[serde(crate = "rocket::serde")]
#[sea_orm(table_name = "admin")] #[sea_orm(table_name = "admin")]
pub struct Model { pub struct Model {
#[sea_orm(primary_key)] #[sea_orm(primary_key)]

View file

@ -1,7 +1,8 @@
//! SeaORM Entity. Generated by sea-orm-codegen 0.10.0 //! SeaORM Entity. Generated by sea-orm-codegen 0.9.3
use chrono::{DateTime, NaiveDate, Local};
use rocket::serde::{Deserialize, Serialize};
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
use rocket::serde::{self, Deserialize, Serialize};
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
#[serde(crate = "rocket::serde")] #[serde(crate = "rocket::serde")]
@ -9,26 +10,30 @@ use sea_orm::entity::prelude::*;
pub struct Model { pub struct Model {
#[sea_orm(primary_key, auto_increment = false)] #[sea_orm(primary_key, auto_increment = false)]
pub application: i32, pub application: i32,
#[serde(skip_deserializing, skip_serializing)]
pub code: String, pub code: String,
pub name: Option<String>, pub name: Option<String>,
pub surname: Option<String>, pub surname: Option<String>,
pub birth_surname: Option<String>, pub birth_surname: Option<String>,
pub birthplace: Option<String>, pub birthplace: Option<String>,
pub birthdate: Option<NaiveDate>, pub birthdate: Option<Date>,
pub address: Option<String>, pub address: Option<String>,
pub telephone: Option<String>, pub telephone: Option<String>,
#[sea_orm(default_value="Česká republika")]
pub citizenship: Option<String>, pub citizenship: Option<String>,
pub email: Option<String>, pub email: Option<String>,
pub sex: Option<String>, pub sex: Option<String>,
pub study: Option<String>, pub study: Option<String>,
pub personal_identification_number: Option<String>, pub personal_identification_number: Option<String>,
#[sea_orm(column_type = "Text")] #[sea_orm(column_type = "Text", nullable)]
pub personal_identification_number_hash: Option<String>, pub personal_identification_number_hash: Option<String>,
#[serde(skip_deserializing, skip_serializing)]
pub public_key: String, pub public_key: String,
#[serde(skip_deserializing, skip_serializing)]
pub private_key: String, pub private_key: String,
pub created_at: DateTime<Local>, #[serde(skip_deserializing, skip_serializing)]
pub updated_at: DateTime<Local>, pub created_at: DateTime,
#[serde(skip_deserializing, skip_serializing)]
pub updated_at: DateTime,
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

7
entity/src/mod.rs Normal file
View file

@ -0,0 +1,7 @@
//! SeaORM Entity. Generated by sea-orm-codegen 0.9.3
pub mod prelude;
pub mod admin;
pub mod candidate;
pub mod parent;

View file

@ -1,10 +1,8 @@
//! SeaORM Entity. Generated by sea-orm-codegen 0.10.0 //! SeaORM Entity. Generated by sea-orm-codegen 0.9.3
use sea_orm::entity::prelude::*;
use chrono::{DateTime, Local};
use rocket::serde::{Deserialize, Serialize};
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] use sea_orm::entity::prelude::*;
#[serde(crate = "rocket::serde")]
#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
#[sea_orm(table_name = "parent")] #[sea_orm(table_name = "parent")]
pub struct Model { pub struct Model {
#[sea_orm(primary_key, auto_increment = false)] #[sea_orm(primary_key, auto_increment = false)]
@ -13,8 +11,8 @@ pub struct Model {
pub surname: Option<String>, pub surname: Option<String>,
pub telephone: Option<String>, pub telephone: Option<String>,
pub email: Option<String>, pub email: Option<String>,
pub created_at: DateTime<Local>, pub created_at: DateTime,
pub updated_at: DateTime<Local>, pub updated_at: DateTime,
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

View file

@ -1,3 +1,5 @@
//! SeaORM Entity. Generated by sea-orm-codegen 0.9.3
pub use super::admin::Entity as Admin; pub use super::admin::Entity as Admin;
pub use super::candidate::Entity as Candidate; pub use super::candidate::Entity as Candidate;
pub use super::parent::Entity as Parent; pub use super::parent::Entity as Parent;