@azure/identity 3.3.1-alpha.20230927.1 → 3.3.1

package/dist/index.js

@@ -2652,7 +2652,10 @@ class AzureCliCredential {
      * @param options - Options, to optionally allow multi-tenant requests.
      */
     constructor(options) {
-        this.tenantId = options === null || options === void 0 ? void 0 : options.tenantId;
+        if (options === null || options === void 0 ? void 0 : options.tenantId) {
+            checkTenantId(logger$b, options === null || options === void 0 ? void 0 : options.tenantId);
+            this.tenantId = options === null || options === void 0 ? void 0 : options.tenantId;
+        }
         this.additionallyAllowedTenantIds = resolveAddionallyAllowedTenantIds(options === null || options === void 0 ? void 0 : options.additionallyAllowedTenants);
         this.timeout = options === null || options === void 0 ? void 0 : options.processTimeoutInMs;
     }
@@ -2666,6 +2669,9 @@ class AzureCliCredential {
      */
     async getToken(scopes, options = {}) {
         const tenantId = processMultiTenantRequest(this.tenantId, options, this.additionallyAllowedTenantIds);
+        if (tenantId) {
+            checkTenantId(logger$b, tenantId);
+        }
         const scope = typeof scopes === "string" ? scopes : scopes[0];
         logger$b.getToken.info(`Using the scope ${scope}`);
         return tracingClient.withSpan(`${this.constructor.name}.getToken`, options, async () => {
@@ -2826,7 +2832,10 @@ class AzurePowerShellCredential {
      * @param options - Options, to optionally allow multi-tenant requests.
      */
     constructor(options) {
-        this.tenantId = options === null || options === void 0 ? void 0 : options.tenantId;
+        if (options === null || options === void 0 ? void 0 : options.tenantId) {
+            checkTenantId(logger$a, options === null || options === void 0 ? void 0 : options.tenantId);
+            this.tenantId = options === null || options === void 0 ? void 0 : options.tenantId;
+        }
         this.additionallyAllowedTenantIds = resolveAddionallyAllowedTenantIds(options === null || options === void 0 ? void 0 : options.additionallyAllowedTenants);
         this.timeout = options === null || options === void 0 ? void 0 : options.processTimeoutInMs;
     }
@@ -2852,15 +2861,11 @@ class AzurePowerShellCredential {
             const results = await runCommands([
                 [
                     powerShellCommand,
-                    "-NoProfile",
-                    "-NonInteractive",
                     "-Command",
                     "Import-Module Az.Accounts -MinimumVersion 2.2.0 -PassThru",
                 ],
                 [
                     powerShellCommand,
-                    "-NoProfile",
-                    "-NonInteractive",
                     "-Command",
                     `Get-AzAccessToken ${tenantSection} -ResourceUrl "${resource}" | ConvertTo-Json`,
                 ],
@@ -2886,6 +2891,9 @@ class AzurePowerShellCredential {
         return tracingClient.withSpan(`${this.constructor.name}.getToken`, options, async () => {
             const tenantId = processMultiTenantRequest(this.tenantId, options, this.additionallyAllowedTenantIds);
             const scope = typeof scopes === "string" ? scopes : scopes[0];
+            if (tenantId) {
+                checkTenantId(logger$a, tenantId);
+            }
             try {
                 ensureValidScopeForDevTimeCreds(scope, logger$a);
                 logger$a.getToken.info(`Using the scope ${scope}`);
@@ -3468,7 +3476,6 @@ const developerCliCredentialInternals = {
                     ...tenantSection,
                 ], {
                     cwd: developerCliCredentialInternals.getSafeWorkingDir(),
-                    shell: true,
                     timeout,
                 }, (error, stdout, stderr) => {
                     resolve({ stdout, stderr, error });
@@ -3516,7 +3523,10 @@ class AzureDeveloperCliCredential {
      * @param options - Options, to optionally allow multi-tenant requests.
      */
     constructor(options) {
-        this.tenantId = options === null || options === void 0 ? void 0 : options.tenantId;
+        if (options === null || options === void 0 ? void 0 : options.tenantId) {
+            checkTenantId(logger$4, options === null || options === void 0 ? void 0 : options.tenantId);
+            this.tenantId = options === null || options === void 0 ? void 0 : options.tenantId;
+        }
         this.additionallyAllowedTenantIds = resolveAddionallyAllowedTenantIds(options === null || options === void 0 ? void 0 : options.additionallyAllowedTenants);
         this.timeout = options === null || options === void 0 ? void 0 : options.processTimeoutInMs;
     }
@@ -3530,6 +3540,9 @@ class AzureDeveloperCliCredential {
      */
     async getToken(scopes, options = {}) {
         const tenantId = processMultiTenantRequest(this.tenantId, options, this.additionallyAllowedTenantIds);
+        if (tenantId) {
+            checkTenantId(logger$4, tenantId);
+        }
         let scopeList;
         if (typeof scopes === "string") {
             scopeList = [scopes];
@@ -3541,6 +3554,9 @@ class AzureDeveloperCliCredential {
         return tracingClient.withSpan(`${this.constructor.name}.getToken`, options, async () => {
             var _a, _b, _c, _d;
             try {
+                scopeList.forEach((scope) => {
+                    ensureValidScopeForDevTimeCreds(scope, logger$4);
+                });
                 const obj = await developerCliCredentialInternals.getAzdAccessToken(scopeList, tenantId, this.timeout);
                 const isNotLoggedInError = ((_a = obj.stderr) === null || _a === void 0 ? void 0 : _a.match("not logged in, run `azd login` to login")) ||
                     ((_b = obj.stderr) === null || _b === void 0 ? void 0 : _b.match("not logged in, run `azd auth login` to login"));