Fix auth token override in sql promise (#117)

neondatabase · Nov 6, 2024 · 28c823d · 28c823d
1 parent 5a2a6aa
commit 28c823d
Show file tree

Hide file tree

Showing 9 changed files with 2,137 additions and 2,119 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.3 (2024-11-06)
+
+Fixes `authToken` overriding in `sql` HTTP request.
+
 ## 0.10.2 (2024-11-05)
 
 Expose `types` property on public HTTPQueryOptions type

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.2",
+  "version": "0.10.3",
   "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 @@
+## 0.10.3 (2024-11-06)
+
+Fixes `authToken` overriding in `sql` HTTP request.
+
 ## 0.10.2 (2024-11-05)
 
 Expose `types` property on public HTTPQueryOptions type

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.2",
+  "version": "0.10.3",
   "author": "Neon",
   "description": "node-postgres for serverless environments from neon.tech",
   "exports": {

diff --git a/export/httpQuery.ts b/export/httpQuery.ts
@@ -282,6 +282,12 @@ export function neon(
       };
     }
 
+    // --- resolve auth token usage ---
+    let resolvedAuthToken = authToken;
+    if (!Array.isArray(allSqlOpts) && allSqlOpts?.authToken !== undefined) {
+      resolvedAuthToken = allSqlOpts.authToken;
+    }
+
     // --- set headers ---
 
     const headers: Record<string, string> = {
@@ -290,7 +296,8 @@ export function neon(
       'Neon-Array-Mode': 'true', // this saves data and post-processing even if we return objects, not arrays
     };
 
-    const validAuthToken = await getAuthToken(authToken);
+    // --- add auth token to headers ---
+    const validAuthToken = await getAuthToken(resolvedAuthToken);
     if (validAuthToken) {
       headers['Authorization'] = `Bearer ${validAuthToken}`;
     }