refactor(.com): move .com redirect code to public parent route

blockchain · Jun 18, 2018 · 5280349 · 5280349
1 parent db323ca
commit 5280349
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/assets/js/controllers/login.controller.js b/assets/js/controllers/login.controller.js
@@ -78,8 +78,4 @@ function LoginCtrl ($scope, $rootScope, $window, localStorageService, $state, $s
     let guid = localStorageService.get('guid')
     if (guid != null) $scope.uid = guid
   })
-
-  ComMigration.whenRedirectsEnabled(() => {
-    ComMigration.redirectFromDotInfoTo('https://login.blockchain.com/#/login')
-  })
 }
diff --git a/assets/js/controllers/signup.controller.js b/assets/js/controllers/signup.controller.js
@@ -2,9 +2,9 @@ angular
   .module('walletApp')
   .controller('SignupCtrl', SignupCtrl);
 
-SignupCtrl.$inject = ['$scope', '$state', 'localStorageService', '$filter', '$timeout', '$translate', 'Wallet', 'currency', 'languages', 'MyWallet', '$http', 'Env', 'Ethereum', 'ComMigration'];
+SignupCtrl.$inject = ['$scope', '$state', 'localStorageService', '$filter', '$timeout', '$translate', 'Wallet', 'currency', 'languages', 'MyWallet', '$http', 'Env', 'Ethereum'];
 
-function SignupCtrl ($scope, $state, localStorageService, $filter, $timeout, $translate, Wallet, currency, languages, MyWallet, $http, Env, Ethereum, ComMigration) {
+function SignupCtrl ($scope, $state, localStorageService, $filter, $timeout, $translate, Wallet, currency, languages, MyWallet, $http, Env, Ethereum) {
   $scope.working = false;
   $scope.browser = {disabled: true};
 
@@ -195,8 +195,4 @@ function SignupCtrl ($scope, $state, localStorageService, $filter, $timeout, $tr
     $scope.fields.acceptedAgreement = true;
     $scope.fields.email = `${$scope.autoCreate}+${Date.now()}@blockchain.com`;
   }
-
-  ComMigration.whenRedirectsEnabled(() => {
-    ComMigration.redirectFromDotInfoTo('https://login.blockchain.com/#/signup')
-  })
 }
diff --git a/assets/js/routes.js b/assets/js/routes.js
@@ -98,23 +98,31 @@ function AppRouter ($stateProvider, $urlRouterProvider) {
       views: {
         body: {
           templateUrl: 'partials/public.pug',
-          controller: function ($scope, $state, languages, Env) {
+          controller: function ($scope, $state, $location, languages, Env, ComMigration) {
             Env.then(env => {
               $scope.network = env.network;
               $scope.rootURL = env.rootURL;
               $scope.versionMyWallet = env.versionMyWallet;
               $scope.versionFrontend = env.versionFrontend;
             });
+
             let overflows = ['/reset-2fa'];
             $scope.state = $state;
             $scope.path = $state.current.url;
             $scope.languages = languages.languages;
+
             $scope.$watch(languages.get, (code) => {
               $scope.language = languages.mapCodeToName(code);
             });
+
             $scope.$watch('state.current.url', (newVal) => {
               $scope.isUIOverflow = overflows.indexOf(newVal) > -1;
             });
+
+            ComMigration.whenRedirectsEnabled(() => {
+              let url = $location.url()
+              ComMigration.redirectFromDotInfoTo(`https://login.blockchain.com/#${url}`)
+            })
           }
         }
       },
@@ -264,7 +272,7 @@ function AppRouter ($stateProvider, $urlRouterProvider) {
             accounts ($injector, $q) {
               let MyWallet = $injector.has('MyWallet') && $injector.get('MyWallet');
               let sfox = MyWallet.wallet && MyWallet.wallet.external && MyWallet.wallet.external.sfox;
-            
+
               return sfox && sfox.hasAccount
                 ? $q.resolve([])
                     .then(() => sfox.getBuyMethods()).catch(console.log)