Merge commit '218003c08540d37443c83dd6fee051a7fce9cd49' into HEAD

Author: Jenkins Continuous Integration Server

app/account/account.routes.js

@@ -14,100 +14,6 @@ import angular from 'angular'
         abstract: true,
         data: {
           authRequired: false
-        },
-        onEnter: ['$state', '$stateParams', 'TcAuthService', 'logger', function($state, $stateParams, TcAuthService, logger) {
-          if (TcAuthService.isAuthenticated()) {
-            // redirect to next if exists else dashboard
-            if ($stateParams.next) {
-              logger.debug('Redirecting: ' + $stateParams.next)
-              window.location.href = decodeURIComponent($stateParams.next)
-            } else {
-              $state.go('dashboard')
-            }
-          }
-        }]
-      },
-      'login': {
-        parent: 'auth',
-        url: '/login/?next&code&state&status&userJWTToken&utm_source&utm_medium&utm_campaign',
-        params: { 'notifyReset': false },
-        data: {
-          title: 'Login'
-        },
-        views: {
-          'header@': {
-            template: require('../layout/header/account-header')()
-          },
-          'container@': {
-            template: require('./login/login')(),
-            controller: 'LoginController',
-            controllerAs: 'vm'
-          },
-          'footer@': {
-            controller: 'FooterController as vm',
-            template: require('../layout/footer/account-footer')()
-          }
-        }
-      },
-      'register': {
-        parent: 'auth',
-        url: '/register/?next&utm_source&utm_medium&utm_campaign',
-        data: {
-          title: 'Join'
-        },
-        views: {
-          'header@': {
-            template: require('../layout/header/account-header')()
-          },
-          'container@': {
-            template: require('./register/register')(),
-            controller: 'RegisterController',
-            controllerAs: 'vm'
-          },
-          'footer@': {
-            controller: 'FooterController as vm',
-            template: require('../layout/footer/account-footer')()
-          }
-        }
-      },
-      'registeredSuccessfully': {
-        url: '/registered-successfully/',
-        data: {
-          title: 'Registered',
-          authRequired: false
-        },
-        views: {
-          'header@': {
-            template: require('../layout/header/account-header')()
-          },
-          'container@': {
-            template: require('./register/registered-successfully')()
-          },
-          'footer@': {
-            controller: 'FooterController as vm',
-            template: require('../layout/footer/account-footer')()
-          }
-        }
-      },
-      'resetPassword': {
-        parent: 'auth',
-        url: '/reset-password/?token&handle',
-        data: {
-          title: 'Reset Password'
-        },
-        views: {
-          'header@': {
-            template: require('../layout/header/account-header')()
-          },
-          'container@': {
-            template: require('./reset-password/reset-password')(),
-            controller: 'ResetPasswordController',
-            controllerAs: 'vm'
-          },
-          'footer@': {
-            controller: 'FooterController as vm',
-            template: require('../layout/footer/account-footer')()
-          }
         }
       },
       logout: {

app/account/login/login.controller.js

@@ -8,12 +8,8 @@ import angular from 'angular'
   LogoutController.$inject = ['logger', 'TcAuthService', '$window', 'CONSTANTS']
 
   function LogoutController(logger, TcAuthService, $window, CONSTANTS) {
-
-    TcAuthService.logout()
-    .then(function() {
-      logger.debug('Successfully logged out.')
-
-      // Redirect to home
+    TcAuthService.logout().then(() => {
+      logger.debug('MAIN_URL=> ' + CONSTANTS.MAIN_URL)
       $window.location.href = CONSTANTS.MAIN_URL
     })
   }