Merge branch 'dev'

Author: Parth Shah

.eslintignore

@@ -0,0 +1,3 @@
+.gitignore
+assets/scripts/*.*
+report/**/*.*

.travis.yml

@@ -46,9 +46,9 @@ env:
     # DEV_AWS_SECRET
     - secure: p+od0xD/9vpMbR2AI6gZWknNAtvvIfq6jXIF98DEsDlqrrMFv4SwtuXLlCmX5PBnB/cWOkwgRhymI7/3+fLrDC+wqlhDEWyzSpVOvAcVAb5LEP7IDen0W8kTj2q9I2VRX+keL7lxQCknAf/21sRZeJfJhLGR+O3NcytEdsjlpFCopA6luZYv1QSd+nRJiTsI7I69T0hr7jZk+YioyjEEp/4qzI2qyJH7E5Ry+DD3gXnC3zva48Huq6rvOtLpgFmio1b1rNAcA55Q9Y3vb1jJyZhKpRvtel9OM9ekTxANEGJVaMzxyZXT7EFTxwxS+ub5c2HRzxedMnD3tY29ku2JJx7Ofm+Yxt9DZXSK7EV99xxE71kIhI9lZFiWZviym08MHGc4pee6+Cl6ZkiV44v4XnwbgUq8GCOkmDMQBQtGhXq7dC6jB/r7P7CJs+DIGDF7qNt/xizVOC1THS8GUCN68aWMVperP+IlUXo5d2XekhO6vjHk6o44K8A1s7yblBWXj54B6NfJnBzUK2X0g6Y2xdW6tmoKtad1r1I3062skc+UiU+6m4fGS8pLFElJNj+8N7QANoEw9oJDZfuQ47uVQzPjAA1/qdcy3ksMek0siNFbpZnMqzOJTPf2Xe7YgKuCPg0QczESXIjOeEIU0om7SWmGEIuMFqt6obQW0M3VHn0=
     # QA_AWS_KEY
-    - secure: CObZrZ37F2BE67xgLw+oCbS+zy6iyZYszERY75yuDqrXn6wyui2rgHOpDIdsemWueLTZImMdHD7WtCRRnqO2JDxt+DwmeaVXgx3IJiB1+UNa0syRsVpj/+TKNQ2/y/bw7u21Yr0JL0VxlyyB6+vexEZ6EkmJxmlKczsBZ96LLkkX0xSNYA4Co7ieGpAsPlXYqCGIg92rhdhXZ1aPkU91tI1A6Jq3CEVnKDbdNXQksxt5WPsAu/1LUj0iqLwTk+x5vYipC+r6scF/gDIDmrmziT2N0u11Xl1qKYvOAHhI2G/CIkrW/IuirurLTPh2i/FxKbacpHU2RnN5zECEf6/7UEOXJhYo9ajySwXPLs8u0pLbC4iIzrv7j76k9wgUeBMnUOo0WJNV4hKnKflvJrnKDuzZFl0gTItXRwKXLYwx28bDxtMcAq5FnuxV0QMORMhCLizP7Dt/BQSPOAXcoEgnmj/fFfobU0ZP+LsRtvNo5D/XykxVLrG7/x9BIpVqpnj4Me34xEJvyRmx7v2x2y425sA6h8IucbD/5JqRg56OUqfg8xut2LqtnvBpBClKPEjSTIn9iHixTMLU7yji7Ysjp/7EsL4zyImNhsRH40q/0OpE+ORTTNMYyJ4bmoSZzndvEDSMg1ivWrbDJcHOoADPQDDP8AP+FxO6Y6jGyzyJ7R8=
+    - secure: XG8fvQkBGUSbrZ+ZcHJadpPGKze1HrO17pl9WAzXOAFaomgZpXJIQrEmH8H03QpeFwhhM0pmWeHwnLAzSQ3j8dU8RidlR5/72X9Jdz74YJNPun7O4EJ4LE4qd3bjsS1+0IhyoaatV9OvIbCJDm1ujpHATkvUwHqt2WvVKxmy76raYqzMBNJD0xq0JrceZWwy2i0mnxLNSe/PqGREPDVWIFjb/rgLo0k2NPH7Z/ZqzTN9F/HzT7b4qmEJaQsjgBwWnMDIYdFKIVhP4nUlQBhZhuiiirUh7STOxloxe245xu2FRr+m5la2Eqpw8yf+nwsevtgnk1SaWF9LVp2VOV6AONWI5fMC/PGlEoVKf/Wt+S39wxlsIG4RL8RH0I9IypxHyfWcKz/iBVKWwpEH+IGa9Pl2XnCDJs5xHBkaVKuX76Nk8NSEG/ZxkCLBhlDSMmiivw4dQShQQv/qto1nz8rVzhj2gZUJbynsfKId2x/VrcnaPVRMSHuTRI/112wzLfENpcy1WhOJrKHZjMuoUVOLYNZs/kqygNTjqUbiqBb1t2RRuULB7RjBFMJBJKFbQA6wha1Ieh0lut3ZWbXPFkpsGCfC7S3l6Iy6U4BQcFpRDGw8MiAI+y5IPzePgKwhWxKZl0nY34trdzK4KaCabvdORYviSaBbxGiXPVsja/SY3T8=
     # QA_AWS_SECRET
