@adobe/helix-onedrive-support 8.3.4 → 8.3.6

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [8.3.6](https://github.com/adobe/helix-onedrive-support/compare/v8.3.5...v8.3.6) (2022-09-29)
+
+
+### Bug Fixes
+
+* OneDriveAuth: properly scoped fetch context ([#304](https://github.com/adobe/helix-onedrive-support/issues/304)) ([faa92f1](https://github.com/adobe/helix-onedrive-support/commit/faa92f1dcc65f6a0faca7c611f41e303ffa7d9ec))
+
+## [8.3.5](https://github.com/adobe/helix-onedrive-support/compare/v8.3.4...v8.3.5) (2022-09-29)
+
+
+### Bug Fixes
+
+* properly scoped fetch context ([388bd99](https://github.com/adobe/helix-onedrive-support/commit/388bd9929e8fe47ebcdd51dbad9c354ab19c45f3))
+
 ## [8.3.4](https://github.com/adobe/helix-onedrive-support/compare/v8.3.3...v8.3.4) (2022-09-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-onedrive-support",
-  "version": "8.3.4",
+  "version": "8.3.6",
   "description": "Helix OneDrive Support",
   "main": "src/index.js",
   "exports": {

package/src/OneDrive.js

@@ -17,7 +17,6 @@ import { StatusCodeError } from './StatusCodeError.js';
 import { editDistance, sanitizeName, splitByExtension } from './utils.js';
 import { SharePointSite } from './SharePointSite.js';
 
-const { fetch, reset } = keepAliveNoCache({ userAgent: 'adobe-fetch' });
 /**
  * the maximum subscription time in milliseconds
  * @see https://docs.microsoft.com/en-us/graph/api/resources/subscription?view=graph-rest-1.0#maximum-length-of-subscription-per-resource-type
@@ -87,6 +86,8 @@ export class OneDrive {
    * @param {OneDriveOptions} opts Options
    */
   constructor(opts) {
+    this.fetchContext = keepAliveNoCache({ userAgent: 'adobe-fetch' });
+
     if (!opts.auth) {
       throw new Error('Missing auth.');
     }
@@ -104,6 +105,7 @@ export class OneDrive {
   async dispose() {
     // TODO: clear other state?
     await this.auth.dispose();
+    const { reset } = this.fetchContext;
     return reset();
   }
 
@@ -124,6 +126,7 @@ export class OneDrive {
     opts.headers.authorization = `Bearer ${accessToken}`;
     const url = `https://graph.microsoft.com/v1.0${relUrl}`;
     try {
+      const { fetch } = this.fetchContext;
       const resp = await fetch(url, opts);
       if (!resp.ok) {
         const text = await resp.text();

package/src/OneDriveAuth.js

@@ -17,8 +17,6 @@ import { decodeJwt } from 'jose';
 import { MemCachePlugin } from './cache/MemCachePlugin.js';
 import { StatusCodeError } from './StatusCodeError.js';
 
-const { fetch, reset } = keepAliveNoCache({ userAgent: 'adobe-fetch' });
-
 const AZ_AUTHORITY_HOST_URL = 'https://login.windows.net';
 const AZ_COMMON_TENANT = 'common';
 
@@ -54,6 +52,8 @@ export class OneDriveAuth {
    * @param {OneDriveAuthOptions} opts Options
    */
   constructor(opts) {
+    this.fetchContext = keepAliveNoCache({ userAgent: 'adobe-fetch' });
+
     if (!opts.clientId) {
       throw new Error('Missing clientId.');
     }
@@ -119,6 +119,7 @@ export class OneDriveAuth {
   async resolveTenant(tenantHostName) {
     const { log } = this;
     const configUrl = `https://login.windows.net/${tenantHostName}.onmicrosoft.com/.well-known/openid-configuration`;
+    const { fetch } = this.fetchContext;
     const res = await fetch(configUrl);
     if (!res.ok) {
       log.info(`error fetching openid-configuration for ${tenantHostName}: ${res.status}. Fallback to 'common'`);
@@ -187,6 +188,7 @@ export class OneDriveAuth {
   // eslint-disable-next-line class-methods-use-this
   async dispose() {
     // TODO: clear other state?
+    const { reset } = this.fetchContext;
     return reset();
   }