@ms-cloudpack/remote-cache 0.7.4 → 0.7.6

package/dist/{getCredential-ONYVRAN5.js → getCredential-MVHPI27L.js}

@@ -2349,9 +2349,9 @@ var require_package2 = __commonJS({
   }
 });
 
-// ../../node_modules/.store/debug-virtual-1d970e8425/package/src/common.js
+// ../../node_modules/.store/debug-virtual-11377b508d/package/src/common.js
 var require_common = __commonJS({
-  "../../node_modules/.store/debug-virtual-1d970e8425/package/src/common.js"(exports, module) {
+  "../../node_modules/.store/debug-virtual-11377b508d/package/src/common.js"(exports, module) {
     function setup(env) {
       createDebug.debug = createDebug;
       createDebug.default = createDebug;
@@ -2523,9 +2523,9 @@ var require_common = __commonJS({
   }
 });
 
-// ../../node_modules/.store/debug-virtual-1d970e8425/package/src/browser.js
+// ../../node_modules/.store/debug-virtual-11377b508d/package/src/browser.js
 var require_browser = __commonJS({
-  "../../node_modules/.store/debug-virtual-1d970e8425/package/src/browser.js"(exports, module) {
+  "../../node_modules/.store/debug-virtual-11377b508d/package/src/browser.js"(exports, module) {
     exports.formatArgs = formatArgs;
     exports.save = save;
     exports.load = load;
@@ -2697,9 +2697,9 @@ var require_browser = __commonJS({
   }
 });
 
-// ../../node_modules/.store/debug-virtual-1d970e8425/package/src/node.js
+// ../../node_modules/.store/debug-virtual-11377b508d/package/src/node.js
 var require_node = __commonJS({
-  "../../node_modules/.store/debug-virtual-1d970e8425/package/src/node.js"(exports, module) {
+  "../../node_modules/.store/debug-virtual-11377b508d/package/src/node.js"(exports, module) {
     var tty = __require("tty");
     var util = __require("util");
     exports.init = init;
@@ -2878,9 +2878,9 @@ var require_node = __commonJS({
   }
 });
 
-// ../../node_modules/.store/debug-virtual-1d970e8425/package/src/index.js
+// ../../node_modules/.store/debug-virtual-11377b508d/package/src/index.js
 var require_src = __commonJS({
-  "../../node_modules/.store/debug-virtual-1d970e8425/package/src/index.js"(exports, module) {
+  "../../node_modules/.store/debug-virtual-11377b508d/package/src/index.js"(exports, module) {
     if (typeof process === "undefined" || process.type === "renderer" || process.browser === true || process.__nwjs) {
       module.exports = require_browser();
     } else {
@@ -25501,6 +25501,7 @@ To work with multiple accounts for the same Client ID and Tenant ID, please prov
         try {
           const interactiveRequest = {
             openBrowser: async (url) => {
+              this.logger.verbose(`Opening browser to ${url}`);
               await interactiveBrowserMockable.open(url, { wait: true, newInstance: true });
             },
             scopes,
@@ -26297,10 +26298,19 @@ function getCredentialInternal(loginMethod, authenticationRecord, tenantId) {
   }
 }
 __name(getCredentialInternal, "getCredentialInternal");
-async function getCredential(loginMethod, cachePath, tenantId) {
+async function getCredential(options, context) {
+  var _a;
+  const { loginMethod, cachePath, tenantId } = options;
+  const { reporter, azureLogger, telemetryClient } = context;
   if (loginMethod == "azure-cli") {
     return new import_identity3.AzureCliCredential();
   }
+  const tasks = {};
+  azureLogger.once("MsalBrowserOpen", (url) => {
+    tasks.interactiveAuthentication = reporter.addTask(
+      `Prepare to sign in \u2013 we are launching a browser page for you. Simply follow the instructions on the login page to seamlessly complete the authentication process. You can manually access the login page by navigating to the folliwing url if you inadvertently close the authentication page or prefer to use a different web browser or a profile. ${url}`
+    );
+  });
   (0, import_identity3.useIdentityPlugin)(import_identity_cache_persistence.cachePersistencePlugin);
   const credential = getCredentialInternal(loginMethod, getAuthenticationRecord(cachePath), tenantId);
   tryCleaningLockFile();
@@ -26313,6 +26323,13 @@ async function getCredential(loginMethod, cachePath, tenantId) {
   if (authenticationRecord) {
     saveAuthenticationRecord(cachePath, authenticationRecord);
   }
+  (_a = tasks.interactiveAuthentication) == null ? void 0 : _a.complete({
+    message: "You have successfully signed in."
+  });
+  telemetryClient.rootSpan.addEvent("SYNC_AUTH", {
+    loginMethod,
+    browserActionRequired: !!tasks.interactiveAuthentication
+  });
   return storageCustomCredential;
 }
 __name(getCredential, "getCredential");

package/dist/index.js

@@ -10,16 +10,18 @@ import {
 } from "./chunk-B4GP6UPK.js";
 
 // src/registerAzureLogger.ts
+import EventEmitter from "events";
 var logger = require_commonjs();
 function registerAzureLogger() {
+  const emitter = new EventEmitter();
   logger.setLogLevel("verbose");
-  logger.AzureLogger.log = (...msgs) => {
-    if (msgs[0] === "azure:identity:info Node.js MSAL Open Browser =>" && msgs[1].includes("falling back to interactive method")) {
-      console.warn(
-        "Prepare to sign in \u2013 we are launching a browser page for you. Simply follow the instructions on the login page to seamlessly complete the authentication process. You can manually access the login page by navigating to http://localhost:1337 if you inadvertently close the authentication page or prefer to use a different web browser or a profile."
-      );
+  logger.AzureLogger.log = (...messages) => {
+    if (messages[0] === "azure:identity:verbose Node.js MSAL Open Browser =>" && messages[1].includes("Opening browser")) {
+      const url = messages[1].split(" ")[3];
+      emitter.emit("MsalBrowserOpen", url);
     }
   };
+  return emitter;
 }
 __name(registerAzureLogger, "registerAzureLogger");
 
@@ -90,14 +92,17 @@ var blockListIsInvalidRetryPolicy = {
 // src/createRemoteCacheClient.ts
 import { RetryManager } from "@ms-cloudpack/retry";
 async function createRemoteCacheClient(params) {
-  registerAzureLogger();
+  const azureLogEventHandler = registerAzureLogger();
   const { context, options } = params;
   const { container, loginMethod, storageAccount, cachePath, tenantId } = options;
-  const { getCredential } = await import("./getCredential-ONYVRAN5.js");
+  const { getCredential } = await import("./getCredential-MVHPI27L.js");
   const { AzureRemoteCacheClient } = await import("./AzureRemoteCacheClient-ZZ27K4AF.js");
   const { ReporterDecorator } = await import("./ReporterDecorator-I4CR7TWD.js");
   const { getListOfBlobs } = await import("./getListOfBlobs-YTVBR3IU.js");
-  const credential = await getCredential(loginMethod, cachePath, tenantId);
+  const credential = await getCredential(
+    { loginMethod, cachePath, tenantId },
+    { ...context, azureLogger: azureLogEventHandler }
+  );
   const remoteCacheClientOptions = {
     storageAccount,
     container,

package/lib/authentication/getCredential.d.ts

@@ -1,10 +1,22 @@
+/// <reference types="node" resolution-mode="require"/>
 import { type TokenCredential } from '@azure/identity';
 import type { LoginMethod } from '../types/LoginMethod.js';
+import type { TaskReporter } from '@ms-cloudpack/task-reporter';
+import type EventEmitter from 'events';
+import type { TelemetryClient } from '@ms-cloudpack/telemetry';
 /**
  * Gets a credential for the given login method.
  * If the login method is 'azure-cli', it will return an AzureCliCredential.
  * Otherwise, it will return an InteractiveBrowserCredential or a DeviceCodeCredential with persistent token settings.
  * If an authentication record has never been saved before, it will authenticate the credential and save the authentication record.
  */
-export declare function getCredential(loginMethod: LoginMethod, cachePath: string, tenantId?: string): Promise<TokenCredential>;
+export declare function getCredential(options: {
+    loginMethod: LoginMethod;
+    cachePath: string;
+    tenantId?: string;
+}, context: {
+    reporter: TaskReporter;
+    azureLogger: EventEmitter;
+    telemetryClient: TelemetryClient;
+}): Promise<TokenCredential>;
 //# sourceMappingURL=getCredential.d.ts.map

package/lib/registerAzureLogger.d.ts

@@ -1,5 +1,7 @@
+/// <reference types="node" resolution-mode="require"/>
+import EventEmitter from 'events';
 /**
- * Registers a custom logger for the Azure SDK that logs only the necessary information.
+ * Registers a custom logger for the Azure SDK that emits events for some specific log messages.
  */
-export declare function registerAzureLogger(): void;
+export declare function registerAzureLogger(): EventEmitter<[never]>;
 //# sourceMappingURL=registerAzureLogger.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/remote-cache",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "description": "Manages syncing the local Cloudpack cached assets to/from a remote storage service.",
   "license": "MIT",
   "type": "module",
@@ -29,7 +29,7 @@
   "dependencies": {
     "@azure/msal-node-extensions": "^1.0.10",
     "@ms-cloudpack/retry": "^0.1.1",
-    "@ms-cloudpack/task-reporter": "^0.14.0",
+    "@ms-cloudpack/task-reporter": "^0.14.1",
     "@ms-cloudpack/telemetry": "^0.5.2"
   },
   "devDependencies": {