diff --git a/client/src/components/login.component.jsx b/client/src/components/login.component.jsx index 9603f3dc..67b89685 100644 --- a/client/src/components/login.component.jsx +++ b/client/src/components/login.component.jsx @@ -1,7 +1,7 @@ // eslint-disable-next-line const preact = require('preact'); -function renderLogin({ submitLogin, submitRegister, submitDemo }) { +function renderLogin({ submitLogin, submitRegister }) { const details = { name: '', password: '', @@ -31,11 +31,6 @@ function renderLogin({ submitLogin, submitRegister, submitDemo }) { onClick={() => submitRegister(details.name, details.password)}> Register - ); } diff --git a/client/src/components/login.container.jsx b/client/src/components/login.container.jsx index 8d8a75e1..7aac33d9 100644 --- a/client/src/components/login.container.jsx +++ b/client/src/components/login.container.jsx @@ -11,10 +11,7 @@ const addState = connect( function submitRegister(name, password) { return ws.sendAccountCreate(name, password); } - function submitDemo() { - return ws.sendAccountDemo(); - } - return { account: state.account, submitLogin, submitRegister, submitDemo }; + return { account: state.account, submitLogin, submitRegister }; }, ); diff --git a/client/src/socket.jsx b/client/src/socket.jsx index 13388178..d45be58a 100644 --- a/client/src/socket.jsx +++ b/client/src/socket.jsx @@ -47,10 +47,6 @@ function createSocket(events) { send({ method: 'account_create', params: { name, password } }); } - function sendAccountDemo() { - send({ method: 'account_demo', params: {} }); - } - function sendAccountCryps() { send({ method: 'account_cryps', params: {} }); } @@ -342,7 +338,6 @@ function createSocket(events) { clearInstanceStateTimeout, sendAccountLogin, sendAccountCreate, - sendAccountDemo, sendAccountCryps, sendAccountInstances, sendAccountZone, diff --git a/server/src/account.rs b/server/src/account.rs index 6eb9b1a1..d2cadc7f 100644 --- a/server/src/account.rs +++ b/server/src/account.rs @@ -65,6 +65,10 @@ pub fn account_create(params: AccountCreateParams, tx: &mut Transaction) -> Resu return Err(err_msg("password must be at least 12 characters")); } + if params.password != "grepgrepgrep" { + return Err(err_msg("https://discord.gg/YJJgurM")); + } + if params.name.len() == 0 { return Err(err_msg("account name not supplied")); } diff --git a/server/src/rpc.rs b/server/src/rpc.rs index 0d7f0ad1..6b38c53a 100644 --- a/server/src/rpc.rs +++ b/server/src/rpc.rs @@ -57,7 +57,6 @@ impl Rpc { match v.method.as_ref() { "account_create" => (), "account_login" => (), - "account_demo" => (), _ => match account { Some(_) => (), None => return Err(err_msg("auth required")), @@ -70,7 +69,6 @@ impl Rpc { // no auth methods "account_create" => Rpc::account_create(data, &mut tx, client), "account_login" => Rpc::account_login(data, &mut tx, client), - "account_demo" => Rpc::account_demo(data, &mut tx, client), // auth methods "account_cryps" => Rpc::account_cryps(data, &mut tx, account.unwrap(), client), @@ -204,29 +202,29 @@ impl Rpc { } } - fn account_demo(_data: Vec, tx: &mut Transaction, _client: &mut WebSocket) -> Result { - let mut rng = thread_rng(); + // fn account_demo(_data: Vec, tx: &mut Transaction, _client: &mut WebSocket) -> Result { + // let mut rng = thread_rng(); - let acc_name: String = iter::repeat(()).map(|()| rng.sample(Alphanumeric)).take(8).collect(); + // let acc_name: String = iter::repeat(()).map(|()| rng.sample(Alphanumeric)).take(8).collect(); - let account = account_create(AccountCreateParams { name: acc_name, password: "grepgrepgrep".to_string() }, tx)?; + // let account = account_create(AccountCreateParams { name: acc_name, password: "grepgrepgrep".to_string() }, tx)?; - let name: String = iter::repeat(()).map(|()| rng.sample(Alphanumeric)).take(8).collect(); - cryp_spawn(CrypSpawnParams { name }, tx, &account)?; + // let name: String = iter::repeat(()).map(|()| rng.sample(Alphanumeric)).take(8).collect(); + // cryp_spawn(CrypSpawnParams { name }, tx, &account)?; - let name: String = iter::repeat(()).map(|()| rng.sample(Alphanumeric)).take(8).collect(); - cryp_spawn(CrypSpawnParams { name }, tx, &account)?; + // let name: String = iter::repeat(()).map(|()| rng.sample(Alphanumeric)).take(8).collect(); + // cryp_spawn(CrypSpawnParams { name }, tx, &account)?; - let name: String = iter::repeat(()).map(|()| rng.sample(Alphanumeric)).take(8).collect(); - cryp_spawn(CrypSpawnParams { name }, tx, &account)?; + // let name: String = iter::repeat(()).map(|()| rng.sample(Alphanumeric)).take(8).collect(); + // cryp_spawn(CrypSpawnParams { name }, tx, &account)?; - let res = RpcResponse { - method: "account_create".to_string(), - params: RpcResult::Account(account), - }; + // let res = RpcResponse { + // method: "account_create".to_string(), + // params: RpcResult::Account(account), + // }; - return Ok(res); - } + // return Ok(res); + // } fn account_cryps(_data: Vec, tx: &mut Transaction, account: Account, _client: &mut WebSocket) -> Result {