@adobe/helix-onedrive-support 10.3.7 → 10.4.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [10.4.0](https://github.com/adobe/helix-onedrive-support/compare/v10.3.7...v10.4.0) (2023-08-28)
+
+
+### Features
+
+* add log fields for API call logging ([#425](https://github.com/adobe/helix-onedrive-support/issues/425)) ([36f88db](https://github.com/adobe/helix-onedrive-support/commit/36f88db697db73a7fc24da062f66d66aeab32bc0))
+
 ## [10.3.7](https://github.com/adobe/helix-onedrive-support/compare/v10.3.6...v10.3.7) (2023-08-21)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-onedrive-support",
-  "version": "10.3.7",
+  "version": "10.4.0",
   "description": "Helix OneDrive Support",
   "main": "src/index.js",
   "exports": {
@@ -36,12 +36,12 @@
     "@adobe/eslint-config-helix": "2.0.3",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@aws-sdk/client-s3": "3.395.0",
+    "@aws-sdk/client-s3": "3.400.0",
     "ajv": "8.12.0",
     "c8": "8.0.1",
     "codecov": "3.8.3",
     "dotenv": "16.3.1",
-    "eslint": "8.47.0",
+    "eslint": "8.48.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.28.1",
     "husky": "8.0.3",
@@ -49,12 +49,12 @@
     "jsdoc-to-markdown": "8.0.0",
     "jsdoc-tsimport-plugin": "1.0.5",
     "junit-report-builder": "3.0.1",
-    "lint-staged": "14.0.0",
+    "lint-staged": "14.0.1",
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.3.3",
     "npm": "9.8.1",
-    "semantic-release": "21.0.7"
+    "semantic-release": "21.1.1"
   },
   "lint-staged": {
     "*.js": "eslint"

package/src/OneDrive.js

@@ -125,14 +125,19 @@ export class OneDrive {
       opts.headers = {};
     }
     opts.headers.authorization = `Bearer ${accessToken}`;
+
+    const { log, auth: { logFields, tenant } } = this;
     const url = `https://graph.microsoft.com/v1.0${relUrl}`;
+    const method = opts.method || 'GET';
+
     try {
       const { fetch } = this.fetchContext;
       const resp = await fetch(url, opts);
-      const rateLimit = RateLimit.fromHeaders(resp.headers);
+      log.info(`OneDrive API [tenant:${tenant}] ${logFields}: ${method} ${relUrl} ${resp.status}`);
 
+      const rateLimit = RateLimit.fromHeaders(resp.headers);
       if (rateLimit) {
-        this.log.warn({ sharepointRateLimit: { tenant: this.auth.tenant, ...rateLimit.toJSON() } });
+        log.warn({ sharepointRateLimit: { tenant, ...rateLimit.toJSON() } });
       }
 
       if (!resp.ok) {
@@ -157,6 +162,7 @@ export class OneDrive {
       if (!(e instanceof StatusCodeError)) {
         err = StatusCodeError.fromError(e);
       }
+      log.info(`OneDrive API [tenant:${tenant}] ${logFields}: ${method} ${relUrl} ${e.statusCode}`);
       throw err;
     }
   }

package/src/OneDriveAuth.d.ts

@@ -28,6 +28,11 @@ export declare interface OneDriveAuthOptions {
   acquireMethod?: AcquireMethod;
   accessToken?: string;
 
+  /**
+   * Optional log fields, as key-value object.
+   */
+  logFields?: object;
+
   /**
    * use cache plugin instead for default (global) token cache.
    */

package/src/OneDriveAuth.js

@@ -76,6 +76,8 @@ export class OneDriveAuth {
     this.scopes = opts.scopes || DEFAULT_SCOPES;
     this.onCode = opts.onCode;
     this.acquireMethod = opts.acquireMethod || '';
+    this.logFields = Object.entries(opts.logFields || {})
+      .map(([key, value]) => `[${key}:${value}]`).join(' ');
 
     const validAcquireMethods = Array.from(Object.values(AcquireMethod));
     if (this.acquireMethod && !validAcquireMethods.includes(this.acquireMethod)) {