@microsoft/vscode-azext-azureauth 2.1.0 → 2.3.0

package/out/src/VSCodeAzureSubscriptionProvider.js

@@ -266,36 +266,28 @@ class VSCodeAzureSubscriptionProvider extends vscode.Disposable {
      *
      * @returns A client, the credential used by the client, and the authentication function
      */
-    getSubscriptionClient(tenantId) {
+    getSubscriptionClient(tenantId, scopes) {
         return __awaiter(this, void 0, void 0, function* () {
-            const initialSession = yield (0, getSessionFromVSCode_1.getSessionFromVSCode)(undefined, tenantId, { createIfNone: false, silent: true });
-            if (!initialSession) {
+            const armSubs = yield Promise.resolve().then(() => require('@azure/arm-resources-subscriptions'));
+            const session = yield (0, getSessionFromVSCode_1.getSessionFromVSCode)(scopes, tenantId, { createIfNone: false, silent: true });
+            if (!session) {
                 throw new NotSignedInError_1.NotSignedInError();
             }
             const credential = {
-                getToken: (scopes, _options) => __awaiter(this, void 0, void 0, function* () {
-                    const session = yield (0, getSessionFromVSCode_1.getSessionFromVSCode)(scopes, tenantId, { createIfNone: false, silent: true });
-                    if (session === null || session === void 0 ? void 0 : session.accessToken) {
-                        return {
-                            token: session.accessToken,
-                            expiresOnTimestamp: 0
-                        };
-                    }
-                    else {
-                        return null;
-                    }
+                getToken: () => __awaiter(this, void 0, void 0, function* () {
+                    return {
+                        token: session.accessToken,
+                        expiresOnTimestamp: 0
+                    };
                 })
             };
             const configuredAzureEnv = (0, configuredAzureEnv_1.getConfiguredAzureEnv)();
             const endpoint = configuredAzureEnv.resourceManagerEndpointUrl;
-            const armSubs = yield Promise.resolve().then(() => require('@azure/arm-resources-subscriptions'));
             return {
                 client: new armSubs.SubscriptionClient(credential, { endpoint }),
                 credential: credential,
                 authentication: {
-                    getSession: (scopes) => __awaiter(this, void 0, void 0, function* () {
-                        return yield (0, getSessionFromVSCode_1.getSessionFromVSCode)(scopes, tenantId, { createIfNone: false, silent: true });
-                    })
+                    getSession: () => session
                 }
             };
         });

package/out/src/getSessionFromVSCode.js

@@ -21,7 +21,7 @@ function ensureEndingSlash(value) {
 }
 function getResourceScopes(scopes) {
     if (scopes === undefined || scopes === "" || scopes.length === 0) {
-        scopes = ensureEndingSlash((0, configuredAzureEnv_1.getConfiguredAzureEnv)().resourceManagerEndpointUrl);
+        scopes = ensureEndingSlash((0, configuredAzureEnv_1.getConfiguredAzureEnv)().managementEndpointUrl);
     }
     const arrScopes = (Array.isArray(scopes) ? scopes : [scopes])
         .map((scope) => {

package/package.json

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

package/out/src/Tenant.d.ts

@@ -1,4 +0,0 @@
-import type { TenantIdDescription } from '@azure/arm-subscriptions';
-export interface Tenant extends TenantIdDescription {
-    isAuthenticated: boolean;
-}

package/out/src/Tenant.js

@@ -1,7 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
-*  Copyright (c) Microsoft Corporation. All rights reserved.
-*  Licensed under the MIT License. See License.txt in the project root for license information.
-*--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=Tenant.js.map

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

@@ -1,2 +0,0 @@
-import type { AzureSubscriptionProvider } from "../AzureSubscriptionProvider";
-export declare function signInToTenant(subscriptionProvider: AzureSubscriptionProvider): Promise<void>;

package/out/src/utils/signInToTenant.js

@@ -1,89 +0,0 @@
-"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());
-    });
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.signInToTenant = void 0;
-const vscode = require("vscode");
-function signInToTenant(subscriptionProvider) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const tenantId = yield pickTenant(subscriptionProvider);
-        if (tenantId) {
-            yield subscriptionProvider.signIn(tenantId);
-        }
-    });
-}
-exports.signInToTenant = signInToTenant;
-function pickTenant(subscriptionProvider) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const pick = yield vscode.window.showQuickPick(getPicks(subscriptionProvider), {
-            placeHolder: 'Select Directory to Sign In To',
-            matchOnDescription: true,
-            ignoreFocusOut: true,
-        });
-        return pick === null || pick === void 0 ? void 0 : pick.tenant.tenantId;
-    });
-}
-function getPicks(subscriptionProvider) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const unauthenticatedTenants = yield getUnauthenticatedTenants(subscriptionProvider);
-        const picks = unauthenticatedTenants.map(tenant => {
-            var _a, _b, _c;
-            return ({
-                label: (_a = tenant.displayName) !== null && _a !== void 0 ? _a : '',
-                description: (_b = tenant.tenantId) !== null && _b !== void 0 ? _b : '',
-                detail: (_c = tenant.defaultDomain) !== null && _c !== void 0 ? _c : '',
-                tenant,
-            });
-        });
-        return picks;
-    });
-}
-function getUnauthenticatedTenants(subscriptionProvider) {
-    var _a, e_1, _b, _c;
-    return __awaiter(this, void 0, void 0, function* () {
-        const tenants = yield subscriptionProvider.getTenants();
-        const unauthenticatedTenants = [];
-        try {
-            for (var _d = true, tenants_1 = __asyncValues(tenants), tenants_1_1; tenants_1_1 = yield tenants_1.next(), _a = tenants_1_1.done, !_a;) {
-                _c = tenants_1_1.value;
-                _d = false;
-                try {
-                    const tenant = _c;
-                    if (!(yield subscriptionProvider.isSignedIn(tenant.tenantId))) {
-                        unauthenticatedTenants.push(tenant);
-                    }
-                }
-                finally {
-                    _d = true;
-                }
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = tenants_1.return)) yield _b.call(tenants_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return unauthenticatedTenants;
-    });
-}
-//# sourceMappingURL=signInToTenant.js.map