-    - secure: azM3x9Cf7jSEe1TC/uhozJbP82oLfTiydvFBuE70SZ8tIJJUGSVGPe7wF6YJfF1zkTCAZJrnzFRLxt3Unecx21ibxabwr6DdlJI+ptJH7VA/TeOL1+PGGjOK46Qb7qF1D2Y8m48uNy4GC7+K4Rs3r6xa702OjAFED+REQRBFDDoaNDLz4K+uYwgGrsu/o/B3y6tPmTFgrKiTCvCWPO0gGZ/mbqbW4ZDcTo/quIXb8vTrInxf978vR6TQDdKaTjgz/u1cNQ1e27ZXl9lkS9I8OBKiVMd8ixM2idC44wTw5HhbInYc0jzUQrOV/LBQfvx4csifRtwX9xm0jD8UqUqlqI/Ay1sVZKRBgMSWkrAfvVF4XeoqjXLhAq0vndblhIFcsUkRtECQePCGQhHPTE+vi6BhcoA9RxF+0vRoFQe2lQsK+GeLB4bww5JmCZ9E0gQzpe48F5p3x2qvuVj070lKeEDCdQ2Dym6VnR6vUUtExuOxlI9ggfcuR7hId1aL9OakMxe8iyui+bouFE9uvUddtxqF0hwt3wuHaOd2gFRjFzPt3iFHf3rtFm6RCFalNYXAmrQ7ODZ1FcwV/wzs0mdVDmMp39Hb8Vm21tBNkGgy8ynB1DC1Zyv+PiivG0cMfJnD7eD/b0mDITUTxJB8My2e1vkKCctxmhRJ78C1ftJafXU=
+    - secure: ALKnhODYCEtEjaDKe7YCupZPr7krQpLHkhlumUPkZVdYvNbunNDQcSDIJAEx97W9PJ0jRLQzYgoosQ+49CKOi7Lv2K+GHszBtiJ7Mc689v+lkQ686pSrGTrnTV626wLT6fxtprrFofTF8Q7Ywpp8q5A6vmTOpUFIkFBzlfEoInmvSXtM3BFTg11OFQdyhP1Pv2vSdDjFvbulCBhFo1sw8f1pRlUxALaYTE1ar1kN2EysrS5VSuK7ZdyXrmleJCwnIFshECqNUpHPU7LwYxeoTlaFGdeMFK5TuqrxR/LC6lSWTQvhMtQJzMFh8W2FwNJNqPNFmttD7G86/6o6jNxW4E0xo35VINaPi3qPdlHXFLBxMjkRzVS+I2EUjb80Hft5gK1/JXBl0RqX38sqgVGb1/u63hPR0iNqLW9CPEXXxrdifLrex+x3hW2Shg8kzGwRdE181zgdIIhnV8JiD1lsO1XrpusCjia+QjZJKp+fglq/1KGGRqHllxTN0T+6E9V8O4Opy+59aWcO8nkIJ5+INRl67MhpgJmutAfF2lgd5hMAWju5GNA77Bfd31zwpbOdetwmyp2fo81iKs1rgK4M9rFTtKsRFObDnalEqP+mwmwAg0yzhmWAMpmegYDAGfHOBPLSHpFDPRW7lrI4HTMrW2zP2W/NCIwHWpqPM/82bnc=
     # MASTER_AWS_KEY
     - secure: natX9uNNhOZBAkVht/f/dxT2Rkv/EP4maS3h9/dRXqejEHO9YQCTnvApGFE1SkDuH+NHoH06yx7RpAh+Gswn8CldHPF3daVnJHVgZYU2gBTyxlc5hFFV3ZmZ+hFSZgzWAXRSedw3l/SD7ceo8RebeVpSH/weDxzmHHSb429f0809wM+gWeUsNAG1sAr/oKw1t++7xIZA9p9k7EpCy8oBpHNRB30vknORNY/VFZMbp/RHfJohiL8SM9Nub2rnh27LKxik32BDCNypm+wE1cMB8642wL+MysIN7b1b1PJ9Hkahzcym8tImY0zJrui/j7tZ2ho0ATaHIc4DHna3TeM/tIK56Rtb+w4/b5rZrtIGCqCDoo6MQMkh1jL45KKeoa9Q5OgdgKqRgOQIkhy9MPQyqayUi/6RTplYXt1MO0vpHKUD2yMDZSfXWfin0XnHywTKAjjdc/lyvvC7YtrucbUu3DSbY6Eq5DH9przWdHWtXQDA0+hNjjxa6M8w2hPYBqOSM5GHF1VjlwY15hDLx/oua1VyGSfe7msd6xo0gkA/lvbA4QrOcuPYduF0cOvXuzj/RsaVqcHOAzRHvyKHaQR2UmmEQH7JoKr0/0mjXTNZX/xPlGtqRBDiWajfHhIjG4RlApbGTcdFUiuMrTNp0USA3QyV72yljWvkZ4L/9PbDjq8=
     # MASTER_AWS_SECRET

