Use replace in onEnter and bump react-router

Author: mjrussell

package.json

@@ -46,7 +46,7 @@
     "react": "~0.14.3",
     "react-addons-test-utils": "^0.14.6",
     "react-redux": "^4.0.1",
-    "react-router": "2.0.0-rc5",
+    "react-router": "2.0.0",
     "react-router-redux": "~3.0.0",
     "redux": "^3.2.0"
   },

src/index.js

@@ -108,9 +108,8 @@ const UserAuthWrapper = (args) => {
   }
 
   wrapComponent.onEnter = (store, nextState, replace) => {
-    const replaceWithState = ({ pathname, query }) => replace({ pathname, state: query })
     const authData = authSelector(store.getState())
-    ensureAuth({ location: nextState.location, authData }, replaceWithState)
+    ensureAuth({ location: nextState.location, authData }, replace)
   }
 
   return wrapComponent

test/UserAuthWrapper-test.js

@@ -318,6 +318,6 @@ describe('UserAuthWrapper', () => {
     expect(store.getState().routing.location.search).to.equal('')
     history.push('/onEnter')
     expect(store.getState().routing.location.pathname).to.equal('/login')
-    expect(store.getState().routing.location.state).to.deep.equal({ redirect: '/onEnter' })
+    expect(store.getState().routing.location.search).to.equal('?redirect=%2FonEnter')
   })
 })