Don't synchronously wait for /me

There's no need to wait for it on page load as we should get straight to loading
the content and worry about our user account later!

Author: alexcrichton

app/mixins/authenticated-route.js

@@ -3,7 +3,19 @@ import Ember from 'ember';
 export default Ember.Mixin.create({
     beforeModel: function(transition) {
         var user = this.session.get('currentUser');
-        if (user === null) {
+        if (user !== null) { return; }
+
+        // The current user is loaded asynchronously, so if we haven't actually
+        // loaded the current user yet then we need to wait for it to be loaded.
+        // Once we've done that we can retry the transition and start the whole
+        // process over again!
+        if (!window.currentUserDetected) {
+            transition.abort();
+            Ember.$(window).on('currentUserDetected', function() {
+                Ember.$(window).off('currentUserDetected');
+                transition.retry();
+            });
+        } else {
             this.session.set('savedTransition', transition);
             this.controllerFor('application').set('nextFlashError',
                                                   'Please log in to proceed');

app/routes/application.js

@@ -7,12 +7,15 @@ export default Ember.Route.extend({
         if (this.session.get('isLoggedIn') &&
             this.session.get('currentUser') === null)
         {
-            return ajax('/me').then(function(response) {
+            ajax('/me').then(function(response) {
                 var user = self.store.push('user', response.user);
                 user.set('api_token', response.api_token);
                 self.session.set('currentUser', user);
             }).catch(function() {
                 self.session.logoutUser();
+            }).finally(function() {
+                window.currentUserDetected = true;
+                Ember.$(window).trigger('currentUserDetected');
             });
         }
     },