@microsoft/vscode-azext-azureauth 1.0.0 → 1.1.2

package/out/src/index.d.ts

@@ -1,6 +1,6 @@
-export * from './AzureAuthentication';
-export * from './AzureSubscription';
-export * from './AzureSubscriptionProvider';
-export * from './NotSignedInError';
-export * from './utils/configuredAzureEnv';
-export * from './VSCodeAzureSubscriptionProvider';
+export * from './AzureAuthentication';
+export * from './AzureSubscription';
+export * from './AzureSubscriptionProvider';
+export * from './NotSignedInError';
+export * from './utils/configuredAzureEnv';
+export * from './VSCodeAzureSubscriptionProvider';

package/out/src/index.js

@@ -1,27 +1,27 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./AzureAuthentication"), exports);
-__exportStar(require("./AzureSubscription"), exports);
-__exportStar(require("./AzureSubscriptionProvider"), exports);
-__exportStar(require("./NotSignedInError"), exports);
-__exportStar(require("./utils/configuredAzureEnv"), exports);
-__exportStar(require("./VSCodeAzureSubscriptionProvider"), exports);
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./AzureAuthentication"), exports);
+__exportStar(require("./AzureSubscription"), exports);
+__exportStar(require("./AzureSubscriptionProvider"), exports);
+__exportStar(require("./NotSignedInError"), exports);
+__exportStar(require("./utils/configuredAzureEnv"), exports);
+__exportStar(require("./VSCodeAzureSubscriptionProvider"), exports);
 //# sourceMappingURL=index.js.map

package/out/src/utils/configuredAzureEnv.d.ts

@@ -1,24 +1,24 @@
-import * as azureEnv from '@azure/ms-rest-azure-env';
-import * as vscode from 'vscode';
-/**
- * Gets the configured Azure environment.
- *
- * @returns The configured Azure environment from the `microsoft-sovereign-cloud.endpoint` setting.
- */
-export declare function getConfiguredAzureEnv(): azureEnv.Environment & {
-    isCustomCloud: boolean;
-};
-/**
- * Sets the configured Azure cloud.
- *
- * @param cloud Use `'AzureCloud'` for public Azure cloud, `'AzureChinaCloud'` for Azure China, or `'AzureUSGovernment'` for Azure US Government.
- * These are the same values as the cloud names in `@azure/ms-rest-azure-env`. For a custom cloud, use an instance of the `@azure/ms-rest-azure-env` `EnvironmentParameters`.
- *
- * @param target (Optional) The configuration target to use, by default {@link vscode.ConfigurationTarget.Global}.
- */
-export declare function setConfiguredAzureEnv(cloud: string | azureEnv.EnvironmentParameters, target?: vscode.ConfigurationTarget): Promise<void>;
-/**
- * Gets the ID of the authentication provider configured to be used
- * @returns The provider ID to use, either `'microsoft'` or `'microsoft-sovereign-cloud'`
- */
-export declare function getConfiguredAuthProviderId(): string;
+import * as azureEnv from '@azure/ms-rest-azure-env';
+import * as vscode from 'vscode';
+/**
+ * Gets the configured Azure environment.
+ *
+ * @returns The configured Azure environment from the settings in the built-in authentication provider extension
+ */
+export declare function getConfiguredAzureEnv(): azureEnv.Environment & {
+    isCustomCloud: boolean;
+};
+/**
+ * Sets the configured Azure cloud.
+ *
+ * @param cloud Use `'AzureCloud'` or `undefined` for public Azure cloud, `'ChinaCloud'` for Azure China, or `'USGovernment'` for Azure US Government.
+ * These are the same values as the cloud names in `@azure/ms-rest-azure-env`. For a custom cloud, use an instance of the `@azure/ms-rest-azure-env` {@link azureEnv.EnvironmentParameters}.
+ *
+ * @param target (Optional) The configuration target to use, by default {@link vscode.ConfigurationTarget.Global}.
+ */
+export declare function setConfiguredAzureEnv(cloud: 'AzureCloud' | 'ChinaCloud' | 'USGovernment' | undefined | azureEnv.EnvironmentParameters, target?: vscode.ConfigurationTarget): Promise<void>;
+/**
+ * Gets the ID of the authentication provider configured to be used
+ * @returns The provider ID to use, either `'microsoft'` or `'microsoft-sovereign-cloud'`
+ */
+export declare function getConfiguredAuthProviderId(): string;

package/out/src/utils/configuredAzureEnv.js

