From cd92502980491979842f1a4ccbaa2183569b4514 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Wed, 16 Dec 2015 00:07:01 -0600
Subject: [PATCH 1/4] logout: clean edition

---
 app/services/tcAuth.service.js | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/services/tcAuth.service.js b/app/services/tcAuth.service.js
index 0a8b3f426..0a7e22731 100644
--- a/app/services/tcAuth.service.js
+++ b/app/services/tcAuth.service.js
@@ -8,7 +8,7 @@
   function TcAuthService(CONSTANTS, auth, AuthTokenService, $rootScope, $q, $log, $timeout, UserService, Helpers, ApiService, store, $http) {
     $log = $log.getInstance("TcAuthServicetcAuth");
     var auth0 = auth;
-    var apiUrl = CONSTANTS.API_URL_V3;
+    var apiUrl = CONSTANTS.API_URL;
     var service = {
       login: login,
       socialLogin: socialLogin,
@@ -163,22 +163,28 @@
     }
 
     function logout() {
-      $http({
+      // options for DELETE http call
+      var logoutOptions = {
         url: apiUrl + '/authorizations/1',
         method: 'DELETE',
         headers: {
           'Authorization': "Bearer " + AuthTokenService.getV3Token()
         }
-      }).then(function(res) {
-        $log.log('logout successful');
-      }).catch(function(resp) {
-        $log.error('logout error');
-      });
+      };
+
+      // remove local token
+      AuthTokenService.removeTokens();
+      $rootScope.$broadcast(CONSTANTS.EVENT_USER_LOGGED_OUT);
 
+      // logout of all browsers
       return $q(function(resolve, reject) {
-        AuthTokenService.removeTokens();
-        $rootScope.$broadcast(CONSTANTS.EVENT_USER_LOGGED_OUT);
-        resolve();
+        $http(logoutOptions).then(function(res) {
+          $log.log('logout successful');
+          resolve();
+        }).catch(function(resp) {
+          $log.error('logout error');
+          reject();
+        });
       });
     }
 

From 3272ce23c07dd4387194186e24464f928ac14fda Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Wed, 16 Dec 2015 11:13:07 -0600
Subject: [PATCH 2/4] Updated url to use auth

---
 app/services/tcAuth.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/tcAuth.service.js b/app/services/tcAuth.service.js
index 0a7e22731..e293ad2e5 100644
--- a/app/services/tcAuth.service.js
+++ b/app/services/tcAuth.service.js
@@ -8,7 +8,7 @@
   function TcAuthService(CONSTANTS, auth, AuthTokenService, $rootScope, $q, $log, $timeout, UserService, Helpers, ApiService, store, $http) {
     $log = $log.getInstance("TcAuthServicetcAuth");
     var auth0 = auth;
-    var apiUrl = CONSTANTS.API_URL;
+    var apiUrl = CONSTANTS.AUTH_API_URL;
     var service = {
       login: login,
       socialLogin: socialLogin,

From c9db75745fa0ff37269bbcb439f3d5b7527bc681 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Wed, 16 Dec 2015 18:18:08 -0600
Subject: [PATCH 3/4] Fixed logout temp

---
 app/services/tcAuth.service.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/services/tcAuth.service.js b/app/services/tcAuth.service.js
index e293ad2e5..3ad22c753 100644
--- a/app/services/tcAuth.service.js
+++ b/app/services/tcAuth.service.js
@@ -172,19 +172,20 @@
         }
       };
 
-      // remove local token
-      AuthTokenService.removeTokens();
-      $rootScope.$broadcast(CONSTANTS.EVENT_USER_LOGGED_OUT);
 
       // logout of all browsers
       return $q(function(resolve, reject) {
-        $http(logoutOptions).then(function(res) {
-          $log.log('logout successful');
-          resolve();
-        }).catch(function(resp) {
-          $log.error('logout error');
-          reject();
-        });
+        // remove local token
+        AuthTokenService.removeTokens();
+        $rootScope.$broadcast(CONSTANTS.EVENT_USER_LOGGED_OUT);
+        resolve();
+//        $http(logoutOptions).then(function(res) {
+//          $log.log('logout successful');
+//          resolve();
+//        }).catch(function(resp) {
+//          $log.error('logout error');
+//          reject();
+//        });
       });
     }
 

From 145feaeb4e8ac5d20658f7f0b2e6dcf52e84abd6 Mon Sep 17 00:00:00 2001
From: Tom Ladendorf <tom@tomladendorf.com>
Date: Thu, 17 Dec 2015 10:54:24 -0600
Subject: [PATCH 4/4] updated version

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 3ec7c5c4f..afd826259 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-v1.0.17
+v1.0.18