Support for cookies and auth headers

.github/workflows/publish.yml

@@ -9,20 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: actions/cache@v2
-      name: Configure pip caching
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
+        cache: pip
+        cache-dependency-path: setup.py
     - name: Install dependencies
       run: |
         pip install -e '.[test]'
@@ -33,18 +28,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: [test]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.11'
-    - uses: actions/cache@v2
-      name: Configure pip caching
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-publish-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-publish-pip-
+        cache: pip
+        cache-dependency-path: setup.py
     - name: Install dependencies
       run: |
         pip install setuptools wheel twine build

.github/workflows/test.yml

@@ -7,20 +7,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: actions/cache@v2
-      name: Configure pip caching
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
+        cache: pip
+        cache-dependency-path: setup.py
     - name: Install dependencies
       run: |
         pip install -e '.[test]'

datasette_graphql/__init__.py

@@ -113,6 +113,7 @@ async def view_graphql(request, datasette):
         "num_queries_executed": 0,
         "num_queries_limit": config.get("num_queries_limit")
         or DEFAULT_NUM_QUERIES_LIMIT,
+        "request": request,  # For authentication headers
     }
 
     result = await schema.execute_async(

datasette_graphql/utils.py

@@ -270,7 +270,7 @@ class _TableCollection(graphene.ObjectType):
         edges = graphene.List(_Edge)
 
         def resolve_totalCount(parent, info):
-            return parent["filtered_table_rows_count"]
+            return parent["count"]
 
         def resolve_nodes(parent, info):
             return parent["rows"]
@@ -570,6 +570,8 @@ async def resolve_table(
         elif sort_desc:
             qs["_sort_desc"] = column_name_rev[sort_desc.value]
 
+        qs["_extra"] = "count"
+
         path_with_query_string = "/{}/{}.json?{}".format(
             database_name, table_name, urllib.parse.urlencode(qs)
         )
@@ -592,8 +594,15 @@ async def resolve_table(
                     path_with_query_string,
                 )
 
-        data = (await datasette.client.get(path_with_query_string)).json()
-        data["rows"] = [dict(zip(data["columns"], row)) for row in data["rows"]]
+        headers = context["request"].headers
+        cookies = context["request"].cookies
+
+        response = await datasette.client.get(
+            path_with_query_string, headers=headers, cookies=cookies
+        )
+        if response.status_code != 200:
+            raise Exception(str(response.status_code) + response.text)
+        data = response.json()
         # If any cells are $base64, decode them into bytes objects
         for row in data["rows"]:
             for key, value in row.items():

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 import os
 
-VERSION = "2.2"
+VERSION = "3.0a0"
 
 
 def get_long_description():
@@ -29,7 +29,7 @@ def get_long_description():
     packages=["datasette_graphql"],
     entry_points={"datasette": ["graphql = datasette_graphql"]},
     install_requires=[
-        "datasette>=0.58.1",
+        "datasette>=1.0a5",
         "graphene>=3.1.0,<4.0",
         "graphql-core>=3.2.1",
         "sqlite-utils",

tests/test_graphql.py

@@ -537,7 +537,7 @@ async def test_time_limit_ms(db_path):
     assert len(response_json["errors"]) == 1
     assert response_json["errors"][0]["message"].startswith("Time limit exceeded: ")
     assert response_json["errors"][0]["message"].endswith(
-        " > 0.1ms - /test/repos.json?_nofacet=1&_size=10&_search=dogspotter"
+        " > 0.1ms - /test/repos.json?_nofacet=1&_size=10&_search=dogspotter&_extra=count"
     )