update axios, fix new google-auth-library issue, fixes #701 #700

Author: theoephraim

package.json

@@ -46,7 +46,7 @@
  "commit": "cz",
  "docs:preview": "docsify serve docs",
  "lint": "eslint ./ --ext .ts",
- "lint:fix": "npm run lint --fix",
+ "lint:fix": "pnpm run lint --fix",
  "nodev": "node -v",
  "readme:copy": "echo \"<!-- DO NOT EDIT THIS FILE, EDIT MAIN README.md AND RUN \\`npm readme:copy\\` instead -->\n\n_Welcome to the docs site for_\n\" | cat - README.md > docs/README.md",
  "changelog": "auto-changelog --commit-limit false --unreleased-only --stdout",
@@ -60,7 +60,7 @@
  }
  },
  "dependencies": {
- "axios": "^1.4.0",
+ "axios": "^1.7.6",
  "lodash": "^4.17.21"
  },
  "devDependencies": {
@@ -82,7 +82,7 @@
  "eslint-plugin-import": "^2.27.5",
  "eslint-plugin-jest": "^27.2.1",
  "eslint-plugin-no-floating-promise": "^1.0.2",
- "google-auth-library": "^9.2.0",
+ "google-auth-library": "^9.14.0",
  "jest": "^29.5.0",
  "jest-junit": "^16.0.0",
  "release-it": "^15.11.0",

pnpm-lock.yaml

@@ -33,8 +33,9 @@ type ExportFileTypes = keyof typeof EXPORT_CONFIG;
 
 function getAuthMode(auth: GoogleApiAuth) {
  if ('getRequestHeaders' in auth) return AUTH_MODES.GOOGLE_AUTH_CLIENT;
- if ('token' in auth) return AUTH_MODES.RAW_ACCESS_TOKEN;
- if ('apiKey' in auth) return AUTH_MODES.API_KEY;
+ if ('token' in auth && auth.token) return AUTH_MODES.RAW_ACCESS_TOKEN;
+ // google-auth-library now has an empty `apiKey` property
+ if ('apiKey' in auth && auth.apiKey) return AUTH_MODES.API_KEY;
  throw new Error('Invalid auth');
 }
 
@@ -48,12 +49,12 @@ async function getRequestAuthConfig(auth: GoogleApiAuth) {
 
  // API key only access passes through the api key as a query param
  // (note this can only provide read-only access)
- if ('apiKey' in auth) {
+ if ('apiKey' in auth && auth.apiKey) {
  return { params: { key: auth.apiKey } };
  }
 
  // RAW ACCESS TOKEN
- if ('token' in auth) {
+ if ('token' in auth && auth.token) {
  return { headers: { Authorization: `Bearer ${auth.token}` } };
  }
 
@@ -606,7 +607,7 @@ export class GoogleSpreadsheet {
  static async createNewSpreadsheetDocument(auth: GoogleApiAuth, properties?: Partial<SpreadsheetProperties>) {
  // see updateProperties for more info about available properties
 
- if ('apiKey' in auth) {
+ if (getAuthMode(auth) === AUTH_MODES.API_KEY) {
  throw new Error('Cannot use api key only to create a new spreadsheet - it is only usable for read-only access of public docs');
  }