From 51d3c7646079bf490f1731b1f7e9cc29128bf437 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Fri, 19 Jul 2019 19:19:29 +1000
Subject: [PATCH] wip

---
 client/src/components/login.jsx |  8 +++-----
 server/src/net.rs               | 24 +++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/client/src/components/login.jsx b/client/src/components/login.jsx
index 5e8c6876..5136031f 100644
--- a/client/src/components/login.jsx
+++ b/client/src/components/login.jsx
@@ -12,11 +12,9 @@ const addState = connect(
         } = state;
         function submitLogin(name, password) {
             postData('/login', { name, password })
-                .then(res => {
-                    if (!res.ok) return errorToast(res);
-                    res.text()
-                })
-                .then(res => {
+                .then(res => res.json())
+                .then(data => {
+                    if (!data.success) return errorToast(data.error_message);
                     ws.connect();
                 })
                 .catch(error => errorToast(error));
diff --git a/server/src/net.rs b/server/src/net.rs
index 12eb66d7..4e0ae64b 100644
--- a/server/src/net.rs
+++ b/server/src/net.rs
@@ -5,9 +5,11 @@ use iron::headers::{Cookie as CookieHdr, SetCookie};
 use iron::prelude::*;
 use iron::status;
 use iron::typemap::Key;
+use iron::mime::Mime;
 use iron::{typemap, BeforeMiddleware,AfterMiddleware};
 use persistent::Read;
 use router::Router;
+use serde::{Serialize, Deserialize};
 
 // use warden::{warden};
 // use pubsub::{pg_listen};
@@ -37,6 +39,23 @@ pub enum MnmlHttpError {
     InvalidCode,
 }
 
+#[derive(Serialize, Deserialize)]
+struct JsonResponse {
+  response: String,
+  success: bool,
+  error_message: String
+}
+
+impl JsonResponse {
+  fn success(response: String) -> Self {
+    JsonResponse { response: response, success: true, error_message: "".to_string() }
+  }
+
+  fn error(msg: String) -> Self {
+    JsonResponse { response: "".to_string(), success: false, error_message: msg }
+  }
+}
+
 impl From<MnmlHttpError> for IronError {
     fn from(m_err: MnmlHttpError) -> Self {
         let (err, res) = match m_err {
@@ -48,8 +67,11 @@ impl From<MnmlHttpError> for IronError {
             MnmlHttpError::PasswordUnacceptable => (m_err.compat(), status::BadRequest),
             MnmlHttpError::InvalidCode => (m_err.compat(), status::Unauthorized),
         };
+        let err_msg = JsonResponse::error("grep".to_string());
+        let err_out = serde_json::to_string(&err_msg).expect("Failed to encode response");
+        let content_type = "application/json".parse::<Mime>().expect("Failed to parse content type");
 
-        IronError::new(err, res)
+        IronError::new(err, (content_type, res, err_out))
     }
 }