fix introspection fails for non admin role, fix #340

server/src-lib/Hasura/GraphQL/Schema.hs

@@ -319,10 +319,13 @@ type table_mutation_response {
 -}
 mkMutRespObj
   :: QualifiedTable
+  -> Maybe () -- sel perm
   -> ObjTyInfo
-mkMutRespObj tn =
+mkMutRespObj tn selM =
   mkObjTyInfo (Just objDesc) (mkMutRespTy tn) $ mapFromL _fiName
-  [affectedRowsFld, returningFld]
+  $ catMaybes [ Just affectedRowsFld
+              , const returningFld <$> selM
+              ]
   where
     objDesc = G.Description $
       "response of any mutation on the table " <>> tn
@@ -896,7 +899,7 @@ mkGCtxRole' tn insColsM selFldsM updColsM delPermM pkeyCols constraints =
     -- mut resp obj
     mutRespObjM =
       if isJust insColsM || isJust updColsM || isJust delPermM
-      then Just $ mkMutRespObj tn
+      then Just $ mkMutRespObj tn $ void selFldsM
       else Nothing
 
     -- table obj

server/test/Spec.hs

@@ -52,6 +52,7 @@ querySpecFiles =
 gqlSpecFiles :: [FilePath]
 gqlSpecFiles =
   [ "introspection.yaml"
+  , "introspection_user_role.yaml"
   , "insert_mutation/author.yaml"
   , "simple_select_query_author.yaml"
   , "select_query_author_by_pkey.yaml"

server/test/testcases/introspection_user_role.yaml

@@ -0,0 +1,106 @@
+description: GraphQL introspection query as user role
+url: /v1alpha1/graphql
+status: 200
+headers:
+  X-Hasura-Role: user
+query:
+  query: |
+    query IntrospectionQuery {
+      __schema {
+        queryType {
+          name
+          }
+        mutationType {
+          name
+          }
+        subscriptionType {
+          name
+          }
+          types {
+          ...FullType
+          }
+        directives {
+          name
+          description
+          locations
+          args {
+          ...InputValue
+          }
+        }
+      }
+    }
+    
+    fragment FullType on __Type {
+      kind
+      name
+      description
+      fields(includeDeprecated: true) {
+        name
+        description
+        args {
+        ...InputValue
+        }
+        type {
+        ...TypeRef
+        }
+        isDeprecated
+        deprecationReason
+      }
+      inputFields {
+        ...InputValue
+      }
+      interfaces {
+        ...TypeRef
+      }
+      enumValues(includeDeprecated: true) {
+          name
+          description
+          isDeprecated
+          deprecationReason
+      }
+      possibleTypes {
+        ...TypeRef
+      }
+    }
+    
+    fragment InputValue on __InputValue {
+    name
+    description
+    type {
+    ...TypeRef
+    }
+    defaultValue
+    }
+    
+    fragment TypeRef on __Type {
+      kind
+      name
+      ofType {
+        kind
+        name
+        ofType {
+          kind
+          name
+          ofType {
+            kind
+            name
+            ofType {
+              kind
+              name
+              ofType {
+                kind
+                name
+                ofType {
+                  kind
+                  name
+                  ofType {
+                    kind
+                    name
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }