[auth][m] - add data field back but remove where clause

Author: luccasmmg

docker-compose.yaml

@@ -21,7 +21,9 @@ services:
       HASURA_GRAPHQL_DEV_MODE: 'true'
       HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log
       ## uncomment next line to set an admin secret
-      ## HASURA_GRAPHQL_ADMIN_SECRET: myadminsecretkey
+      ##HASURA_GRAPHQL_ADMIN_SECRET: myadminsecretkey
+      ## uncomment next line to set an role that will be used for anauthenticated calls
+      ##HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "anon"
   db:
     image: postgres
     ports:

routes/index.js

@@ -27,11 +27,14 @@ async function getGraphQLTableSchema(resource_id) {
   }
 `
   // return request(`${process.env.HASURA_URL}/v1/graphql`, queryForSchema)
-  const graphQLClient = new GraphQLClient(`${process.env.HASURA_URL}/v1/graphql`, {
-    headers: {
-      'x-hasura-admin-secret': process.env.HASURA_GRAPHQL_ADMIN_SECRET,
-    },
-  })
+  const graphQLClient = new GraphQLClient(
+    `${process.env.HASURA_URL}/v1/graphql`,
+    {
+      headers: {
+        'x-hasura-admin-secret': process.env.HASURA_GRAPHQL_ADMIN_SECRET,
+      },
+    }
+  )
   try {
     const schemaPrep = await graphQLClient.request(queryForSchema)
     //    console.log(JSON.stringify(schemaPrep, null, 2))  // TODO erase log
@@ -92,13 +95,17 @@ router.get(`/${APP_VERSION}/datastore_search`, async function (req, res, next) {
     // query for schema  -> this should be already in Frictionless format
     // const schema = await queryForSchema()
     const schema = await getGraphQLTableSchema(table)
+    console.log(schema)
+    const data = await queryForData(schema, req.query)
+    console.log(data.errors)
     /*TODO*/
     /* Auth handling  ... maybe JWT? */
     // Mandatory GET parameters check
 
     // response
     res.send({
       schema: beautifyGQLSchema(schema),
+      data,
     })
   } catch (e) {
     console.error(e)

routes/queryGraphQL.js

@@ -1,4 +1,4 @@
-const { request, gql, GraphQLClient } = require('graphql-request')
+const { request, gql } = require('graphql-request')
 const { app } = require('../app')
 
 async function queryForData(schema, params) {
@@ -28,8 +28,9 @@ async function queryForData(schema, params) {
   }
   // console.log("Variables = "+ JSON.stringify(variables))
   const query = buildParametrableQuery(schema, queryParams)
-  return request(process.env.HASURA_URL + '/v1/graphql', query, variables)
-    .then((resp) => resp[params.resource_id])
+  return request(process.env.HASURA_URL + '/v1/graphql', query, variables).then(
+    (resp) => resp[params.resource_id]
+  )
 }
 
 /**
@@ -77,9 +78,6 @@ function buildParametrableQuery(schema, params) {
   return gql`query ${params.resource_id}_query (${variablesDeclaration}) { 
     ${params.resource_id}(
       limit: ${limit},
-      where: {
-        ${whereFields.join(' ')}
-      }, 
       offset: $offset,
       ${extraFields}
       ) {