Merge pull request #378 from CodeNow/SAN-726-home-redirection

SAN-726-home-redirection

Author: SomeKittens

client/controllers/home/controllerHome.js

@@ -38,9 +38,12 @@ function ControllerHome(
 
   dataHome.data.hasPass = !!$location.search().password;
 
+  if ($location.search().auth) {
+    verifyUserIsAuth(true);
+  }
   $scope.goToInstance = verifyUserIsAuth;
 
-  function verifyUserIsAuth() {
+  function verifyUserIsAuth(authed) {
     async.series([
       function (cb) {
         fetchUser(function (err, user) {
@@ -53,11 +56,11 @@ function ControllerHome(
       function sendUserSomewhere(cb) {
 
         var thisUser = $scope.user;
-
+        var opts = authed ? {location: 'replace'} : null;
         $state.go('instance.home', {
           userName: keypather.get($localStorage, 'stateParams.userName') ||
               thisUser.oauthName()
-        });
+        }, opts);
         return cb();
 
       }

client/services/configs/serviceConfigLoginURL.js

@@ -8,7 +8,7 @@ function configLoginURL(
   configAPIHost
 ) {
   return function () {
-    var redirect = encodeURI($window.location.protocol + '//' + $window.location.host);
+    var redirect = encodeURI($window.location.protocol + '//' + $window.location.host + '/?auth');
     return configAPIHost + '/auth/github?redirect=' + redirect;
   };
 }