@adobe/helix-onedrive-support 5.0.1 → 5.1.1

package/.circleci/config.yml

@@ -1,8 +1,8 @@
 version: 2.1
 executors:
-  node12:
+  :
     docker:
-      - image: circleci/node:12
+      - image: circleci/node:14
     environment:
       NPM_CONFIG_PREFIX: ~/.npm-global
 
@@ -29,7 +29,7 @@ commands:
 
 jobs:
   build:
-    executor: node12
+    executor: node14
 
     steps:
       - setup

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

@@ -10,10 +10,10 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v2
         with:
-          node-version: '12.x'
+          node-version: '14.x'
       - run: npm install
       - run: npm test
       - run: npm run semantic-release

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [5.1.1](https://github.com/adobe/helix-onedrive-support/compare/v5.1.0...v5.1.1) (2021-09-22)
+
+
+### Bug Fixes
+
+* better error report ([#191](https://github.com/adobe/helix-onedrive-support/issues/191)) ([a63bb4f](https://github.com/adobe/helix-onedrive-support/commit/a63bb4f2819d7764885a5a1ad99923ba172f6d93)), closes [#190](https://github.com/adobe/helix-onedrive-support/issues/190)
+
+# [5.1.0](https://github.com/adobe/helix-onedrive-support/compare/v5.0.3...v5.1.0) (2021-08-31)
+
+
+### Features
+
+* add option to disable share link cache (for testing) ([#186](https://github.com/adobe/helix-onedrive-support/issues/186)) ([a8e6af2](https://github.com/adobe/helix-onedrive-support/commit/a8e6af229f70014e12772e4a2c19d657ba68fdde))
+
+## [5.0.3](https://github.com/adobe/helix-onedrive-support/compare/v5.0.2...v5.0.3) (2021-08-18)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-fetch to v2.4.2 ([#182](https://github.com/adobe/helix-onedrive-support/issues/182)) ([485fba1](https://github.com/adobe/helix-onedrive-support/commit/485fba1e0ecf5a660a14e4bd0448f752346d4b7b))
+
+## [5.0.2](https://github.com/adobe/helix-onedrive-support/compare/v5.0.1...v5.0.2) (2021-07-30)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-fetch to v2.4.1 ([#177](https://github.com/adobe/helix-onedrive-support/issues/177)) ([0317917](https://github.com/adobe/helix-onedrive-support/commit/031791711665fd1beac391a94dba3145c48d90ca))
+
 ## [5.0.1](https://github.com/adobe/helix-onedrive-support/compare/v5.0.0...v5.0.1) (2021-06-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-onedrive-support",
-  "version": "5.0.1",
+  "version": "5.1.1",
   "description": "Helix OneDrive Support",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -23,28 +23,28 @@
   },
   "homepage": "https://github.com/adobe/helix-onedrive-support#readme",
   "dependencies": {
-    "@adobe/helix-fetch": "2.3.0",
+    "@adobe/helix-fetch": "2.4.2",
     "adal-node": "https://github.com/adobe-rnd/azure-activedirectory-library-for-nodejs.git#adobe"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.1.5",
-    "@semantic-release/changelog": "5.0.1",
-    "@semantic-release/git": "9.0.0",
-    "ajv": "8.5.0",
-    "codecov": "3.8.2",
+    "@semantic-release/changelog": "6.0.0",
+    "@semantic-release/git": "10.0.0",
+    "ajv": "8.6.3",
+    "codecov": "3.8.3",
     "commitizen": "4.2.4",
     "cz-conventional-changelog": "3.3.0",
     "dotenv": "10.0.0",
-    "eslint": "7.28.0",
+    "eslint": "7.32.0",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.23.4",
+    "eslint-plugin-import": "2.24.2",
     "jsdoc-to-markdown": "7.0.1",
     "junit-report-builder": "3.0.0",
-    "lint-staged": "11.0.0",
-    "mocha": "9.0.0",
-    "nock": "13.1.0",
+    "lint-staged": "11.1.2",
+    "mocha": "9.1.1",
+    "nock": "13.1.3",
     "nyc": "15.1.0",
-    "semantic-release": "17.4.3"
+    "semantic-release": "18.0.0"
   },
   "lint-staged": {
     "*.js": "eslint"

package/src/OneDrive.d.ts

@@ -27,6 +27,23 @@ export declare interface OneDriveOptions {
   tenant?: string;
   username?: string;
   password?: string;
+
+  /**
+   * Uses a local auth cache for access tokens.
+   */
+  localAuthCache?: boolean,
+
+  /**
+   * Disables the cache for the share link lookup.
+   * @default process.env.HELIX_ONEDRIVE_NO_SHARE_LINK_CACHE
+   */
+  noShareLinkCache?: boolean;
+
+  /**
+   * Map to use for the share link lookup cache. If empty, a module-global cache will be used.
+   * Note that the cache is only used, if the `noShareLinkCache` flag is `falsy`
+   */
+  shareLinkCache?: Map<string, DriveItem>,
 }
 
 export declare interface GraphResult {
@@ -120,8 +137,8 @@ export declare class OneDrive extends EventEmitter {
 
   acquireToken(redirectUri: string, code: string): Promise<TokenResponse>;
 
-  dispose() : Promise;
-  
+  dispose() : Promise<void>;
+
   doFetch(relUrl: string, rawResponseBody: boolean = false, options: object = {}): Promise<object|Buffer>
 
   me(): Promise<GraphResult>;

package/src/OneDrive.js

@@ -47,7 +47,7 @@ const MAX_SUBSCRIPTION_EXPIRATION_TIME = 4230 * 60 * 1000;
  * @type {Map<string, *>}
  * @private
  */
-const shareItemCache = new Map();
+const globalShareLinkCache = new Map();
 
 /**
  * Helper class that facilitates accessing one drive.
@@ -75,6 +75,10 @@ class OneDrive extends EventEmitter {
     this._log = opts.log || console;
     this.tenant = opts.tenant || AZ_DEFAULT_TENANT;
 
+    if (!opts.noShareLinkCache && !process.env.HELIX_ONEDRIVE_NO_SHARE_LINK_CACHE) {
+      this.shareLinkCache = opts.shareLinkCache || globalShareLinkCache;
+    }
+
     if (!this.clientId) {
       throw new Error('Missing clientId.');
     }
@@ -288,7 +292,7 @@ class OneDrive extends EventEmitter {
         if (err.statusCode === 404) {
           this.log.warn(`${relUrl} : ${err.statusCode} - ${err.message}`);
         } else {
-          this.log.error(`${relUrl} : ${err.statusCode} - ${err.message} - ${err.details}`);
+          this.log.error(`${relUrl} : ${err.statusCode} - ${err.message}`, err.details);
         }
         throw err;
       }
@@ -349,10 +353,14 @@ class OneDrive extends EventEmitter {
     if (driveItem) {
       return driveItem;
     }
-    driveItem = shareItemCache.get(sharingUrl);
+    if (this.shareLinkCache) {
+      driveItem = this.shareLinkCache.get(sharingUrl);
+    }
     if (!driveItem) {
       driveItem = await this.resolveShareLink(sharingUrl);
-      shareItemCache.set(sharingUrl, driveItem);
+      if (this.shareLinkCache) {
+        this.shareLinkCache.set(sharingUrl, driveItem);
+      }
     }
     return driveItem;
   }

package/src/StatusCodeError.js

@@ -43,6 +43,10 @@ class StatusCodeError extends Error {
    * @returns {StatusCodeError} status code error
    */
   static fromErrorResponse(errorBody, statusCode) {
+    if (errorBody.error && errorBody.error.message) {
+      // eslint-disable-next-line no-param-reassign
+      errorBody = errorBody.error;
+    }
     return new StatusCodeError(errorBody.message, statusCode, errorBody);
   }