diff --git a/apps/server/package.json b/apps/server/package.json index 0980efbf8..4ee7cef56 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -5,6 +5,7 @@ "version": "2.13.1", "exports": "./src/index.js", "dependencies": { + "@googleapis/sheets": "^5.0.5", "body-parser": "^1.20.0", "cors": "^2.8.5", "dotenv": "^16.0.1", @@ -13,7 +14,6 @@ "express-static-gzip": "^2.1.7", "express-validator": "^6.14.2", "google-auth-library": "^9.2.0", - "googleapis": "^128.0.0", "lowdb": "^5.0.5", "multer": "^1.4.5-lts.1", "node-osc": "^9.0.2", diff --git a/apps/server/src/utils/sheetsAuth.ts b/apps/server/src/utils/sheetsAuth.ts index bf2c35593..de0721425 100644 --- a/apps/server/src/utils/sheetsAuth.ts +++ b/apps/server/src/utils/sheetsAuth.ts @@ -1,6 +1,6 @@ import { OAuth2Client } from 'google-auth-library'; import { readFile, writeFile } from 'fs/promises'; -import { google } from 'googleapis'; +import { sheets } from '@googleapis/sheets'; import http from 'http'; import { URL } from 'url'; import { logger } from '../classes/Logger.js'; @@ -55,7 +55,7 @@ class sheet { throw new Error('Got incorrect options to excel import', JSON.parse(options)); } - const rq = await google.sheets({ version: 'v4', auth: sheet.client }).spreadsheets.values.get({ + const rq = await sheets({ version: 'v4', auth: sheet.client }).spreadsheets.values.get({ spreadsheetId: sheetId, valueRenderOption: 'FORMATTED_VALUE', majorDimension: 'ROWS', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 647a0edb1..51f784e2d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -249,6 +249,9 @@ importers: apps/server: dependencies: + '@googleapis/sheets': + specifier: ^5.0.5 + version: 5.0.5 body-parser: specifier: ^1.20.0 version: 1.20.1 @@ -273,9 +276,6 @@ importers: google-auth-library: specifier: ^9.2.0 version: 9.2.0 - googleapis: - specifier: ^128.0.0 - version: 128.0.0 lowdb: specifier: ^5.0.5 version: 5.0.5 @@ -2231,6 +2231,16 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true + /@googleapis/sheets@5.0.5: + resolution: {integrity: sha512-XMoONmgAJm2jYeTYHX4054VcEkElxlgqmnHvt0wAurzEHoGJLdUHhTAJXGPLgSs4WVMPtgU8HLrmk7/U+Qlw7A==} + engines: {node: '>=12.0.0'} + dependencies: + googleapis-common: 7.0.1 + transitivePeerDependencies: + - encoding + - supports-color + dev: false + /@humanwhocodes/config-array@0.11.13: resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==} engines: {node: '>=10.10.0'} @@ -5749,17 +5759,6 @@ packages: - supports-color dev: false - /googleapis@128.0.0: - resolution: {integrity: sha512-+sLtVYNazcxaSD84N6rihVX4QiGoqRdnlz2SwmQQkadF31XonDfy4ufk3maMg27+FiySrH0rd7V8p+YJG6cknA==} - engines: {node: '>=14.0.0'} - dependencies: - google-auth-library: 9.2.0 - googleapis-common: 7.0.1 - transitivePeerDependencies: - - encoding - - supports-color - dev: false - /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: