From 5877a3234ff77993f1ff880e6c5fd81835251c9a Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrewminer@mac.com>
Date: Wed, 6 Apr 2016 21:19:32 -0700
Subject: [PATCH] Remove experimental session storage mechanism

---
 src/client/client.coffee               | 23 ++++++-----------------
 src/client/site/site_controller.coffee |  5 ++---
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/client/client.coffee b/src/client/client.coffee
index 86b6c4c75..63a431cb7 100644
--- a/src/client/client.coffee
+++ b/src/client/client.coffee
@@ -25,7 +25,7 @@ Backbone.$ = $
 global.logger = new Logger
 
 marked = require 'marked'
-marked.setOptions sanitize: true
+marked.setOptions sanitize:true
 
 ########################################################################################################################
 
@@ -58,23 +58,12 @@ storage = new Storage storage:global.localStorage
 ########################################################################################################################
 
 {CraftingGuideClient} = require 'crafting-guide-common'
-client = new CraftingGuideClient(
-    baseUrl: apiBaseUrl
+client = _(new CraftingGuideClient(baseUrl:apiBaseUrl)).extend Backbone.Events
+client.onStatusChanged = (client, oldStatus, newStatus)->
+    logger.info "Crafting Guide server status changed from #{oldStatus} to #{newStatus}"
+    client.trigger 'change:status', client, oldStatus, newStatus
+    client.trigger 'change', client
 
-    session: storage.load CraftingGuideClient.SESSION
-
-    onSessionChanged: (client, oldSession, newSession)->
-        logger.info "Updated server session data"
-        storage.store CraftingGuideClient.SESSION, session
-        client.trigger 'change:session', client, oldSession, newSession
-        client.trigger 'change', client
-
-    onStatusChanged: (client, oldStatus, newStatus)->
-        logger.info "Crafting Guide server status changed from #{oldStatus} to #{newStatus}"
-        client.trigger 'change:status', client, oldStatus, newStatus
-        client.trigger 'change', client
-)
-_(client).extend Backbone.Events
 client.checkStatus()
 
 ########################################################################################################################
diff --git a/src/client/site/site_controller.coffee b/src/client/site/site_controller.coffee
index bd47bfc2a..9d8c0ca4b 100644
--- a/src/client/site/site_controller.coffee
+++ b/src/client/site/site_controller.coffee
@@ -71,10 +71,9 @@ module.exports = class SiteController extends BaseController
         @router.navigate c.url.login(), trigger:true
 
     logout: ->
+        @storage.store 'loginSecurityToken', null
+        @user = null
         @client.logout()
-            .then =>
-                @storage.store 'loginSecurityToken', null
-                @user = null
             .catch (error)->
                 logger.error -> "Failed to log out: #{error}"
             .done()