From 4332ac043573039d1f9238cc0b811d0eb81509a3 Mon Sep 17 00:00:00 2001
From: Niharika Khanna <nkhanna@nkhanna-10163.local>
Date: Fri, 25 Aug 2017 23:26:55 +0530
Subject: [PATCH] fix disconnect button

---
 server/src/pages/settings/controller.js | 2 +-
 server/src/pages/settings/view.js       | 2 +-
 server/src/server.js                    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/src/pages/settings/controller.js b/server/src/pages/settings/controller.js
index b79c44eaed..bd103297b3 100644
--- a/server/src/pages/settings/controller.js
+++ b/server/src/pages/settings/controller.js
@@ -19,7 +19,7 @@ exports.disconnectDevice = function() {
       // FIXME: a lame way to do an error message
       window.alert("Error disconnecting: " + req.status + " " + req.statusText);
     } else {
-      location.href = model.backend + "/settings";
+      location.reload();
     }
   };
   req.send(`_csrf=${encodeURIComponent(model.csrfToken)}`);
diff --git a/server/src/pages/settings/view.js b/server/src/pages/settings/view.js
index 3c6b7c4006..3a91f5417e 100644
--- a/server/src/pages/settings/view.js
+++ b/server/src/pages/settings/view.js
@@ -43,7 +43,7 @@ class Body extends React.Component {
           <div className="info-container">
             <p className="username title">{this.props.accountInfo.nickname || this.props.accountInfo.email}</p>
             { this.props.accountInfo.nickname ? <p className="email info">{this.props.accountInfo.email}</p> : null }
-            <a className="account-buttons disconnect" href="" onClick={ this.onClickDisconnect.bind(this) }>Disconnect</a>
+            <button className="account-buttons disconnect" onClick={ this.onClickDisconnect.bind(this) }>Disconnect</button>
           </div>
         </div>
       );
diff --git a/server/src/server.js b/server/src/server.js
index de7f94392e..a766c011d8 100644
--- a/server/src/server.js
+++ b/server/src/server.js
@@ -677,7 +677,8 @@ app.post("/api/disconnect-device", csrfProtection, function(req, res) {
     let cookies = new Cookies(req, res, {keys: keygrip});
     if (result) {
       cookies.set("accountid");
-      res.redirect('/settings');
+      cookies.set("accountid.sig");
+      simpleResponse(res, "ok", 200);
     }
   }).catch((err) => {
     errorResponse(res, "Error: could not disconnect", err);