fix: passing authtoken only in http request

neondatabase · Nov 22, 2024 · c50ed4e · c50ed4e
1 parent 28c823d
commit c50ed4e
Show file tree

Hide file tree

Showing 9 changed files with 424 additions and 416 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## UNRELEASED
+
+Fixes only passing `authToken` in the `sql` HTTP request and not in the `neon` connection setup.
+
 ## 0.10.3 (2024-11-06)
 
 Fixes `authToken` overriding in `sql` HTTP request.

diff --git a/dist/jsr/index.js b/dist/jsr/index.js
diff --git a/dist/jsr/jsr.json b/dist/jsr/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@neon/serverless",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "exports": "./index.js",
   "imports": {
     "pg": "npm:@types/[email protected]"

diff --git a/dist/npm/CHANGELOG.md b/dist/npm/CHANGELOG.md
@@ -1,3 +1,7 @@
+## UNRELEASED
+
+Fixes only passing `authToken` in the `sql` HTTP request and not in the `neon` connection setup.
+
 ## 0.10.3 (2024-11-06)
 
 Fixes `authToken` overriding in `sql` HTTP request.

diff --git a/dist/npm/index.js b/dist/npm/index.js
diff --git a/dist/npm/index.mjs b/dist/npm/index.mjs
diff --git a/dist/npm/package-lock.json b/dist/npm/package-lock.json
diff --git a/dist/npm/package.json b/dist/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neondatabase/serverless",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "author": "Neon",
   "description": "node-postgres for serverless environments from neon.tech",
   "exports": {

diff --git a/export/httpQuery.ts b/export/httpQuery.ts
@@ -232,13 +232,6 @@ export function neon(
   ) {
     const { fetchEndpoint, fetchFunction } = Socket;
 
-    const url =
-      typeof fetchEndpoint === 'function'
-        ? fetchEndpoint(hostname, port, {
-            jwtAuth: authToken !== undefined,
-          })
-        : fetchEndpoint;
-
     const bodyData = Array.isArray(parameterizedQuery)
       ? { queries: parameterizedQuery }
       : parameterizedQuery;
@@ -288,8 +281,15 @@ export function neon(
       resolvedAuthToken = allSqlOpts.authToken;
     }
 
-    // --- set headers ---
+    // --- set up the URL ---
+    const url =
+      typeof fetchEndpoint === 'function'
+        ? fetchEndpoint(hostname, port, {
+            jwtAuth: resolvedAuthToken !== undefined,
+          })
+        : fetchEndpoint;
 
+    // --- set headers ---
     const headers: Record<string, string> = {
       'Neon-Connection-String': connectionString,
       'Neon-Raw-Text-Output': 'true', // because we do our own parsing with node-postgres