app/account/account.routes.js

@@ -5,112 +5,70 @@ import angular from 'angular'
 
   angular.module('tc.account').config(routes)
 
-  routes.$inject = ['$stateProvider']
+  routes.$inject = ['$stateProvider', 'CONSTANTS']
 
-  function routes($stateProvider) {
+  function routes($stateProvider, CONSTANTS) {
     var states = {
       'auth': {
         parent: 'root',
         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'
+          'header@': {},
+          'container@': {},
+          'footer@': {}
         },
-        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')()
+        onEnter: ['$state', '$window', '$stateParams', 'logger',
+          function($state, $window,  $stateParams, logger) {
+            var next = $state.href('dashboard', {}, {absolute: true})
+            if ($stateParams.next) {
+              next = decodeURIComponent($stateParams.next)
+            }
+            $window.location = CONSTANTS.ACCOUNTS_APP_URL + '?retUrl=' + encodeURIComponent(next)
           }
-        }
+        ]
+
       },
-      'resetPassword': {
+      'register': {
+        url: '/register/?next&utm_source&utm_medium&utm_campaign',
         parent: 'auth',
-        url: '/reset-password/?token&handle',
+        views: {
+          'header@': {},
+          'container@': {},
+          'footer@': {}
+        },
         data: {
-          title: 'Reset Password'
+          title: 'Join',
+          authRequired: false
         },
-        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')()
+        onEnter: ['$state', '$window', '$stateParams', 'logger',
+          function($state, $window,  $stateParams, logger) {
+            var next = $state.href('dashboard', {}, {absolute: true})
+            if ($stateParams.next) {
+              next = decodeURIComponent($stateParams.next)
+            }
+            var queryStr = '?retUrl=' + encodeURIComponent(next)
+            for(var param in $stateParams) {
+              if ($stateParams[param]) {
+                queryStr += ('&' + param + '=' + encodeURIComponent($stateParams[param]))
+              }
+            }
+            $window.location = CONSTANTS.ACCOUNTS_APP_URL + '/registration' + queryStr
           }
-        }
+        ]
+
       },
       logout: {
+        parent: 'auth',
         url: '/logout/',
         views: {
           'header@': {},

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
     })
   }