redirecting logout to home page, removing cookies etc

Author: Parth Shah

app/account/account.routes.js

@@ -108,9 +108,13 @@
       },
       logout: {
         url: '/logout/',
-        controller: ['TcAuthService', function(TcAuthService) {
-          TcAuthService.logout();
-        }],
+        views: {
+          'header@': {},
+          'container@': {
+            controller: 'LogoutController'
+          },
+          'footer@': {}
+        },
         data: {
           authRequired: false
         }

app/account/logout/logout.controller.js

@@ -0,0 +1,19 @@
+(function() {
+  'use strict';
+
+  angular.module('tc.account').controller('LogoutController', LogoutController);
+
+  LogoutController.$inject = ['$log', 'TcAuthService', '$location'];
+
+  function LogoutController($log, TcAuthService, $location) {
+    $log = $log.getInstance('LogoutController');
+
+    TcAuthService.logout()
+    .then(function() {
+      $log.debug("successfully logged out.");
+      // redirect to home
+      $location.path("/");
+    });
+
+  }
+})();

app/account/logout/logout.controller.spec.js

@@ -0,0 +1,39 @@
+/* jshint -W117, -W030 */
+describe.only('Logout Controller', function() {
+  var controller;
+  var fakeLocation = {
+    path: function(param) {
+      return;
+    }
+  };
+  sinon.spy(fakeLocation, "path");
+
+  beforeEach(function() {
+    bard.appModule('topcoder');
+    bard.appModule('tc.account');
+    module('tc.account', function($provide) {
+      $provide.value('$location', fakeLocation);
+    });
+
+    bard.inject(this, '$controller', 'TcAuthService', '$location', '$q');
+
+    bard.mockService(TcAuthService, {
+      logout: $q.when({}),
+      _default: $q.when({})
+    });
+
+    controller = $controller('LogoutController');
+  });
+
+  bard.verifyNoOutstandingHttpRequests();
+
+  it('should be defined', function() {
+    expect(controller).to.be.defined;
+  });
+
+  it('should be successfully logged out', function() {
+    expect(TcAuthService.logout).to.have.been.calledOnce;
+    expect($location.path).to.have.been.calledWith('/');
+  });
+
+});

app/index.jade

@@ -165,6 +165,7 @@ html
     script(src="account/account.module.js")
     script(src="account/account.routes.js")
     script(src="account/login/login.controller.js")
+    script(src="account/logout/logout.controller.js")
     script(src="account/register/register.controller.js")
     script(src="account/reset-password/reset-password.controller.js")
     script(src="blocks/exception/exception.module.js")

app/layout/header/header.controller.js

@@ -11,7 +11,6 @@
     vm.constants = CONSTANTS;
     vm.domain = CONSTANTS.domain;
     vm.login = TcAuthService.login;
-    vm.logout = logout;
     vm.checkSubmit = checkSubmit;
     vm.searchTerm = '';
     vm.selectedGroup = selectedGroup;
@@ -65,13 +64,6 @@
       }
     }
 
-    function logout() {
-      TcAuthService.logout()
-      .then(function() {
-        $state.go('home');
-      });
-    }
-
     function selectedGroup() {
       return _.get(NavService, 'selectedTopLevelItem', null);
     }

app/layout/header/header.jade

@@ -49,7 +49,8 @@
             header-menu-item(ng-repeat="item in vm.userMenu" item="item")
 
             li.submenu-item
-              a.menu-link(ng-click="vm.logout(); main.menuVisible = vm.isAuth = false")
+              //- a.menu-link(ng-click="vm.logout(); main.menuVisible = vm.isAuth = false")
+              a.menu-link(ui-sref="logout")
                 img.menu-icon(ng-src="/images/nav/exit.svg")
                 .menu-text LOG OUT
 

app/services/authToken.service.spec.js

@@ -58,6 +58,7 @@ describe('TcAuthToken Service', function() {
     it('should remove tokens from store & cookie"', function() {
       service.removeTokens();
       expect($cookies.remove).to.have.been.calledWith('tcjwt');
+      expect($cookies.remove).to.have.been.calledWith('tcsso');
       expect(store.remove).to.be.have.been.calledWith('appiriojwt');
     });
 

app/specs.html

@@ -224,6 +224,7 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="/app/account/account.module.js"></script>
     <script src="/app/account/reset-password/reset-password.controller.js"></script>
     <script src="/app/account/register/register.controller.js"></script>
+    <script src="/app/account/logout/logout.controller.js"></script>
     <script src="/app/account/login/login.controller.js"></script>
     <script src="/app/account/account.routes.js"></script>
     <!-- endinject -->
@@ -239,7 +240,6 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="/app/my-dashboard/my-dashboard.spec.js"></script>
     <script src="/app/my-srms/my-srms.spec.js"></script>
     <script src="/app/profile/profile.controller.spec.js"></script>
-    <script src="/app/settings/settings.spec.js"></script>
     <script src="/app/services/authToken.service.spec.js"></script>
     <script src="/app/services/challenge.service.spec.js"></script>
     <script src="/app/services/helpers.service.spec.js"></script>
@@ -248,17 +248,18 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="/app/services/tcAuth.service.spec.js"></script>
     <script src="/app/services/user.service.spec.js"></script>
     <script src="/app/services/userStats.service.spec.js"></script>
+    <script src="/app/settings/settings.spec.js"></script>
     <script src="/app/skill-picker/skill-picker.spec.js"></script>
+    <script src="/app/blocks/exception/exception-handler.provider.spec.js"></script>
     <script src="/app/account/login/login.spec.js"></script>
-    <script src="/app/account/reset-password/reset-password.spec.js"></script>
+    <script src="/app/account/logout/logout.controller.spec.js"></script>
     <script src="/app/account/register/register.spec.js"></script>
-    <script src="/app/blocks/exception/exception-handler.provider.spec.js"></script>
+    <script src="/app/account/reset-password/reset-password.spec.js"></script>
     <script src="/app/directives/badges/badge-tooltip.spec.js"></script>
     <script src="/app/directives/busy-button/busy-button.directive.spec.js"></script>
     <script src="/app/directives/challenge-tile/challenge-tile.spec.js"></script>
     <script src="/app/directives/empty-state-placeholder/empty-state-placeholder.spec.js"></script>
     <script src="/app/directives/external-account/external-account.directive.spec.js"></script>
-    <script src="/app/directives/empty-state-placeholder/empty-state-placeholder.spec.js"></script>
     <script src="/app/directives/tc-endless-paginator/tc-endless-paginator.spec.js"></script>
     <script src="/app/directives/tc-paginator/tc-paginator.spec.js"></script>
     <script src="/app/directives/tc-tabs/tc-tabs.directive.spec.js"></script>