@adobe/helix-onedrive-support 10.0.0 → 10.0.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [10.0.1](https://github.com/adobe/helix-onedrive-support/compare/v10.0.0...v10.0.1) (2023-05-03)
+
+
+### Bug Fixes
+
+* provide username and location in error message ([#374](https://github.com/adobe/helix-onedrive-support/issues/374)) ([a50819d](https://github.com/adobe/helix-onedrive-support/commit/a50819d2520391ee43cc6954123680cfe1b47a21))
+
 # [10.0.0](https://github.com/adobe/helix-onedrive-support/compare/v9.1.32...v10.0.0) (2023-05-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-onedrive-support",
-  "version": "10.0.0",
+  "version": "10.0.1",
   "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.10",
-    "@adobe/helix-shared-tokencache": "1.0.0",
+    "@adobe/helix-shared-tokencache": "1.1.0",
     "@aws-sdk/client-s3": "3.321.1",
     "@azure/msal-node": "1.17.1",
     "jose": "4.14.3"

package/src/OneDriveAuth.js

@@ -265,6 +265,13 @@ export class OneDriveAuth {
     return this;
   }
 
+  handleAcquireError(account, e, forced = false) {
+    const { log } = this;
+    const msg = `Error while reacquiring token from cache${forced ? ' (forced)' : ''}.`;
+
+    log.warn(`${msg}\nUsername: ${account.username}\nAuth-Location: ${this.cachePlugin.location}\nMessage: ${e.message}`);
+  }
+
   /**
    * Authenticates against MS
    * @param {boolean} silentOnly
@@ -275,23 +282,24 @@ export class OneDriveAuth {
 
     const accounts = await app.getTokenCache().getAllAccounts();
     if (accounts.length > 0) {
+      const account = accounts[0];
+
       try {
-        return await app.acquireTokenSilent({
-          account: accounts[0],
-        });
+        return await app.acquireTokenSilent({ account });
       } catch (e) {
-        log.warn('Error while reacquiring token from cache', e);
+        this.handleAcquireError(account, e);
       }
+
       // try again with fresh mem cache
       if (this.cachePlugin instanceof MemCachePlugin) {
         this.cachePlugin.clear();
         try {
           return await app.acquireTokenSilent({
             forceRefresh: true,
-            account: accounts[0],
+            account,
           });
         } catch (e) {
-          log.warn('Error while reacquiring token from cache (forced)', e);
+          this.handleAcquireError(account, e, true);
         }
       }
     }
@@ -316,7 +324,7 @@ export class OneDriveAuth {
         });
       }
     } catch (e) {
-      log.error('Error while acquiring access token', e);
+      log.error(`Error while acquiring access token (${this.acquireMethod}).\nMessage: ${e.message}`);
       throw e;
     }