From fbd0bf52fe2255895ebbe70d6820130aed0b9c2b Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 20 Jan 2017 16:53:43 -0700
Subject: [PATCH] Fixed methods

---
 graph/resolvers/root_query.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index dd5033d85..3a2499fd8 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -1,8 +1,10 @@
 const RootQuery = {
   assets(_, args, {loaders, user}) {
-    if (user.hasRole('admin')) {
-      return loaders.Assets.getAll.load();
+    if (user == null || !user.hasRoles('admin')) {
+      return null;
     }
+
+    return loaders.Assets.getAll.load();
   },
   asset(_, query, {loaders}) {
     if (query.id) {
@@ -23,7 +25,7 @@ const RootQuery = {
   // This endpoint is used for loading moderation queues, so hide it in the
   // event that we aren't an admin.
   comments(_, {query}, {loaders, user}) {
-    if (user == null || !user.hasRole('admin')) {
+    if (user == null || !user.hasRoles('admin')) {
       return null;
     }