From 7e2a95204ef15497e317f02403c9955cebdad522 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Sat, 25 May 2019 15:52:37 +1000
Subject: [PATCH] more renaming

---
 client/src/components/login.component.jsx     |  4 +--
 client/src/components/login.container.jsx     |  1 +
 client/src/components/spawn.button.jsx        |  1 -
 ops/init_db.sh                                |  8 +++---
 ops/knexfile.js                               |  4 +--
 ....js => 20180916221309_constructs_table.js} |  0
 ops/migrations/20181020104420_games.js        | 10 -------
 ops/migrations/20181228162012_zones.js        | 28 -------------------
 ...cryps.gg.nginx.conf => mnml.gg.nginx.conf} | 13 +++++----
 server/.env                                   |  2 +-
 server/Cargo.toml                             |  4 +--
 server/src/account.rs                         |  5 ++--
 server/src/main.rs                            |  2 +-
 13 files changed, 23 insertions(+), 59 deletions(-)
 rename ops/migrations/{20180916221309_cryps_table.js => 20180916221309_constructs_table.js} (100%)
 delete mode 100644 ops/migrations/20181228162012_zones.js
 rename ops/{cryps.gg.nginx.conf => mnml.gg.nginx.conf} (68%)

diff --git a/client/src/components/login.component.jsx b/client/src/components/login.component.jsx
index 67b89685..3a2d7e2d 100644
--- a/client/src/components/login.component.jsx
+++ b/client/src/components/login.component.jsx
@@ -13,13 +13,13 @@ function renderLogin({ submitLogin, submitRegister }) {
                 className="login-input"
                 type="email"
                 placeholder="username"
-                onChange={e => (details.name = e.target.value)}
+                onInput={e => details.name = e.target.value}
             />
             <input
                 className="login-input"
                 type="password"
                 placeholder="password"
-                onChange={e => (details.password = e.target.value)}
+                onInput={e => details.password = e.target.value}
             />
             <button
                 className="login-btn"
diff --git a/client/src/components/login.container.jsx b/client/src/components/login.container.jsx
index 7aac33d9..0cba679e 100644
--- a/client/src/components/login.container.jsx
+++ b/client/src/components/login.container.jsx
@@ -9,6 +9,7 @@ const addState = connect(
             return ws.sendAccountLogin(name, password);
         }
         function submitRegister(name, password) {
+            console.log(name, password);
             return ws.sendAccountCreate(name, password);
         }
         return { account: state.account, submitLogin, submitRegister };
diff --git a/client/src/components/spawn.button.jsx b/client/src/components/spawn.button.jsx
index 1510b2a5..f571216b 100644
--- a/client/src/components/spawn.button.jsx
+++ b/client/src/components/spawn.button.jsx
@@ -13,7 +13,6 @@ class SpawnButton extends Component {
     }
 
     handleInput(event) {
-        console.log(event.target.value);
         this.setState({ value: event.target.value });
     }
 
diff --git a/ops/init_db.sh b/ops/init_db.sh
index e80a5f3a..ba7203d6 100755
--- a/ops/init_db.sh
+++ b/ops/init_db.sh
@@ -2,10 +2,10 @@
 
 # sudo apt-get install -y postgresql postgresql-contrib
 sudo service postgresql start
-sudo -u postgres dropdb constructs
-sudo -u postgres createdb constructs
-sudo -u postgres createuser --enconstructted constructs
-sudo -u postgres psql -c "alter user constructs with enconstructted password 'craftbeer';"
+sudo -u postgres dropdb mnml
+sudo -u postgres createdb mnml
+sudo -u postgres createuser --encrypted mnml
+sudo -u postgres psql -c "alter user mnml with encrypted password 'craftbeer';"
 
 # npm i
 npm run migrate
diff --git a/ops/knexfile.js b/ops/knexfile.js
index 8b096d38..7c5e1ce0 100755
--- a/ops/knexfile.js
+++ b/ops/knexfile.js
@@ -3,8 +3,8 @@
 const local = {
   client: 'postgresql',
   connection: {
-    database: 'constructs',
-    user:     'constructs',
+    database: 'mnml',
+    user:     'mnml',
     password: 'craftbeer'
   },
   pool: {
diff --git a/ops/migrations/20180916221309_cryps_table.js b/ops/migrations/20180916221309_constructs_table.js
similarity index 100%
rename from ops/migrations/20180916221309_cryps_table.js
rename to ops/migrations/20180916221309_constructs_table.js
diff --git a/ops/migrations/20181020104420_games.js b/ops/migrations/20181020104420_games.js
index b71d6718..2e17ba79 100644
--- a/ops/migrations/20181020104420_games.js
+++ b/ops/migrations/20181020104420_games.js
@@ -1,5 +1,3 @@
-const NULL_UUID = '00000000-0000-0000-0000-000000000000';
-
 exports.up = async knex => {
     await knex.schema.createTable('games', table => {
         table.uuid('id').primary();
@@ -67,14 +65,6 @@ exports.up = async knex => {
             .inTable('games')
             .onDelete('NO ACTION');
     });
-
-
-    // not really sure if this is a good idea
-    await knex('instances').insert({
-        id: NULL_UUID,
-        data: 'INVALID',
-        open: false,
-    });
 };
 
 exports.down = async () => {};
\ No newline at end of file
diff --git a/ops/migrations/20181228162012_zones.js b/ops/migrations/20181228162012_zones.js
deleted file mode 100644
index fc8ce077..00000000
--- a/ops/migrations/20181228162012_zones.js
+++ /dev/null
@@ -1,28 +0,0 @@
-exports.up = async knex => {
-    await knex.schema.createTable('zones', async (table) => {
-        table.uuid('id').primary();
-        table.index('id');
-        table.timestamps(true, true);
-
-        table.binary('data').notNullable();
-
-        table.boolean('active')
-          .defaultTo(true)
-          .notNullable();
-
-        table.uuid('account').notNullable()
-        table.foreign('account')
-          .references('id')
-          .inTable('accounts')
-          .onDelete('CASCADE');
-
-        table.index('account');
-
-        await knex.schema.raw(
-        // eslint-disable-next-line max-len
-            'CREATE UNIQUE INDEX zones_account_active ON zones (account) WHERE active = true;'
-        );
-    });
-};
-
-exports.down = async () => {};
\ No newline at end of file
diff --git a/ops/cryps.gg.nginx.conf b/ops/mnml.gg.nginx.conf
similarity index 68%
rename from ops/cryps.gg.nginx.conf
rename to ops/mnml.gg.nginx.conf
index 40033a21..8514a380 100644
--- a/ops/cryps.gg.nginx.conf
+++ b/ops/mnml.gg.nginx.conf
@@ -8,7 +8,7 @@ map $http_upgrade $connection_upgrade {
 }
 
 server {
-    root /home/git/constructs/client/dist/;
+    root /home/git/cryps/client/dist/;
     index index.html;
 
     server_name mnml.gg; # managed by Certbot
@@ -23,10 +23,10 @@ server {
 
     listen [::]:443 ssl ipv6only=on; # managed by Certbot
     listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsenconstructt/live/mnml.gg/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsenconstructt/live/mnml.gg/privkey.pem; # managed by Certbot
-    include /etc/letsenconstructt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsenconstructt/ssl-dhparams.pem; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/mnml.gg/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/mnml.gg/privkey.pem; # managed by Certbot
+    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     location /ws {
         proxy_pass http://mnml;
@@ -37,6 +37,7 @@ server {
     }
 }
 
+# http -> https
 server {
     server_name mnml.gg;
     return 301 https://$host$request_uri;
@@ -48,6 +49,6 @@ server {
 }
 
 server {
-    server_name constructs.gg;
+    server_name cryps.gg;
     return 301 https://mnml.gg$request_uri;
 }
diff --git a/server/.env b/server/.env
index 8866a855..c5e1d4fe 100644
--- a/server/.env
+++ b/server/.env
@@ -1 +1 @@
-DATABASE_URL=postgres://constructs:craftbeer@localhost/constructs
+DATABASE_URL=postgres://mnml:craftbeer@localhost/mnml
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 4732d280..d6c4618b 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "constructs"
+name = "mnml"
 version = "0.1.0"
 authors = ["ntr <ntr@smokestack.io>"]
 
@@ -13,7 +13,7 @@ serde_cbor = "0.9"
 chrono = { version = "0.4", features = ["serde"] }
 
 tungstenite = "0.6"
-bconstructt = "0.2"
+bcrypt = "0.2"
 
 dotenv = "0.9.0"
 postgres = { version = "0.15", features = ["with-uuid"] }
diff --git a/server/src/account.rs b/server/src/account.rs
index 31ca4d8f..0fe7655b 100644
--- a/server/src/account.rs
+++ b/server/src/account.rs
@@ -1,5 +1,5 @@
 use uuid::Uuid;
-use bconstructt::{hash, verify};
+use bcrypt::{hash, verify};
 use rand::{thread_rng, Rng};
 use rand::distributions::Alphanumeric;
 use std::iter;
@@ -15,7 +15,7 @@ use instance::{Instance, instance_delete};
 use failure::Error;
 use failure::err_msg;
 
-static PASSWORD_MIN_LEN: usize = 12;
+static PASSWORD_MIN_LEN: usize = 11;
 
 #[derive(Debug,Clone,Serialize,Deserialize)]
 pub struct Account {
@@ -61,6 +61,7 @@ pub fn account_from_token(token: String, tx: &mut Transaction) -> Result<Account
 pub fn account_create(params: AccountCreateParams, tx: &mut Transaction) -> Result<Account, Error> {
     let id = Uuid::new_v4();
 
+    info!("{:?} {:?}", params.password, params.password.len());
     if params.password.len() < PASSWORD_MIN_LEN {
         return Err(err_msg("password must be at least 12 characters"));
     }
diff --git a/server/src/main.rs b/server/src/main.rs
index bda90620..996cbb44 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -1,7 +1,7 @@
 extern crate rand;
 extern crate uuid;
 extern crate tungstenite;
-extern crate bconstructt;
+extern crate bcrypt;
 extern crate chrono;
 
 extern crate dotenv;