google-spreadsheet 5.0.0 → 5.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-spreadsheet",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Google Sheets API -- simple interface to read/write data and manage sheets",
   "keywords": [
     "google spreadsheets",
@@ -53,7 +53,7 @@
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-no-floating-promise": "^1.0.2",
-    "google-auth-library": "^10.1.0",
+    "google-auth-library": "^10.2.1",
     "ky": "^1.8.2",
     "tsup": "^8.5.0",
     "typescript": "^5.5.4",

package/src/lib/GoogleSpreadsheet.ts

@@ -43,7 +43,14 @@ async function getRequestAuthConfig(auth: GoogleApiAuth): Promise<{
   // JWT | OAuth2Client | GoogleAuth | Impersonate | AuthClient
   if ('getRequestHeaders' in auth) {
     const headers = await auth.getRequestHeaders();
-    return { headers };
+
+    // google-auth-library v10 uses a Headers object rather than a plain object
+    if ('entries' in headers) {
+      return { headers: Object.fromEntries(headers.entries()) };
+    } if (_.isObject(headers)) {
+      return { headers: headers as Record<string, string> };
+    }
+    throw new Error('unexpected headers returned from getRequestHeaders');
   }
 
   // API key only access passes through the api key as a query param
@@ -139,11 +146,7 @@ export class GoogleSpreadsheet {
   async _setAuthRequestHook(req: Request) {
     const authConfig = await getRequestAuthConfig(this.auth);
     if (authConfig.headers) {
-      // google-auth-library v10 uses a Headers object
-      const headers = 'entries' in authConfig.headers
-        ? Object.fromEntries((authConfig.headers as any).entries())
-        : authConfig.headers;
-      Object.entries(headers).forEach(([key, val]) => {
+      Object.entries(authConfig.headers).forEach(([key, val]) => {
         req.headers.set(key, String(val));
       });
     }

package/src/lib/types/auth-types.ts

@@ -1,11 +1,7 @@
-// optional peer dependency - this ts-ignore should help when user is not using it
-// @ts-ignore
-import type { Headers } from 'google-auth-library/build/src/auth/oauth2client';
-
 /** single type to handle all valid auth types */
 export type GoogleApiAuth =
   // this simple interface should cover all google-auth-library auth methods
-  | { getRequestHeaders: () => Promise<Headers> }
+  | { getRequestHeaders: () => Promise<any> }
   // used to pass in an API key only
   | { apiKey: string }
   // used to pass in a raw token