@adobe/helix-onedrive-support 6.1.5 → 6.2.2

package/.github/workflows/semantic-release.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js 14.x
         uses: actions/setup-node@v3
         with:

package/.nycrc.json

@@ -4,7 +4,7 @@
     "text"
   ],
   "check-coverage": true,
-  "lines": 15,
-  "branches": 19,
-  "statements": 15
+  "lines": 83,
+  "branches": 77,
+  "statements": 83
 }

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [6.2.2](https://github.com/adobe/helix-onedrive-support/compare/v6.2.1...v6.2.2) (2022-03-20)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-fetch to v3.0.7 ([15f9380](https://github.com/adobe/helix-onedrive-support/commit/15f9380b04d28a68b1e39be38c8c913a0cf48fec))
+
+## [6.2.1](https://github.com/adobe/helix-onedrive-support/compare/v6.2.0...v6.2.1) (2022-03-16)
+
+
+### Bug Fixes
+
+* use http1 for ms access ([#251](https://github.com/adobe/helix-onedrive-support/issues/251)) ([c91a629](https://github.com/adobe/helix-onedrive-support/commit/c91a629fa8c18c0dcdb2a0d21a225de940db05ea)), closes [#250](https://github.com/adobe/helix-onedrive-support/issues/250)
+
+# [6.2.0](https://github.com/adobe/helix-onedrive-support/compare/v6.1.5...v6.2.0) (2022-03-01)
+
+
+### Features
+
+* allow to set authentication resource ([#246](https://github.com/adobe/helix-onedrive-support/issues/246)) ([21d7445](https://github.com/adobe/helix-onedrive-support/commit/21d7445736bfe7452b710187cc81e71b37df8542))
+
 ## [6.1.5](https://github.com/adobe/helix-onedrive-support/compare/v6.1.4...v6.1.5) (2022-02-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-onedrive-support",
-  "version": "6.1.5",
+  "version": "6.2.2",
   "description": "Helix OneDrive Support",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/adobe/helix-onedrive-support#readme",
   "dependencies": {
-    "@adobe/helix-fetch": "3.0.6",
+    "@adobe/helix-fetch": "3.0.7",
     "adal-node": "https://github.com/adobe-rnd/azure-activedirectory-library-for-nodejs.git#adobe"
   },
   "devDependencies": {
@@ -35,13 +35,13 @@
     "commitizen": "4.2.4",
     "cz-conventional-changelog": "3.3.0",
     "dotenv": "16.0.0",
-    "eslint": "8.10.0",
+    "eslint": "8.11.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.25.4",
     "jsdoc-to-markdown": "7.1.1",
     "junit-report-builder": "3.0.0",
-    "lint-staged": "12.3.4",
-    "mocha": "9.2.1",
+    "lint-staged": "12.3.7",
+    "mocha": "9.2.2",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.2.4",
     "nyc": "15.1.0",

package/src/OneDrive.js

@@ -14,7 +14,7 @@
 const EventEmitter = require('events');
 const { promisify } = require('util');
 const { AuthenticationContext, MemoryCache } = require('adal-node');
-const fetchAPI = require('@adobe/helix-fetch');
+const { fetch, reset } = require('@adobe/helix-fetch').keepAliveNoCache({ userAgent: 'helix-fetch' });
 
 const Workbook = require('./Workbook.js');
 const StatusCodeError = require('./StatusCodeError.js');
@@ -22,16 +22,8 @@ const { driveItemFromURL, driveItemToURL } = require('./utils.js');
 const { splitByExtension, sanitize, editDistance } = require('./fuzzy-helper.js');
 const SharePointSite = require('./SharePointSite.js');
 
-const { fetch, reset } = process.env.HELIX_FETCH_FORCE_HTTP1
-  ? fetchAPI.context({
-    alpnProtocols: [fetchAPI.ALPN_HTTP1_1],
-    userAgent: 'helix-fetch', // static user agent for test recordings
-  })
-  /* istanbul ignore next */
-  : fetchAPI;
-
 const AZ_AUTHORITY_HOST_URL = 'https://login.windows.net';
-const AZ_RESOURCE = 'https://graph.microsoft.com'; // '00000002-0000-0000-c000-000000000000'; ??
+const AZ_DEFAULT_RESOURCE = 'https://graph.microsoft.com'; // '00000002-0000-0000-c000-000000000000'; ??
 const AZ_DEFAULT_TENANT = 'common';
 
 /**
@@ -65,6 +57,7 @@ class OneDrive extends EventEmitter {
    * @param {number}  [opts.expiresOn] Expiration time.
    * @param {Logger}  [opts.log] A logger.
    * @param {boolean} [opts.localAuthCache] Whether to use local auth cache
+   * @param {string}  [opts.resource] Azure resource to authenticate against. defaults to MS Graph.
    */
   constructor(opts) {
     super(opts);
@@ -75,6 +68,7 @@ class OneDrive extends EventEmitter {
     this.password = opts.password || '';
     this._log = opts.log || console;
     this.tenant = opts.tenant || AZ_DEFAULT_TENANT;
+    this.resource = opts.resource || AZ_DEFAULT_RESOURCE;
 
     if (!opts.noShareLinkCache && !process.env.HELIX_ONEDRIVE_NO_SHARE_LINK_CACHE) {
       this.shareLinkCache = opts.shareLinkCache || globalShareLinkCache;
@@ -168,7 +162,7 @@ class OneDrive extends EventEmitter {
 
     let code;
     try {
-      code = await context.acquireUserCode(AZ_RESOURCE, this.clientId, 'en');
+      code = await context.acquireUserCode(this.resource, this.clientId, 'en');
     } catch (e) {
       log.error('Error while requesting user code', e);
       throw e;
@@ -180,7 +174,7 @@ class OneDrive extends EventEmitter {
     }
 
     try {
-      return await context.acquireTokenWithDeviceCode(AZ_RESOURCE, this.clientId, code);
+      return await context.acquireTokenWithDeviceCode(this.resource, this.clientId, code);
     } catch (e) {
       log.error('Error while requesting access token with device code', e);
       throw e;
@@ -192,7 +186,7 @@ class OneDrive extends EventEmitter {
   async getAccessToken() {
     const { log, authContext: context } = this;
     try {
-      return await context.acquireToken(AZ_RESOURCE, this.username, this.clientId);
+      return await context.acquireToken(this.resource, this.username, this.clientId);
     } catch (e) {
       if (e.message !== 'Entry not found in cache.') {
         log.warn(`Unable to acquire token from cache: ${e}`);
@@ -208,13 +202,13 @@ class OneDrive extends EventEmitter {
           this.refreshToken,
           this.clientId,
           this.clientSecret,
-          AZ_RESOURCE,
+          this.resource,
         );
         return await this.augmentAndCacheResponse(resp);
       } else if (this.username && this.password) {
         log.debug('acquire token with ROPC.');
         return await context.acquireTokenWithUsernamePassword(
-          AZ_RESOURCE,
+          this.resource,
           this.username,
           this.password,
           this.clientId,
@@ -222,7 +216,7 @@ class OneDrive extends EventEmitter {
       } else if (this.clientSecret) {
         log.debug('acquire token with client credentials.');
         return await context.acquireTokenWithClientCredentials(
-          AZ_RESOURCE,
+          this.resource,
           this.clientId,
           this.clientSecret,
         );
@@ -240,7 +234,7 @@ class OneDrive extends EventEmitter {
   /**
    */
   createLoginUrl(redirectUri, state) {
-    return `${this.authorityUrl}/oauth2/authorize?response_type=code&scope=/.default&client_id=${this.clientId}&redirect_uri=${redirectUri}&state=${state}&resource=${AZ_RESOURCE}`;
+    return `${this.authorityUrl}/oauth2/authorize?response_type=code&scope=/.default&client_id=${this.clientId}&redirect_uri=${redirectUri}&state=${state}&resource=${this.resource}`;
   }
 
   async augmentAndCacheResponse(response) {
@@ -270,7 +264,7 @@ class OneDrive extends EventEmitter {
       const resp = await context.acquireTokenWithAuthorizationCode(
         code,
         redirectUri,
-        AZ_RESOURCE,
+        this.resource,
         this.clientId,
         this.clientSecret,
       );

package/src/SharePointSite.js

@@ -10,18 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-const fetchAPI = require('@adobe/helix-fetch');
+const { fetch } = require('@adobe/helix-fetch').keepAliveNoCache({ userAgent: 'helix-fetch' });
 const StatusCodeError = require('./StatusCodeError.js');
 
-/* istanbul ignore next */
-const { fetch } = process.env.HELIX_FETCH_FORCE_HTTP1
-  ? fetchAPI.context({
-    alpnProtocols: [fetchAPI.ALPN_HTTP1_1],
-    userAgent: 'helix-fetch', // static user agent for test recordings
-  })
-  /* istanbul ignore next */
-  : fetchAPI;
-
 /**
  * Helper class accessing folders and files using the SharePoint V1 API.
  */