@adobe/helix-onedrive-support 8.0.10 → 8.1.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [8.1.0](https://github.com/adobe/helix-onedrive-support/compare/v8.0.12...v8.1.0) (2022-07-05)
+
+
+### Features
+
+* add initTenantFromMountPoint() ([#284](https://github.com/adobe/helix-onedrive-support/issues/284)) ([1f1861a](https://github.com/adobe/helix-onedrive-support/commit/1f1861ae28fe8edfbbb644b0190165f62e2e0b1e))
+
+## [8.0.12](https://github.com/adobe/helix-onedrive-support/compare/v8.0.11...v8.0.12) (2022-07-02)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#283](https://github.com/adobe/helix-onedrive-support/issues/283)) ([3494470](https://github.com/adobe/helix-onedrive-support/commit/3494470054f45b0e8085a07b2047e97058d99045))
+
+## [8.0.11](https://github.com/adobe/helix-onedrive-support/compare/v8.0.10...v8.0.11) (2022-06-29)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-fetch to v3.1.1 ([622df8a](https://github.com/adobe/helix-onedrive-support/commit/622df8ac01e819d4a45653ccb320677ef8053254))
+
 ## [8.0.10](https://github.com/adobe/helix-onedrive-support/compare/v8.0.9...v8.0.10) (2022-06-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-onedrive-support",
-  "version": "8.0.10",
+  "version": "8.1.0",
   "description": "Helix OneDrive Support",
   "main": "src/index.js",
   "exports": {
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/adobe/helix-onedrive-support#readme",
   "dependencies": {
-    "@adobe/helix-fetch": "3.1.0",
-    "@aws-sdk/client-s3": "3.118.0",
+    "@adobe/helix-fetch": "3.1.1",
+    "@aws-sdk/client-s3": "3.121.0",
     "@azure/msal-node": "1.10.0",
-    "jose": "4.8.1"
+    "jose": "4.8.3"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.2",
@@ -41,7 +41,7 @@
     "c8": "7.11.3",
     "codecov": "3.8.3",
     "dotenv": "16.0.1",
-    "eslint": "8.18.0",
+    "eslint": "8.19.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.26.0",
     "husky": "8.0.1",
@@ -52,8 +52,8 @@
     "lint-staged": "13.0.3",
     "mocha": "10.0.0",
     "mocha-multi-reporters": "1.5.1",
-    "nock": "13.2.7",
-    "npm": "8.13.1",
+    "nock": "13.2.8",
+    "npm": "8.13.2",
     "semantic-release": "19.0.3"
   },
   "lint-staged": {

package/src/OneDriveAuth.d.ts

@@ -38,6 +38,14 @@ export declare interface OneDriveAuthOptions {
   tenantCache?: Map<string, string>;
 }
 
+/**
+ * Helix config mount point
+ */
+declare interface MountPoint {
+  url: string;
+  tenantId?: string;
+}
+
 /**
  * Helper class that facilitates authentication for one drive.
  */
@@ -92,7 +100,22 @@ export declare class OneDriveAuth {
    */
   authenticate(silentOnly: boolean): Promise<AuthenticationResult>;
 
+  /**
+   * Disposes allocated resources.
+   */
   dispose() : Promise<void>;
 
-  initTenantFromUrl(sharingUrl: string|URL): Promise<void>;
+  /**
+   * Initializes the tenant from the url by requesting the required information from microsoft.
+   * @param {string|URL} sharingUrl
+   * @returns {string} the tenant id
+   */
+  initTenantFromUrl(sharingUrl: string|URL): Promise<string>;
+
+  /**
+   * Initializes the tenant either with the `tenantId` of the mount point or via the share url.
+   * @param {MountPoint} mp
+   * @returns {string} the tenant id
+   */
+  initTenantFromMountPoint(mp: MountPoint): Promise<string>;
 }

package/src/OneDriveAuth.js

@@ -151,7 +151,7 @@ export class OneDriveAuth {
 
   async initTenantFromUrl(sharingUrl) {
     if (this.tenant) {
-      return;
+      return this.tenant;
     }
     const { log } = this;
     const tenantHost = OneDriveAuth.getTenantHostFromUrl(sharingUrl);
@@ -166,6 +166,20 @@ export class OneDriveAuth {
       }
     }
     log.info(`using tenant ${this.tenant} for ${tenantHost} from ${sharingUrl}`);
+    return this.tenant;
+  }
+
+  async initTenantFromMountPoint(mp) {
+    const { log } = this;
+    if (this.tenant) {
+      return this.tenant;
+    }
+    if (mp.tenantId) {
+      this.tenant = mp.tenantId;
+      log.info(`using tenant ${this.tenant} from fstab.`);
+      return this.tenant;
+    }
+    return this.initTenantFromUrl(mp.url);
   }
 
   /**