From 9c45a3fb7a3898a89f64644073023db0a1b122e0 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Fri, 19 Jul 2019 19:46:54 +1000
Subject: [PATCH] getting somewhere

---
 client/src/components/login.jsx |  1 +
 server/src/net.rs               | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/client/src/components/login.jsx b/client/src/components/login.jsx
index 5136031f..22fbdaff 100644
--- a/client/src/components/login.jsx
+++ b/client/src/components/login.jsx
@@ -15,6 +15,7 @@ const addState = connect(
                 .then(res => res.json())
                 .then(data => {
                     if (!data.success) return errorToast(data.error_message);
+                    console.log(data.response);
                     ws.connect();
                 })
                 .catch(error => errorToast(error));
diff --git a/server/src/net.rs b/server/src/net.rs
index 4e0ae64b..80766191 100644
--- a/server/src/net.rs
+++ b/server/src/net.rs
@@ -20,7 +20,7 @@ use payments::{stripe};
 
 pub const TOKEN_HEADER: &str = "x-auth-token";
 
-#[derive(Fail, Debug, Serialize, Deserialize)]
+#[derive(Clone, Copy, Fail, Debug, Serialize, Deserialize)]
 pub enum MnmlHttpError {
     // User Facing Errors
     #[fail(display="internal server error")]
@@ -67,7 +67,7 @@ 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_msg = JsonResponse::error(m_err.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");
 
@@ -132,8 +132,16 @@ fn token_res(token: String) -> Response {
         .max_age(Duration::weeks(1)) // 1 week aligns with db set
         .finish();
 
-    let mut res = Response::with(status::Ok);
-    res.headers.set(SetCookie(vec![v.to_string()]));
+        let content_type = "application/json".parse::<Mime>().expect("Failed to parse content type");
+        let msg = JsonResponse {
+            response: "success666".to_string(),
+            success: true,
+            error_message: "".to_string()
+        };
+        let msg_out = serde_json::to_string(&msg).expect("Failed to encode response");
+
+        let mut res = Response::with((content_type, status::Ok, msg_out));
+        res.headers.set(SetCookie(vec![v.to_string()]));
 
     return res;
 }