@adobe/helix-google-support 3.1.37 → 3.2.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [3.2.0](https://github.com/adobe/helix-google-support/compare/v3.1.39...v3.2.0) (2024-09-26)
+
+
+### Features
+
+* allow passing other options to Google API ([#429](https://github.com/adobe/helix-google-support/issues/429)) ([b87724e](https://github.com/adobe/helix-google-support/commit/b87724e41faa9841fe56700bfa0648da54132a52))
+
+## [3.1.39](https://github.com/adobe/helix-google-support/compare/v3.1.38...v3.1.39) (2024-09-24)
+
+
+### Bug Fixes
+
+* **deps:** update adobe fixes ([76232d5](https://github.com/adobe/helix-google-support/commit/76232d56fb3864beb69d5bf8706187be094b2ad1))
+
+## [3.1.38](https://github.com/adobe/helix-google-support/compare/v3.1.37...v3.1.38) (2024-09-22)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-onedrive-support to v11.5.16 ([3d5a109](https://github.com/adobe/helix-google-support/commit/3d5a1095db92e158166db74957ead746c6e3fd03))
+
 ## [3.1.37](https://github.com/adobe/helix-google-support/compare/v3.1.36...v3.1.37) (2024-09-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-google-support",
-  "version": "3.1.37",
+  "version": "3.2.0",
   "description": "Helix Google Support",
   "main": "src/index.js",
   "type": "module",
@@ -31,21 +31,21 @@
     "reporter-options": "configFile=.mocha-multi.json"
   },
   "dependencies": {
-    "@adobe/helix-onedrive-support": "11.5.15",
+    "@adobe/helix-onedrive-support": "11.5.17",
     "googleapis": "144.0.0",
     "lru-cache": "11.0.1"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "2.0.7",
-    "@adobe/helix-shared-tokencache": "1.4.31",
+    "@adobe/helix-shared-tokencache": "1.4.33",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "c8": "10.1.2",
-    "eslint": "8.57.0",
+    "eslint": "8.57.1",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.30.0",
     "husky": "9.1.6",
-    "junit-report-builder": "5.0.0",
+    "junit-report-builder": "5.1.1",
     "lint-staged": "15.2.10",
     "mocha": "10.7.3",
     "mocha-multi-reporters": "1.5.1",

package/src/GoogleClient.js

@@ -130,6 +130,8 @@ export class GoogleClient {
       version: 'v3',
       auth: this.auth,
     });
+
+    this.googleApiOpts = opts.googleApiOpts;
   }
 
   async init() {
@@ -177,7 +179,7 @@ export class GoogleClient {
    * @returns {Promise<DriveItemInfo[]>|null}
    */
   async getUncachedItemsFromSegments(parentId, pathSegments, parentPath, type) {
-    const { log, drive } = this;
+    const { log, drive, googleApiOpts } = this;
     const name = pathSegments.shift();
     const [baseName, ext] = splitByExtension(name);
     const sanitizedName = sanitizeName(baseName);
@@ -193,7 +195,7 @@ export class GoogleClient {
         : 'and mimeType != \'application/vnd.google-apps.folder\'';
     }
 
-    const opts = {
+    const params = {
       q: [
         `'${parentId}' in parents`,
         'and trashed=false',
@@ -207,13 +209,13 @@ export class GoogleClient {
 
     do {
       // eslint-disable-next-line no-await-in-loop
-      const { data } = await drive.files.list(opts);
+      const { data } = await drive.files.list(params, googleApiOpts);
       if (data.nextPageToken) {
-        opts.pageToken = data.nextPageToken;
+        params.pageToken = data.nextPageToken;
       } else {
-        opts.pageToken = null;
+        params.pageToken = null;
       }
-      log.debug(`fetched ${data.files.length} items below ${parentId}. nextPageToken=${opts.pageToken ? '****' : 'null'}`);
+      log.debug(`fetched ${data.files.length} items below ${parentId}. nextPageToken=${params.pageToken ? '****' : 'null'}`);
 
       // find fuzzy match
       data.files.forEach((item) => {
@@ -235,7 +237,7 @@ export class GoogleClient {
         item.fuzzyDistance = editDistance(baseName, itemName);
         items.push(item);
       });
-    } while (opts.pageToken);
+    } while (params.pageToken);
 
     // sort items by edit distance first and 2nd by item name
     items.sort((i0, i1) => {
@@ -338,7 +340,7 @@ export class GoogleClient {
    * @returns {Promise<DriveItemInfo[]>}
    */
   async getItems(fileId, roots) {
-    const { log } = this;
+    const { log, googleApiOpts } = this;
     log.debug(`getItems(${fileId})`);
     const { data } = (await this.drive.files.get({
       fileId,
@@ -349,7 +351,7 @@ export class GoogleClient {
         'modifiedTime',
       ].join(','),
       supportsAllDrives: true,
-    }));
+    }, googleApiOpts));
 
     const root = roots[fileId];
     if (root) {
@@ -455,7 +457,7 @@ export class GoogleClient {
           'modifiedTime',
         ].join(','),
         supportsAllDrives: true,
-      }));
+      }, this.googleApiOpts));
       return addFields({
         id: fileId,
         path: `/${data.name}`,
@@ -479,7 +481,7 @@ export class GoogleClient {
         fileId,
         alt: 'media',
         supportsAllDrives: true,
-      }, { responseType: 'arraybuffer' });
+      }, { ...(this.googleApiOpts || {}), responseType: 'arraybuffer' });
       return Buffer.from(res.data);
     } catch (e) {
       if (e.response && e.response.status === 404) {
@@ -604,7 +606,7 @@ export class GoogleClient {
 
       const response = await this.drive.files.create({
         requestBody,
-      });
+      }, this.googleApiOpts);
 
       return response.data;
     } catch (e) {