#SUP-1225 and adding tests

Author: Parth Shah

app/account/login/login.controller.js

@@ -10,26 +10,12 @@
     vm.passwordReset = false;
     vm.usernameExists = true;
 
-    var redirect = function() {
-      // check if the user is already logged in
-      if (TcAuthService.isAuthenticated()) {
-        // make sure domain is topcoder | dev | qa
-        var re = /(\w+\.)*topcoder(-\w+)*\.com/;
-        if (re.test($stateParams.next)) {
-          $log.debug('Redirecting: ' + $stateParams.next);
-          window.location.href = decodeURIComponent($stateParams.next);
-        } else {
-          $state.go('dashboard');
-        }
-      }
-    };
-
     // Handling social login stuff
     if ($stateParams.userJWTToken) {
       // user logged in
       AuthTokenService.setV3Token($stateParams.userJWTToken);
       UserService.setUserIdentity($stateParams.userJWTToken);
-      redirect();
+      Helpers.redirectPostLogin($stateParams.next);
     }
 
     if ($stateParams.status) {
@@ -48,11 +34,11 @@
       AuthTokenService.getTokenFromAuth0Code($stateParams.code).then(
         function(v3Token) {
           $log.debug('logged in using social');
-          redirect();
+          Helpers.redirectPostLogin($stateParams.next);
         }
       );
     }
-    
+
     if ($stateParams.notifyReset) {
       NotificationService.inform('Your new password has been set. Please log in. If you have any trouble, please contact [email protected].');
     }
@@ -62,7 +48,7 @@
       function(data) {
         // success
         $log.debug('logged in');
-        redirect();
+        Helpers.redirectPostLogin($stateParams.next);
       },
       function(err) {
         // handle error

app/services/helpers.service.js

@@ -3,9 +3,9 @@
 
   angular.module('tc.services').factory('Helpers', Helpers);
 
-  Helpers.$inject = ['$window', '$location'];
+  Helpers.$inject = ['$window', '$location', '$state'];
 
-  function Helpers($window, $location) {
+  function Helpers($window, $location, $state) {
     // TODO: Separate helpers by submodule
 
     var service = {
@@ -16,7 +16,8 @@
       countCompleted: countCompleted,
       getParameterByName: getParameterByName,
       getPageTitle: getPageTitle,
-      isEmail: isEmail
+      isEmail: isEmail,
+      redirectPostLogin: redirectPostLogin
     };
     return service;
 
@@ -161,5 +162,18 @@
       var re = /^(([^<>()[\]\.,;:\s@\"]+(\.[^<>()[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i;
       return re.test(value);
     }
+
+    function redirectPostLogin(nextParam) {
+      // make sure domain is topcoder | dev | qa
+      var re1 = /^(\w+\.)*topcoder(-\w+)*\.com/,
+        re2 = /^\/\w+/;
+      if (re1.test(nextParam)) {
+        $window.location.href = decodeURIComponent(nextParam);
+      } else if (re2.test(nextParam)) {
+        $location.url(nextParam);
+      } else {
+        $state.go('dashboard');
+      }
+    }
   }
 })();