Decouple auth states from routing redux state

src/services/authFlow/ActivationState.js

@@ -4,13 +4,13 @@ import ResendActivationState from './ResendActivationState';
 
 export default class ActivationState extends AbstractState {
     enter(context) {
-        const {user, routing} = context.getState();
+        const {user} = context.getState();
 
         if (user.isActive) {
             context.setState(new CompleteState());
         } else {
-            const url = routing.location.pathname.includes('/activation')
+            const url = context.getCurrentPath().includes('/activation')
-                ? routing.location.pathname
+                ? context.getCurrentPath()
                 : '/activation';
             context.navigate(url);
         }

src/services/authFlow/AuthFlow.js

@@ -25,9 +25,7 @@ export default class AuthFlow {
 
     setStore(store) {
         this.navigate = (route) => {
-            const {routing} = this.getState();
+            if (this.currentPath !== route) {
-
-            if (routing.location.pathname !== route) {
                 this.currentPath = route;
 
                 if (this.replace) {
@@ -91,6 +89,14 @@ export default class AuthFlow {
         }
     }
 
+    getCurrentPath() {
+        return this.currentPath;
+    }
+
+    getQuery() {
+        return this.getState().routing.location.query;
+    }
+
     /**
      * This should be called from onEnter prop of react-router Route component
      *

src/services/authFlow/OAuthState.js

@@ -3,7 +3,7 @@ import CompleteState from './CompleteState';
 
 export default class OAuthState extends AbstractState {
     enter(context) {
-        const query = context.getState().routing.location.query;
+        const query = context.getQuery();
 
         return context.run('oAuthValidate', {
             clientId: query.client_id,

src/services/authFlow/RecoverPasswordState.js

@@ -4,11 +4,11 @@ import CompleteState from './CompleteState';
 
 export default class RecoverPasswordState extends AbstractState {
     enter(context) {
-        const {user, routing} = context.getState();
+        const {user} = context.getState();
 
         if (user.isGuest) {
-            const url = routing.location.pathname.includes('/recover-password')
+            const url = context.getCurrentPath().includes('/recover-password')
-                ? routing.location.pathname
+                ? context.getCurrentPath()
                 : '/recover-password';
             context.navigate(url);
         } else {

tests/services/authFlow/ActivationState.test.js

@@ -27,12 +27,11 @@ describe('ActivationState', () => {
             context.getState.returns({
                 user: {
                     isActive: false
-                },
-                routing: {
-                    location: {pathname: expectedPath}
                 }
             });
 
+            context.getCurrentPath.returns(expectedPath);
+
             expectNavigate(mock, '/activation');
 
             state.enter(context);
@@ -43,12 +42,11 @@ describe('ActivationState', () => {
             context.getState.returns({
                 user: {
                     isActive: false
-                },
-                routing: {
-                    location: {pathname: expectedPath}
                 }
             });
 
+            context.getCurrentPath.returns(expectedPath);
+
             expectNavigate(mock, expectedPath);
 
             state.enter(context);

tests/services/authFlow/AuthFlow.functional.test.js

@@ -30,10 +30,6 @@ describe('AuthFlow.functional', () => {
         flow.setStore(store);
 
         navigate = function navigate(url) { // emulates router behaviour
-            state.routing = state.routing || {};
-            state.routing.location = state.routing.location || {};
-            state.routing.location.pathname = url;
-
             if (navigate.lastUrl !== url) {
                 navigate.lastUrl = url;
                 flow.handleRequest(url, navigate);

tests/services/authFlow/OAuthState.test.js

@@ -30,9 +30,7 @@ describe('OAuthState', () => {
                 state: 'state'
             };
 
-            context.getState.returns({
+            context.getQuery.returns(query);
-                routing: {location: {query}}
-            });
 
             expectRun(
                 mock,
@@ -52,9 +50,7 @@ describe('OAuthState', () => {
         it('should transition to complete state on success', () => {
             const promise = Promise.resolve();
 
-            context.getState.returns({
+            context.getQuery.returns({});
-                routing: {location: {query: {}}}
-            });
 
             mock.expects('run').returns(promise);
             expectState(mock, CompleteState);

tests/services/authFlow/RecoverPasswordState.test.js

@@ -25,12 +25,11 @@ describe('RecoverPasswordState', () => {
         it('should navigate to /recover-password', () => {
             const expectedPath = '/recover-password';
             context.getState.returns({
-                user: {isGuest: true},
+                user: {isGuest: true}
-                routing: {
-                    location: {pathname: expectedPath}
-                }
             });
 
+            context.getCurrentPath.returns(expectedPath);
+
             expectNavigate(mock, expectedPath);
 
             state.enter(context);
@@ -39,12 +38,11 @@ describe('RecoverPasswordState', () => {
         it('should navigate to /recover-password/key', () => {
             const expectedPath = '/recover-password/sasx5AS4d61';
             context.getState.returns({
-                user: {isGuest: true},
+                user: {isGuest: true}
-                routing: {
-                    location: {pathname: expectedPath}
-                }
             });
 
+            context.getCurrentPath.returns(expectedPath);
+
             expectNavigate(mock, expectedPath);
 
             state.enter(context);

tests/services/authFlow/helpers.js

@@ -7,6 +7,8 @@ export function bootstrap() {
         getState: sinon.stub(),
         run() {},
         setState() {},
+        getCurrentPath: sinon.stub(),
+        getQuery: sinon.stub(),
         navigate() {}
     };