@ms-cloudpack/remote-cache 0.6.2 → 0.6.4

package/dist/{getCredential-QMMPE77Q.js → getCredential-DHB4UIE2.js}

@@ -24221,52 +24221,47 @@ var tokenCachePersistenceOptions = {
   enabled: true,
   name: "cloudpack"
 };
-function getCredentialInternal(loginMethod, authenticationRecord) {
+function getCredentialInternal(loginMethod, authenticationRecord, tenantId) {
   switch (loginMethod) {
     case "interactive":
       return new import_identity3.InteractiveBrowserCredential({
         redirectUri: "http://localhost:1337",
         authenticationRecord,
-        tokenCachePersistenceOptions
+        tokenCachePersistenceOptions,
+        tenantId
       });
     case "device-code":
       return new import_identity3.DeviceCodeCredential({
         authenticationRecord,
-        tokenCachePersistenceOptions
+        tokenCachePersistenceOptions,
+        tenantId
       });
     default:
       throw new Error(`Invalid login method: ${loginMethod}`);
   }
 }
 __name(getCredentialInternal, "getCredentialInternal");
-async function getCredential(loginMethod, cachePath) {
+async function getCredential(loginMethod, cachePath, tenantId) {
   if (loginMethod == "azure-cli") {
     return new import_identity3.AzureCliCredential();
   }
   (0, import_identity3.useIdentityPlugin)(import_identity_cache_persistence.cachePersistencePlugin);
-  let authenticationRecord = getAuthenticationRecord(cachePath);
-  const credential = getCredentialInternal(loginMethod, authenticationRecord);
-  if (!authenticationRecord) {
-    console.warn("Cloudpack requires authentication to access Azure resources.");
-    if (loginMethod == "interactive") {
-      console.warn(
-        "Prepare to sign in \u2013 we're launching a browser page for you. Simply follow the instructions on the login page to seamlessly complete the authentication process."
-      );
-    }
-    const storageScope = "https://storage.azure.com/.default";
-    authenticationRecord = await credential.authenticate(storageScope);
-    const token = await credential.getToken(storageScope);
-    const storageCustomCredential = {
-      getToken: async () => {
-        return Promise.resolve(token);
-      }
-    };
-    if (authenticationRecord) {
-      saveAuthenticationRecord(cachePath, authenticationRecord);
-    }
-    return storageCustomCredential;
+  const credential = getCredentialInternal(loginMethod, getAuthenticationRecord(cachePath), tenantId);
+  if (loginMethod == "interactive") {
+    console.warn(
+      "Prepare to sign in \u2013 we may launch a browser page for you. Simply follow the instructions on the login page to seamlessly complete the authentication process."
+    );
+  }
+  const storageScope = "https://storage.azure.com/.default";
+  const authenticationRecord = await credential.authenticate(storageScope);
+  const token = await credential.getToken(storageScope);
+  const storageCustomCredential = {
+    getToken: () => Promise.resolve(token)
+  };
+  if (authenticationRecord) {
+    saveAuthenticationRecord(cachePath, authenticationRecord);
   }
-  return credential;
+  return storageCustomCredential;
 }
 __name(getCredential, "getCredential");
 export {

package/dist/index.js

@@ -80,12 +80,12 @@ var blockListIsInvalidRetryPolicy = {
 import { RetryManager } from "@ms-cloudpack/retry";
 async function createRemoteCacheClient(params) {
   const { context, options } = params;
-  const { container, loginMethod, storageAccount, cachePath } = options;
-  const { getCredential } = await import("./getCredential-QMMPE77Q.js");
+  const { container, loginMethod, storageAccount, cachePath, tenantId } = options;
+  const { getCredential } = await import("./getCredential-DHB4UIE2.js");
   const { AzureRemoteCacheClient } = await import("./AzureRemoteCacheClient-NEV2XCF7.js");
   const { ReporterDecorator } = await import("./ReporterDecorator-SNBYNGOT.js");
   const { getListOfBlobs } = await import("./getListOfBlobs-E5OFG2MF.js");
-  const credential = await getCredential(loginMethod, cachePath);
+  const credential = await getCredential(loginMethod, cachePath, tenantId);
   const remoteCacheClientOptions = {
     storageAccount,
     container,

package/lib/authentication/getCredential.d.ts

@@ -6,5 +6,5 @@ import type { LoginMethod } from '../types/LoginMethod.js';
  * 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): Promise<TokenCredential>;
+export declare function getCredential(loginMethod: LoginMethod, cachePath: string, tenantId?: string): Promise<TokenCredential>;
 //# sourceMappingURL=getCredential.d.ts.map

package/lib/createRemoteCacheClient.d.ts

@@ -8,6 +8,7 @@ export interface CreateRemoteCacheClientParams {
         container: string;
         loginMethod: LoginMethod;
         cachePath: string;
+        tenantId?: string;
     };
     context: {
         reporter: TaskReporter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/remote-cache",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "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.11.3",
+    "@ms-cloudpack/task-reporter": "^0.13.0",
     "@ms-cloudpack/telemetry": "^0.5.1"
   },
   "devDependencies": {