@adobe/helix-onedrive-support 10.2.2 → 10.3.0

package/.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 executors:
   node18:
     docker:
-      - image: cimg/node:18.16
+      - image: cimg/node:18.17
 
 orbs:
   codecov: codecov/codecov@3.2.5

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [10.3.0](https://github.com/adobe/helix-onedrive-support/compare/v10.2.2...v10.3.0) (2023-07-24)
+
+
+### Features
+
+* cacheplugin can suggest auth via client credentials ([#411](https://github.com/adobe/helix-onedrive-support/issues/411)) ([bd1d02a](https://github.com/adobe/helix-onedrive-support/commit/bd1d02a99550262a26caf1a0a34de555482401a3))
+
 ## [10.2.2](https://github.com/adobe/helix-onedrive-support/compare/v10.2.1...v10.2.2) (2023-07-16)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-onedrive-support",
-  "version": "10.2.2",
+  "version": "10.3.0",
   "description": "Helix OneDrive Support",
   "main": "src/index.js",
   "exports": {
@@ -28,7 +28,7 @@
   "homepage": "https://github.com/adobe/helix-onedrive-support#readme",
   "dependencies": {
     "@adobe/fetch": "4.0.13",
-    "@adobe/helix-shared-tokencache": "1.2.10",
+    "@adobe/helix-shared-tokencache": "1.3.0",
     "@azure/msal-node": "1.18.0",
     "jose": "4.14.4"
   },
@@ -36,7 +36,7 @@
     "@adobe/eslint-config-helix": "2.0.2",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@aws-sdk/client-s3": "3.370.0",
+    "@aws-sdk/client-s3": "3.374.0",
     "ajv": "8.12.0",
     "c8": "8.0.0",
     "codecov": "3.8.3",
@@ -53,7 +53,7 @@
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.3.2",
-    "npm": "9.8.0",
+    "npm": "9.8.1",
     "semantic-release": "21.0.7"
   },
   "lint-staged": {

package/src/OneDriveAuth.d.ts

@@ -9,7 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {AuthenticationResult, ClientApplication, ICachePlugin} from "@azure/msal-node";
+import {AuthenticationResult, ClientApplication } from "@azure/msal-node";
+import { CachePlugin } from "@adobe/helix-shared-tokencache";
 
 export enum AcquireMethod {
   BY_CLIENT_CREDENTIAL = 'byClientCredential',
@@ -30,7 +31,7 @@ export declare interface OneDriveAuthOptions {
   /**
    * use cache plugin instead for default (global) token cache.
    */
-  cachePlugin?: ICachePlugin,
+  cachePlugin?: CachePlugin,
 
   /**
    * Disables the cache for the tenant lookup.

package/src/OneDriveAuth.js

@@ -82,7 +82,7 @@ export class OneDriveAuth {
       throw new Error(`Authentication method unknown: ${this.acquireMethod}, should be none or one of: ${validAcquireMethods}`);
     }
     if (this.acquireMethod === AcquireMethod.BY_DEVICE_CODE && !this.onCode) {
-      throw new Error(`Authontication method ${AcquireMethod.BY_DEVICE_CODE} requires 'onCode' parameter`);
+      throw new Error(`Authentication method ${AcquireMethod.BY_DEVICE_CODE} requires 'onCode' parameter`);
     }
     if (!this.acquireMethod && this.onCode) {
       this.acquireMethod = AcquireMethod.BY_DEVICE_CODE;
@@ -133,7 +133,7 @@ export class OneDriveAuth {
           cachePlugin,
         };
       }
-      this._app = this.onCode
+      this._app = this.acquireMethod === AcquireMethod.BY_DEVICE_CODE
         ? new PublicClientApplication(msalConfig)
         : new ConfidentialClientApplication(msalConfig);
     }
@@ -328,7 +328,9 @@ export class OneDriveAuth {
           scopes: this.scopes,
         });
       }
-      if (this.acquireMethod === AcquireMethod.BY_CLIENT_CREDENTIAL) {
+      if (this.acquireMethod === AcquireMethod.BY_CLIENT_CREDENTIAL
+          // check if plugin wants us to use client credentials
+          || (await this.cachePlugin.getPluginMetadata() || {}).useClientCredentials) {
         log.debug('acquire token with client credentials.');
         return await app.acquireTokenByClientCredential({
           scopes: this.scopes,