Fix redirects regression and update auth-flow example

examples/auth-flow/app.js

@@ -67,6 +67,8 @@ var Dashboard = React.createClass({
 });
 
 var Login = React.createClass({
+  mixins: [ Router.Navigation ],
+
   statics: {
     attemptedTransition: null
   },
@@ -90,7 +92,7 @@ var Login = React.createClass({
         Login.attemptedTransition = null;
         transition.retry();
       } else {
-        Router.replaceWith('/about');
+        this.replaceWith('/about');
       }
     }.bind(this));
   },

modules/components/Routes.js

@@ -1,8 +1,10 @@
 var React = require('react');
 var warning = require('react/lib/warning');
+var invariant = require('react/lib/invariant');
 var canUseDOM = require('react/lib/ExecutionEnvironment').canUseDOM;
 var copyProperties = require('react/lib/copyProperties');
 var PathStore = require('../stores/PathStore');
+var HashLocation = require('../locations/HashLocation');
 var reversedArray = require('../utils/reversedArray');
 var Transition = require('../utils/Transition');
 var Redirect = require('../utils/Redirect');
@@ -262,36 +264,30 @@ function computeHandlerProps(matches, query) {
 
 var BrowserTransitionHandling = {
 
-  handleTransitionError: function (error) {
+  handleTransitionError: function (component, error) {
     throw error; // This error probably originated in a transition hook.
   },
 
-  handleAbortedTransition: function (transition) {
+  handleAbortedTransition: function (component, transition) {
     var reason = transition.abortReason;
 
     if (reason instanceof Redirect) {
-      this.replaceWith(reason.to, reason.params, reason.query);
+      component.replaceWith(reason.to, reason.params, reason.query);
     } else {
-      this.goBack();
+      component.goBack();
     }
   }
 
 };
 
 var ServerTransitionHandling = {
 
-  handleTransitionError: function (error) {
+  handleTransitionError: function (component, error) {
     // TODO
   },
 
-  handleAbortedTransition: function (transition) {
-    var reason = transition.abortReason;
-
-    if (reason instanceof Redirect) {
-      // TODO
-    } else {
-      // TODO
-    }
+  handleAbortedTransition: function (component, transition) {
+    // TODO
   }
 
 };
@@ -351,9 +347,9 @@ var Routes = React.createClass({
 
     this.dispatch(path, function (error, transition) {
       if (error) {
-        TransitionHandling.handleTransitionError.call(self, error);
+        TransitionHandling.handleTransitionError(self, error);
       } else if (transition.isAborted) {
-        TransitionHandling.handleAbortedTransition.call(self, transition);
+        TransitionHandling.handleAbortedTransition(self, transition);
       } else {
         self.updateScroll(path, actionType);
       }
@@ -417,6 +413,13 @@ var Routes = React.createClass({
     return computeHandlerProps(this.state.matches, this.state.activeQuery);
   },
 
+  /**
+   * Returns a reference to the active route handler's component instance.
+   */
+  getActiveComponent: function () {
+    return this.refs.__activeRoute__;
+  },
+
   /**
    * Returns the current URL path.
    */
@@ -425,10 +428,84 @@ var Routes = React.createClass({
   },
 
   /**
-   * Returns a reference to the active route handler's component instance.
+   * Returns an absolute URL path created from the given route
+   * name, URL parameters, and query values.
    */
-  getActiveComponent: function () {
-    return this.refs.__activeRoute__;
+  makePath: function (to, params, query) {
+    var path;
+    if (Path.isAbsolute(to)) {
+      path = Path.normalize(to);
+    } else {
+      var namedRoutes = this.getNamedRoutes();
+      var route = namedRoutes[to];
+
+      invariant(
+        route,
+        'Unable to find a route named "' + to + '". Make sure you have ' +
+        'a <Route name="' + to + '"> defined somewhere in your <Routes>'
+      );
+
+      path = route.props.path;
+    }
+
+    return Path.withQuery(Path.injectParams(path, params), query);
+  },
+
+  /**
+   * Returns a string that may safely be used as the href of a
+   * link to the route with the given name.
+   */
+  makeHref: function (to, params, query) {
+    var path = this.makePath(to, params, query);
+
+    if (this.getLocation() === HashLocation)
+      return '#' + path;
+
+    return path;
+  },
+
+    /**
+   * Transitions to the URL specified in the arguments by pushing
+   * a new URL onto the history stack.
+   */
+  transitionTo: function (to, params, query) {
+    var location = this.getLocation();
+
+    invariant(
+      location,
+      'You cannot use transitionTo without a location'
+    );
+
+    location.push(this.makePath(to, params, query));
+  },
+
+  /**
+   * Transitions to the URL specified in the arguments by replacing
+   * the current URL in the history stack.
+   */
+  replaceWith: function (to, params, query) {
+    var location = this.getLocation();
+
+    invariant(
+      location,
+      'You cannot use replaceWith without a location'
+    );
+
+    location.replace(this.makePath(to, params, query));
+  },
+
+  /**
+   * Transitions to the previous URL.
+   */
+  goBack: function () {
+    var location = this.getLocation();
+
+    invariant(
+      location,
+      'You cannot use goBack without a location'
+    );
+
+    location.pop();
   },
 
   render: function () {
@@ -443,12 +520,22 @@ var Routes = React.createClass({
   },
 
   childContextTypes: {
-    currentPath: React.PropTypes.string
+    currentPath: React.PropTypes.string,
+    makePath: React.PropTypes.func.isRequired,
+    makeHref: React.PropTypes.func.isRequired,
+    transitionTo: React.PropTypes.func.isRequired,
+    replaceWith: React.PropTypes.func.isRequired,
+    goBack: React.PropTypes.func.isRequired
   },
 
   getChildContext: function () {
     return {
-      currentPath: this.getCurrentPath()
+      currentPath: this.getCurrentPath(),
+      makePath: this.makePath,
+      makeHref: this.makeHref,
+      transitionTo: this.transitionTo,
+      replaceWith: this.replaceWith,
+      goBack: this.goBack
     };
   }
 

modules/mixins/Navigation.js

@@ -1,96 +1,55 @@
 var React = require('react');
-var invariant = require('react/lib/invariant');
-var HashLocation = require('../locations/HashLocation');
-var Path = require('../utils/Path');
 
 /**
  * A mixin for components that modify the URL.
  */
 var Navigation = {
 
   contextTypes: {
-    location: React.PropTypes.object, // Not required on the server.
-    namedRoutes: React.PropTypes.object.isRequired
+    makePath: React.PropTypes.func.isRequired,
+    makeHref: React.PropTypes.func.isRequired,
+    transitionTo: React.PropTypes.func.isRequired,
+    replaceWith: React.PropTypes.func.isRequired,
+    goBack: React.PropTypes.func.isRequired
   },
 
   /**
    * Returns an absolute URL path created from the given route
    * name, URL parameters, and query values.
    */
   makePath: function (to, params, query) {
-    var path;
-    if (Path.isAbsolute(to)) {
-      path = Path.normalize(to);
-    } else {
-      var route = this.context.namedRoutes[to];
-
-      invariant(
-        route,
-        'Unable to find a route named "' + to + '". Make sure you have ' +
-        'a <Route name="' + to + '"> defined somewhere in your <Routes>'
-      );
-
-      path = route.props.path;
-    }
-
-    return Path.withQuery(Path.injectParams(path, params), query);
+    return this.context.makePath(to, params, query);
   },
 
   /**
    * Returns a string that may safely be used as the href of a
    * link to the route with the given name.
    */
   makeHref: function (to, params, query) {
-    var path = this.makePath(to, params, query);
-
-    if (this.context.location === HashLocation)
-      return '#' + path;
-
-    return path;
+    return this.context.makeHref(to, params, query);
   },
 
   /**
    * Transitions to the URL specified in the arguments by pushing
    * a new URL onto the history stack.
    */
   transitionTo: function (to, params, query) {
-    var location = this.context.location;
-
-    invariant(
-      location,
-      'You cannot use transitionTo without a location'
-    );
-
-    location.push(this.makePath(to, params, query));
+    this.context.transitionTo(to, params, query);
   },
 
   /**
    * Transitions to the URL specified in the arguments by replacing
    * the current URL in the history stack.
    */
   replaceWith: function (to, params, query) {
-    var location = this.context.location;
-
-    invariant(
-      location,
-      'You cannot use replaceWith without a location'
-    );
-
-    location.replace(this.makePath(to, params, query));
+    this.context.replaceWith(to, params, query);
   },
 
   /**
    * Transitions to the previous URL.
    */
   goBack: function () {
-    var location = this.context.location;
-
-    invariant(
-      location,
-      'You cannot use goBack without a location'
-    );
-
-    location.pop();
+    this.context.goBack();
   }
 
 };

modules/utils/Transition.js

@@ -8,8 +8,8 @@ var Redirect = require('./Redirect');
  * The willTransitionTo and willTransitionFrom handlers receive
  * an instance of this class as their first argument.
  */
-function Transition(pathDelegate, path) {
-  this.pathDelegate = pathDelegate;
+function Transition(routesComponent, path) {
+  this.routesComponent = routesComponent;
   this.path = path;
   this.abortReason = null;
   this.isAborted = false;
@@ -31,7 +31,7 @@ mixInto(Transition, {
   },
 
   retry: function () {
-    this.pathDelegate.replaceWith(this.path);
+    this.routesComponent.replaceWith(this.path);
   }
 
 });