From 9707fa34e4f6da3750a6eec255f4058c8fee337b Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 13 Jul 2017 22:28:52 -0400
Subject: [PATCH] login returnState conditions

---
 src/app/accounts/accountsLoginController.js   | 31 ++++++++++---------
 .../accounts/accountsRegisterController.js    |  6 ++++
 src/app/accounts/views/accountsLoginInfo.html |  2 +-
 src/app/config.js                             | 14 ++++++---
 4 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/app/accounts/accountsLoginController.js b/src/app/accounts/accountsLoginController.js
index 8bcd9063b3..cd3a285ffa 100644
--- a/src/app/accounts/accountsLoginController.js
+++ b/src/app/accounts/accountsLoginController.js
@@ -7,25 +7,28 @@ angular
         $scope.twoFactorProviderConstants = constants.twoFactorProvider;
         $scope.rememberTwoFactor = { checked: false };
 
-        if ($state.current.name.indexOf('twoFactor') > -1 && (!$scope.twoFactorProviders || !$scope.twoFactorProviders.length)) {
-            $state.go('frontend.login.info', { returnState: returnState });
-        }
-
-        var returnState;
-        if (!$state.params.returnState && $state.params.org) {
-            returnState = {
+        $scope.returnState = $state.params.returnState;
+        $scope.stateEmail = $state.params.email;
+        if (!$scope.returnState && $state.params.org) {
+            $scope.returnState = {
                 name: 'backend.user.settingsCreateOrg',
                 params: { plan: $state.params.org }
             };
         }
-        else {
-            returnState = $state.params.returnState;
+        else if (!$scope.returnState && $state.params.premium) {
+            $scope.returnState = {
+                name: 'backend.user.settingsPremium'
+            };
+        }
+
+        if ($state.current.name.indexOf('twoFactor') > -1 && (!$scope.twoFactorProviders || !$scope.twoFactorProviders.length)) {
+            $state.go('frontend.login.info', { returnState: $scope.returnState });
         }
 
         var rememberedEmail = $cookies.get(constants.rememberedEmailCookieName);
-        if (rememberedEmail || $state.params.email) {
+        if (rememberedEmail || $scope.stateEmail) {
             $scope.model = {
-                email: $state.params.email ? $state.params.email : rememberedEmail,
+                email: $scope.stateEmail || rememberedEmail,
                 rememberEmail: rememberedEmail !== null
             };
 
@@ -67,7 +70,7 @@ angular
                     $scope.twoFactorProvider = getDefaultProvider(twoFactorProviders);
 
                     $analytics.eventTrack('Logged In To Two-step');
-                    $state.go('frontend.login.twoFactor', { returnState: returnState }).then(function () {
+                    $state.go('frontend.login.twoFactor', { returnState: $scope.returnState }).then(function () {
                         $timeout(function () {
                             $("#code").focus();
                             init();
@@ -164,8 +167,8 @@ angular
         };
 
         function loggedInGo() {
-            if (returnState) {
-                $state.go(returnState.name, returnState.params);
+            if ($scope.returnState) {
+                $state.go($scope.returnState.name, $scope.returnState.params);
             }
             else {
                 $state.go('backend.user.vault');
diff --git a/src/app/accounts/accountsRegisterController.js b/src/app/accounts/accountsRegisterController.js
index 8f317e1cf5..8d2a864ac7 100644
--- a/src/app/accounts/accountsRegisterController.js
+++ b/src/app/accounts/accountsRegisterController.js
@@ -13,6 +13,12 @@ angular
                 params: { plan: $state.params.org }
             };
         }
+        else if (!stateParams.returnState && stateParams.premium) {
+            $scope.returnState = {
+                name: 'backend.user.settingsPremium',
+                params: { plan: $state.params.org }
+            };
+        }
         else {
             $scope.returnState = stateParams.returnState;
         }
diff --git a/src/app/accounts/views/accountsLoginInfo.html b/src/app/accounts/views/accountsLoginInfo.html
index 0aab7905cc..af9d0ec885 100644
--- a/src/app/accounts/views/accountsLoginInfo.html
+++ b/src/app/accounts/views/accountsLoginInfo.html
@@ -36,7 +36,7 @@
     <hr />
     <ul>
         <li>
-            <a ui-sref="frontend.register({returnState: state.params.returnState, email: state.params.email})">
+            <a ui-sref="frontend.register({returnState: returnState, email: stateEmail})">
                 Create a new account
             </a>
         </li>
diff --git a/src/app/config.js b/src/app/config.js
index a7f5e71717..44cb22ca97 100644
--- a/src/app/config.js
+++ b/src/app/config.js
@@ -7,7 +7,7 @@ angular
         $locationProvider.hashPrefix('');
         jwtOptionsProvider.config({
             urlParam: 'access_token3',
-            whiteListedDomains: ['api.bitwarden.com', 'preview-api.bitwarden.com', 'localhost', '192.168.1.4']
+            whiteListedDomains: ['api.bitwarden.com', 'preview-api.bitwarden.com', 'localhost', '192.168.1.3']
         });
         var refreshPromise;
         jwtInterceptorProvider.tokenGetter = /*@ngInject*/ function (options, tokenService, authService) {
@@ -214,14 +214,16 @@ angular
                 controller: 'accountsLoginController',
                 params: {
                     returnState: null,
-                    email: null
+                    email: null,
+                    premium: null,
+                    org: null
                 },
                 data: {
                     bodyClass: 'login-page'
                 }
             })
             .state('frontend.login.info', {
-                url: '^/?org',
+                url: '^/?org&premium&email',
                 templateUrl: 'app/accounts/views/accountsLoginInfo.html',
                 data: {
                     pageTitle: 'Log In'
@@ -260,12 +262,14 @@ angular
                 }
             })
             .state('frontend.register', {
-                url: '^/register?org',
+                url: '^/register?org&premium',
                 templateUrl: 'app/accounts/views/accountsRegister.html',
                 controller: 'accountsRegisterController',
                 params: {
                     returnState: null,
-                    email: null
+                    email: null,
+                    org: null,
+                    premium: null
                 },
                 data: {
                     pageTitle: 'Register',