feat(.com): redirect from login and signup pages to .com

blockchain · Jun 18, 2018 · 1cbb1c5 · 1cbb1c5
1 parent 38b226e
commit 1cbb1c5
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/assets/js/controllers/login.controller.js b/assets/js/controllers/login.controller.js
@@ -78,4 +78,8 @@ 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'];
+SignupCtrl.$inject = ['$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) {
+function SignupCtrl ($scope, $state, localStorageService, $filter, $timeout, $translate, Wallet, currency, languages, MyWallet, $http, Env, Ethereum, ComMigration) {
   $scope.working = false;
   $scope.browser = {disabled: true};
 
@@ -195,4 +195,8 @@ 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/sharedServices/com-migration.service.js b/assets/js/sharedServices/com-migration.service.js
@@ -2,23 +2,44 @@ angular
   .module('shared')
   .factory('ComMigration', ComMigration)
 
-ComMigration.$inject = ['$rootScope', '$window', 'localStorageService']
+ComMigration.$inject = ['$rootScope', '$window', 'localStorageService', 'Env']
 
-function ComMigration ($rootScope, $window, localStorageService) {
+function ComMigration ($rootScope, $window, localStorageService, Env) {
   const events = {
     TRANSFERRED_COOKIES: 'ComMigration.TRANSFERRED_COOKIES'
   }
 
   return {
     events,
     isOnDotCom,
+    isOnDotInfo,
+    whenRedirectsEnabled,
+    redirectFromDotInfoTo,
     transferCookiesFromDotInfo
   }
 
   function isOnDotCom () {
     return $window.location.origin === 'https://login.blockchain.com'
   }
 
+  function isOnDotInfo () {
+    return $window.location.origin === 'https://blockchain.info'
+  }
+
+  function whenRedirectsEnabled (runCallback) {
+    Env.then((env) => {
+      if (isOnDotInfo() && env.enableDomainMigrationRedirects) {
+        runCallback()
+      }
+    })
+  }
+
+  function redirectFromDotInfoTo (target) {
+    if (isOnDotInfo()) {
+      $window.location = target
+    }
+  }
+
   function transferCookiesFromDotInfo () {
     let alreadyTransferredCookiesKey = 'did_already_transfer_cookies_from_dot_info'
     let shouldTransfer = localStorageService.get(alreadyTransferredCookiesKey) == null

diff --git a/assets/js/sharedServices/env.service.js b/assets/js/sharedServices/env.service.js
@@ -63,6 +63,8 @@ function Env ($rootScope, $location, $q, $http) {
 
       env.webHardFork = res.webHardFork || {};
 
+      env.enableDomainMigrationRedirects = res.enableDomainMigrationRedirects || false
+
       defer.resolve(env);
     }
   );

diff --git a/rootApp/Resources/wallet-options.json b/rootApp/Resources/wallet-options.json
@@ -1,4 +1,5 @@
 {
+  "enableDomainMigrationRedirects": false,
   "showBuySellTab": ["GB", "NL", "DE", "US"],
   "service_charge": {
     "US": {