@@ -1,90 +1,95 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfiguredAuthProviderId = exports.setConfiguredAzureEnv = exports.getConfiguredAzureEnv = void 0;
-const azureEnv = require("@azure/ms-rest-azure-env"); // This package is so small that it's not worth lazy loading
-const vscode = require("vscode");
-const AzureCloudName = azureEnv.Environment.AzureCloud.name;
-const AzureChinaCloudName = azureEnv.Environment.ChinaCloud.name;
-const AzureUSGovernmentCloudName = azureEnv.Environment.USGovernment.name;
-const CloudNameToEndpointSettingValue = {};
-CloudNameToEndpointSettingValue[AzureCloudName] = undefined;
-CloudNameToEndpointSettingValue[AzureChinaCloudName] = 'Azure China';
-CloudNameToEndpointSettingValue[AzureUSGovernmentCloudName] = 'Azure US Government';
-/**
- * Gets the configured Azure environment.
- *
- * @returns The configured Azure environment from the `microsoft-sovereign-cloud.endpoint` setting.
- */
-function getConfiguredAzureEnv() {
-    var _a;
-    const authProviderConfig = vscode.workspace.getConfiguration('microsoft-sovereign-cloud');
-    const endpointSettingValue = (_a = authProviderConfig.get('endpoint')) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-    // The endpoint setting will accept either the environment name (either 'Azure China' or 'Azure US Government'),
-    // or an endpoint URL. Since the user could configure the same environment either way, we need to check both.
-    // We'll also throw to lowercase just to maximize the chance of success.
-    /* eslint-disable @typescript-eslint/no-non-null-assertion */
-    if (endpointSettingValue === CloudNameToEndpointSettingValue[AzureChinaCloudName].toLowerCase() || endpointSettingValue === azureEnv.Environment.ChinaCloud.activeDirectoryEndpointUrl.toLowerCase()) {
-        return Object.assign(Object.assign({}, azureEnv.Environment.get(azureEnv.Environment.ChinaCloud.name)), { isCustomCloud: false });
-    }
-    else if (endpointSettingValue === CloudNameToEndpointSettingValue[AzureUSGovernmentCloudName].toLowerCase() || endpointSettingValue === azureEnv.Environment.USGovernment.activeDirectoryEndpointUrl.toLowerCase()) {
-        return Object.assign(Object.assign({}, azureEnv.Environment.get(azureEnv.Environment.USGovernment.name)), { isCustomCloud: false });
-    }
-    else if (endpointSettingValue) {
-        const rgConfig = vscode.workspace.getConfiguration('azureResourceGroups');
-        const customCloud = rgConfig.get('customCloud'); // TODO: final setting name
-        if (customCloud) {
-            return Object.assign(Object.assign({}, new azureEnv.Environment(customCloud)), { isCustomCloud: true });
-        }
-        throw new Error(vscode.l10n.t('The custom cloud choice is not configured. Please configure the setting `azureResourceGroups.customCloud`.')); // TODO: final setting name
-    }
-    /* eslint-enable @typescript-eslint/no-non-null-assertion */
-    return Object.assign(Object.assign({}, azureEnv.Environment.get(azureEnv.Environment.AzureCloud.name)), { isCustomCloud: false });
-}
-exports.getConfiguredAzureEnv = getConfiguredAzureEnv;
-/**
- * Sets the configured Azure cloud.
- *
- * @param cloud Use `'AzureCloud'` for public Azure cloud, `'AzureChinaCloud'` for Azure China, or `'AzureUSGovernment'` for Azure US Government.
- * These are the same values as the cloud names in `@azure/ms-rest-azure-env`. For a custom cloud, use an instance of the `@azure/ms-rest-azure-env` `EnvironmentParameters`.
- *
- * @param target (Optional) The configuration target to use, by default {@link vscode.ConfigurationTarget.Global}.
- */
-function setConfiguredAzureEnv(cloud, target = vscode.ConfigurationTarget.Global) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const authProviderConfig = vscode.workspace.getConfiguration('microsoft-sovereign-cloud');
-        if (typeof cloud === 'string' && cloud in CloudNameToEndpointSettingValue) {
-            yield authProviderConfig.update('endpoint', CloudNameToEndpointSettingValue[cloud], target);
-        }
-        else if (typeof cloud === 'object' && 'activeDirectoryEndpointUrl' in cloud) {
-            yield authProviderConfig.update('endpoint', cloud.activeDirectoryEndpointUrl, target);
-            const rgConfig = vscode.workspace.getConfiguration('azureResourceGroups');
-            yield rgConfig.update('customCloud', cloud, target); // TODO: final setting name
-        }
-        else {
-            throw new Error(`Invalid cloud value: ${JSON.stringify(cloud)}`);
-        }
-    });
-}
-exports.setConfiguredAzureEnv = setConfiguredAzureEnv;
-/**
- * Gets the ID of the authentication provider configured to be used
- * @returns The provider ID to use, either `'microsoft'` or `'microsoft-sovereign-cloud'`
- */
-function getConfiguredAuthProviderId() {
-    return getConfiguredAzureEnv().name === AzureCloudName ? 'microsoft' : 'microsoft-sovereign-cloud';
-}
-exports.getConfiguredAuthProviderId = getConfiguredAuthProviderId;
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConfiguredAuthProviderId = exports.setConfiguredAzureEnv = exports.getConfiguredAzureEnv = void 0;
+const azureEnv = require("@azure/ms-rest-azure-env"); // This package is so small that it's not worth lazy loading
+const vscode = require("vscode");
+// These strings come from https://github.com/microsoft/vscode/blob/eac16e9b63a11885b538db3e0b533a02a2fb8143/extensions/microsoft-authentication/package.json#L40-L99
+const CustomCloudConfigurationSection = 'microsoft-sovereign-cloud';
+const CloudEnvironmentSettingName = 'environment';
+const CustomEnvironmentSettingName = 'customEnvironment';
+var CloudEnvironmentSettingValue;
+(function (CloudEnvironmentSettingValue) {
+    CloudEnvironmentSettingValue["ChinaCloud"] = "ChinaCloud";
+    CloudEnvironmentSettingValue["USGovernment"] = "USGovernment";
+    CloudEnvironmentSettingValue["Custom"] = "custom";
+})(CloudEnvironmentSettingValue || (CloudEnvironmentSettingValue = {}));
+/**
+ * Gets the configured Azure environment.
+ *
+ * @returns The configured Azure environment from the settings in the built-in authentication provider extension
+ */
+function getConfiguredAzureEnv() {
+    const authProviderConfig = vscode.workspace.getConfiguration(CustomCloudConfigurationSection);
+    const environmentSettingValue = authProviderConfig.get(CloudEnvironmentSettingName);
+    if (environmentSettingValue === CloudEnvironmentSettingValue.ChinaCloud) {
+        return Object.assign(Object.assign({}, azureEnv.Environment.get(azureEnv.Environment.ChinaCloud.name)), { isCustomCloud: false });
+    }
+    else if (environmentSettingValue === CloudEnvironmentSettingValue.USGovernment) {
+        return Object.assign(Object.assign({}, azureEnv.Environment.get(azureEnv.Environment.USGovernment.name)), { isCustomCloud: false });
+    }
+    else if (environmentSettingValue === CloudEnvironmentSettingValue.Custom) {
+        const customCloud = authProviderConfig.get(CustomEnvironmentSettingName);
+        if (customCloud) {
+            return Object.assign(Object.assign({}, new azureEnv.Environment(customCloud)), { isCustomCloud: true });
+        }
+        throw new Error(vscode.l10n.t('The custom cloud choice is not configured. Please configure the setting `{0}.{1}`.', CustomCloudConfigurationSection, CustomEnvironmentSettingName));
+    }
+    return Object.assign(Object.assign({}, azureEnv.Environment.get(azureEnv.Environment.AzureCloud.name)), { isCustomCloud: false });
+}
+exports.getConfiguredAzureEnv = getConfiguredAzureEnv;
+/**
+ * Sets the configured Azure cloud.
+ *
+ * @param cloud Use `'AzureCloud'` or `undefined` for public Azure cloud, `'ChinaCloud'` for Azure China, or `'USGovernment'` for Azure US Government.
+ * These are the same values as the cloud names in `@azure/ms-rest-azure-env`. For a custom cloud, use an instance of the `@azure/ms-rest-azure-env` {@link azureEnv.EnvironmentParameters}.
+ *
+ * @param target (Optional) The configuration target to use, by default {@link vscode.ConfigurationTarget.Global}.
+ */
+function setConfiguredAzureEnv(cloud, target = vscode.ConfigurationTarget.Global) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const authProviderConfig = vscode.workspace.getConfiguration(CustomCloudConfigurationSection);
+        if (typeof cloud === 'undefined' || !cloud) {
+            // Use public cloud implicitly--set `environment` setting to `undefined`
+            yield authProviderConfig.update(CloudEnvironmentSettingName, undefined, target);
+        }
+        else if (typeof cloud === 'string' && cloud === 'AzureCloud') {
+            // Use public cloud explicitly--set `environment` setting to `undefined`
+            yield authProviderConfig.update(CloudEnvironmentSettingName, undefined, target);
+        }
+        else if (typeof cloud === 'string') {
+            // Use a sovereign cloud--set the `environment` setting to the specified value
+            yield authProviderConfig.update(CloudEnvironmentSettingName, cloud, target);
+        }
+        else if (typeof cloud === 'object') {
+            // use a custom cloud--set the `environment` setting to `custom` and the `customEnvironment` setting to the specified value
+            yield authProviderConfig.update(CloudEnvironmentSettingName, CloudEnvironmentSettingValue.Custom, target);
+            yield authProviderConfig.update(CustomEnvironmentSettingName, cloud, target);
+        }
+        else {
+            throw new Error(`Invalid cloud value: ${JSON.stringify(cloud)}`);
+        }
+    });
+}
+exports.setConfiguredAzureEnv = setConfiguredAzureEnv;
+/**
+ * Gets the ID of the authentication provider configured to be used
+ * @returns The provider ID to use, either `'microsoft'` or `'microsoft-sovereign-cloud'`
+ */
+function getConfiguredAuthProviderId() {
+    return getConfiguredAzureEnv().name === azureEnv.Environment.AzureCloud.name ? 'microsoft' : 'microsoft-sovereign-cloud';
+}
+exports.getConfiguredAuthProviderId = getConfiguredAuthProviderId;
 //# sourceMappingURL=configuredAzureEnv.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@microsoft/vscode-azext-azureauth",
     "author": "Microsoft Corporation",
-    "version": "1.0.0",
+    "version": "1.1.2",
     "description": "Azure authentication helpers for Visual Studio Code",
     "tags": [
         "azure",