Merge pull request #24 from ZeusWPI/enhance-user-model

Enhance user model

Cargo.toml

@@ -19,7 +19,8 @@ serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 serde_urlencoded = "0.6"
-diesel = { version = "1.4", features = ["postgres", "r2d2"] }
+diesel = { version = "1.4", features = ["postgres", "r2d2", "chrono"] }
+diesel-derive-enum = { version = "1", features = ["postgres"] }
 diesel_migrations = "1.4"
 tempfile = "3.1"
 maplit = "1.0"
@@ -28,6 +29,6 @@ parking_lot = { version = "0.11", features = ["nightly"] }
 thiserror = "1.0.20"
 
 [dependencies.rocket_contrib]
-version="0.4.2"
+version = "0.4.2"
 default-features = false
 features = ["json", "diesel_postgres_pool",  "serve"]

README.md

@@ -16,9 +16,10 @@ The name is open for discussion.
   with `cargo install diesel_cli`.
 
 4. Create the development and testing database with
-  `diesel database reset --database-url "postgresql://zauth:zauth@localhost/zauth"`
-  and
-  `diesel database reset --database-url "postgresql://zauth:zauth@localhost/zauth_test"`.
+    ```shell script
+    diesel database reset --database-url "postgresql://zauth:zauth@localhost/zauth"
+    diesel database reset --database-url "postgresql://zauth:zauth@localhost/zauth_test"
+    ```     
   This will also run the migrations.
 
 5. You can start the server with `cargo run`.
@@ -27,7 +28,7 @@ The name is open for discussion.
     ```
     ZAUTH_ADMIN_PASSWORD=admin cargo run
     ```
-   The server should then run on[localhost:8000](http://localhost:8000) and create
+   The server should then run on [localhost:8000](http://localhost:8000) and create
    an admin user with password 'admin'.
 
 You can now start developing! A good way to start is to look at the routes defined in the [controllers](./src/controllers/).

diesel.toml

@@ -2,3 +2,5 @@
 # see diesel.rs/guides/configuring-diesel-cli
 
 [print_schema]
+file = "src/schema.rs"
+import_types = ["diesel::sql_types::*", "crate::user_state::*"]   # <- note the extra import

migrations/2019-10-30-155718_schema/up.sql

@@ -1,14 +1,30 @@
-CREATE TABLE users (
-    id       SERIAL PRIMARY KEY,
-    username VARCHAR(255) NOT NULL UNIQUE,
-    password VARCHAR(255) NOT NULL,
-    admin    BOOLEAN NOT NULL DEFAULT false
+CREATE TYPE user_state AS ENUM ('pending', 'active', 'disabled');
+
+CREATE TABLE users
+(
+    id              SERIAL PRIMARY KEY,
+    username        VARCHAR(255) NOT NULL UNIQUE,
+    hashed_password VARCHAR(255) NOT NULL,
+    admin           BOOLEAN      NOT NULL DEFAULT false,
+    first_name      VARCHAR(255) NOT NULL,
+    last_name       VARCHAR(255) NOT NULL,
+    email           VARCHAR(255) NOT NULL UNIQUE,
+    ssh_key         TEXT,
+    state           user_state   NOT NULL DEFAULT 'pending',
+    last_login      TIMESTAMP    NOT NULL,
+    created_at      TIMESTAMP    NOT NULL DEFAULT NOW()
 );
 
-CREATE TABLE clients (
-    id                  SERIAL PRIMARY KEY,
-    name                VARCHAR(255) NOT NULL UNIQUE,
-    secret              VARCHAR(255) NOT NULL,
-    needs_grant         BOOLEAN NOT NULL DEFAULT false,
-    redirect_uri_list   TEXT NOT NULL DEFAULT ''
+CREATE INDEX ix_users_username ON users (username);
+CREATE INDEX ix_users_email ON users (email);
+
+
+CREATE TABLE clients
+(
+    id                SERIAL PRIMARY KEY,
+    name              VARCHAR(255) NOT NULL UNIQUE,
+    secret            VARCHAR(255) NOT NULL,
+    needs_grant       BOOLEAN      NOT NULL DEFAULT false,
+    redirect_uri_list TEXT         NOT NULL DEFAULT '',
+    created_at        TIMESTAMP    NOT NULL DEFAULT NOW()
 );

src/controllers/sessions_controller.rs

@@ -47,7 +47,7 @@ pub fn create_session(
 		Ok(Either::Right(template! {
 			"session/login.html";
 			state: String = form.state.unwrap(),
-			error: Option<String> = Some(String::from("Usernae or password incorrect")),
+			error: Option<String> = Some(String::from("Username or password incorrect")),
 		}))
 	}
 }

src/lib.rs

@@ -112,16 +112,24 @@ fn assemble(rocket: Rocket) -> Rocket {
 						.or_else(|_e| {
 							User::create(
 								NewUser {
-									username: String::from("admin"),
-									password: String::from(&pw),
+									username:   String::from("admin"),
+									password:   String::from(&pw),
+									first_name: String::from(""),
+									last_name:  String::from(""),
+									email:      String::from(""),
+									ssh_key:    None,
 								},
 								&conn,
 							)
 						})
 						.and_then(|mut user| {
 							user.change_with(UserChange {
-								username: None,
-								password: Some(pw),
+								username:   None,
+								password:   Some(pw),
+								first_name: None,
+								last_name:  None,
+								email:      None,
+								ssh_key:    None,
 							})?;
 							user.admin = true;
 							user.update(&conn)

src/models/client.rs

@@ -7,6 +7,8 @@ use crate::ConcreteConnection;
 
 use self::schema::clients;
 
+use chrono::{NaiveDateTime, Utc};
+
 const SECRET_LENGTH: usize = 64;
 
 mod schema {
@@ -17,6 +19,7 @@ mod schema {
 			secret -> Text,
 			needs_grant -> Bool,
 			redirect_uri_list -> Text,
+			created_at -> Timestamp,
 		}
 	}
 }
@@ -28,6 +31,7 @@ pub struct Client {
 	pub secret:            String,
 	pub needs_grant:       bool,
 	pub redirect_uri_list: String,
+	pub created_at:        NaiveDateTime,
 }
 
 #[derive(FromForm, Deserialize, Debug, Clone)]