defer navigation display until user promise is fulfilled

TryGhost · Feb 1, 2017 · 791a819 · 791a819
1 parent 51f444c
commit 791a819
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/controllers/application.js b/app/controllers/application.js
@@ -6,7 +6,13 @@ export default Controller.extend({
     dropdown: injectService(),
     session: injectService(),
 
-    showNavMenu: computed('currentPath', 'session.isAuthenticated', function () {
+    showNavMenu: computed('currentPath', 'session.isAuthenticated', 'session.user.isFulfilled', function () {
+        // we need to defer showing the navigation menu until the session.user
+        // promise has fulfilled so that gh-user-can-admin has the correct data
+        if (!this.get('session.isAuthenticated') || !this.get('session.user.isFulfilled')) {
+            return false;
+        }
+
         return (this.get('currentPath') !== 'error404' || this.get('session.isAuthenticated'))
                 && !this.get('currentPath').match(/(signin|signup|setup|reset)/);
     }),