Improved current-user and it's loading (mainmatter#1176)

Author: mfazekas

guides/managing-current-user.md

@@ -74,6 +74,8 @@ export default Ember.Service.extend({
       return this.get('store').queryRecord('user', { me: true }).then((user) => {
         this.set('user', user);
       });
+    } else {
+      return Ember.RSVP.resolve();
     }
   }
 });
@@ -150,11 +152,11 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
 
   sessionAuthenticated() {
     this._super(...arguments);
-    this._loadCurrentUser().catch(() => this.get('session').invalidate());
+    this._loadCurrentUser();
   },
 
   _loadCurrentUser() {
-    return this.get('currentUser').load();
+    return this.get('currentUser').load().catch(() => this.get('session').invalidate());
   }
 });
 ```

tests/dummy/app/routes/application.js

@@ -12,10 +12,10 @@ export default Route.extend(ApplicationRouteMixin, {
 
   sessionAuthenticated() {
     this._super(...arguments);
-    this._loadCurrentUser().catch(() => this.get('session').invalidate());
+    this._loadCurrentUser();
   },
 
   _loadCurrentUser() {
-    return this.get('sessionAccount').loadCurrentUser();
+    return this.get('sessionAccount').loadCurrentUser().catch(() => this.get('session').invalidate());
   }
 });