-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #385 from microsoft/dev
1.0.10 release
- Loading branch information
Showing
21 changed files
with
1,158 additions
and
72 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT license. | ||
| import { AuthenticationSession, Event } from "vscode"; | ||
| import { GeneralUtils } from "../../utils/generalUtils"; | ||
|
|
||
| export enum SignInStatus { | ||
| Initializing = 'Initializing', | ||
| SigningIn = 'SigningIn', | ||
| SignedIn = 'SignedIn', | ||
| SignedOut = 'SignedOut', | ||
| } | ||
|
|
||
| export enum SelectionType { | ||
| Filtered, | ||
| All, | ||
| AllIfNoFilters, | ||
| } | ||
|
|
||
| export interface SubscriptionFilter { | ||
| tenantId: string; | ||
| subscriptionId: string; | ||
| } | ||
|
|
||
| export type TokenInfo = { | ||
| token: string; | ||
| expiry: Date; | ||
| }; | ||
|
|
||
| export type AzureAuthenticationSession = AuthenticationSession & { | ||
| tenantId: string; | ||
| }; | ||
|
|
||
| export type Tenant = { | ||
| name: string; | ||
| id: string; | ||
| }; | ||
|
|
||
| export type GetAuthSessionOptions = { | ||
| applicationClientId?: string; | ||
| scopes?: string[]; | ||
| }; | ||
|
|
||
| export type AzureSessionProvider = { | ||
| signIn(): Promise<void>; | ||
| signInStatus: SignInStatus; | ||
| availableTenants: Tenant[]; | ||
| selectedTenant: Tenant | null; | ||
| signInStatusChangeEvent: Event<SignInStatus>; | ||
| getAuthSession(options?: GetAuthSessionOptions): Promise<GeneralUtils.Errorable<AzureAuthenticationSession>>; | ||
| dispose(): void; | ||
| }; | ||
|
|
||
| export type ReadyAzureSessionProvider = AzureSessionProvider & { | ||
| signInStatus: SignInStatus.SignedIn; | ||
| selectedTenant: Tenant; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT license. | ||
| import { SubscriptionClient, TenantIdDescription } from "@azure/arm-resources-subscriptions"; | ||
| import { TokenCredential } from "@azure/core-auth"; | ||
| import { AuthenticationSession, QuickPickItem, Uri, env, window, workspace, ConfigurationTarget } from "vscode"; | ||
| import { UiStrings } from "../../uiStrings"; | ||
| import { GeneralUtils } from "../../utils/generalUtils"; | ||
| import { SelectionType, SignInStatus, SubscriptionFilter, Tenant } from "./authTypes"; | ||
| import { AzureAuth } from "./azureAuth"; | ||
| import { AzureSessionProviderHelper } from "./azureSessionProvider"; | ||
| import { AzureSubscriptionHelper } from "./subscriptions"; | ||
| import { AzureAccountUrl, extensionPrefix } from "../../constants"; | ||
| import { AzureLoginConstantString } from "./constants"; | ||
| export namespace AzureAccount { | ||
| export async function signInToAzure(): Promise<void> { | ||
| await AzureSessionProviderHelper.getSessionProvider().signIn(); | ||
| } | ||
|
|
||
| export function getSelectedTenant(): Tenant | undefined { | ||
| return workspace.getConfiguration(extensionPrefix).get<Tenant>(AzureLoginConstantString.selectedTenant); | ||
| } | ||
|
|
||
| export async function updateSelectedTenant(value?: Tenant): Promise<void> { | ||
| await workspace.getConfiguration(extensionPrefix).update(AzureLoginConstantString.selectedTenant, value, ConfigurationTarget.Global, true); | ||
| } | ||
|
|
||
| export async function selectTenant(): Promise<void> { | ||
| const sessionProvider = AzureSessionProviderHelper.getSessionProvider(); | ||
| if (sessionProvider.signInStatus !== SignInStatus.SignedIn) { | ||
| window.showInformationMessage(UiStrings.SelectTenantBeforeSignIn); | ||
| return; | ||
| } | ||
|
|
||
| if (sessionProvider.availableTenants.length === 1) { | ||
| sessionProvider.selectedTenant = sessionProvider.availableTenants[0]; | ||
|
|
||
| // If this tenant wasn't previously selected, it was probably because it wasn't immediately | ||
| // accessible (the user's current token didn't have access to it). Calling getAuthSession | ||
| // will prompt the user to re-authenticate if necessary. | ||
| const sessionResult = await sessionProvider.getAuthSession(); | ||
| if (GeneralUtils.failed(sessionResult)) { | ||
| window.showErrorMessage(sessionResult.error); | ||
| } | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| const selectedTenant = await AzureAuth.quickPickTenant(sessionProvider.availableTenants); | ||
| if (!selectedTenant) { | ||
| window.showInformationMessage(UiStrings.NoTenantSelected); | ||
| return; | ||
| } | ||
|
|
||
| sessionProvider.selectedTenant = selectedTenant; | ||
| await updateSelectedTenant(selectedTenant); | ||
| } | ||
|
|
||
| type SubscriptionQuickPickItem = QuickPickItem & { subscription: SubscriptionFilter }; | ||
|
|
||
| export async function selectSubscriptions(): Promise<void> { | ||
| const sessionProvider = await AzureAuth.getReadySessionProvider(); | ||
| if (GeneralUtils.failed(sessionProvider)) { | ||
| window.showErrorMessage(sessionProvider.error); | ||
| return; | ||
| } | ||
|
|
||
| const allSubscriptions = await AzureSubscriptionHelper.getSubscriptions(sessionProvider.result, SelectionType.All); | ||
| if (GeneralUtils.failed(allSubscriptions)) { | ||
| window.showErrorMessage(allSubscriptions.error); | ||
| return; | ||
| } | ||
|
|
||
| if (allSubscriptions.result.length === 0) { | ||
| const noSubscriptionsFound = UiStrings.NoSubscriptionsFoundAndSetup; | ||
| const setupAccount = UiStrings.SetUpAzureAccount; | ||
| const response = await window.showInformationMessage(noSubscriptionsFound, setupAccount); | ||
| if (response === setupAccount) { | ||
| env.openExternal(Uri.parse(AzureAccountUrl.azureMicrosoftLink)); | ||
| } | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| const session = await sessionProvider.result.getAuthSession(); | ||
| if (GeneralUtils.failed(session)) { | ||
| window.showErrorMessage(session.error); | ||
| return; | ||
| } | ||
|
|
||
| const filteredSubscriptions = await AzureSubscriptionHelper.getFilteredSubscriptions(); | ||
|
|
||
| const subscriptionsInCurrentTenant = filteredSubscriptions.filter( | ||
| (sub) => sub.tenantId === session.result.tenantId, | ||
| ); | ||
| const subscriptionsInOtherTenants = filteredSubscriptions.filter((sub) => sub.tenantId !== session.result.tenantId); | ||
|
|
||
| const quickPickItems: SubscriptionQuickPickItem[] = allSubscriptions.result.map((sub) => { | ||
| return { | ||
| label: sub.displayName || "", | ||
| description: sub.subscriptionId, | ||
| picked: subscriptionsInCurrentTenant.some((filtered) => filtered.subscriptionId === sub.subscriptionId), | ||
| subscription: { | ||
| subscriptionId: sub.subscriptionId || "", | ||
| tenantId: sub.tenantId || "", | ||
| }, | ||
| }; | ||
| }); | ||
|
|
||
| const selectedItems = await window.showQuickPick(quickPickItems, { | ||
| canPickMany: true, | ||
| placeHolder: UiStrings.SelectSubscription, | ||
| }); | ||
|
|
||
| if (!selectedItems) { | ||
| return; | ||
| } | ||
|
|
||
| const newFilteredSubscriptions = [ | ||
| ...selectedItems.map((item) => item.subscription), | ||
| ...subscriptionsInOtherTenants, // Retain filters in any other tenants. | ||
| ]; | ||
|
|
||
| await AzureSubscriptionHelper.setFilteredSubscriptions(newFilteredSubscriptions); | ||
| } | ||
| export async function getTenants(session: AuthenticationSession): Promise<GeneralUtils.Errorable<Tenant[]>> { | ||
| const armEndpoint = AzureAuth.getConfiguredAzureEnv().resourceManagerEndpointUrl; | ||
| const credential: TokenCredential = { | ||
| getToken: async () => { | ||
| return { token: session.accessToken, expiresOnTimestamp: 0 }; | ||
| }, | ||
| }; | ||
| const subscriptionClient = new SubscriptionClient(credential, { endpoint: armEndpoint }); | ||
|
|
||
| const tenantsResult = await AzureAuth.listAll(subscriptionClient.tenants.list()); | ||
| return GeneralUtils.errMap(tenantsResult, (t) => t.filter(isTenant).map((t) => ({ name: t.displayName, id: t.tenantId }))); | ||
| } | ||
| export function findTenant(tenants: Tenant[], tenantId: string): Tenant | null { | ||
| return tenants.find((t) => t.id === tenantId) || null; | ||
| } | ||
| export function isTenant(tenant: TenantIdDescription): tenant is { tenantId: string; displayName: string } { | ||
| return tenant.tenantId !== undefined && tenant.displayName !== undefined; | ||
| } | ||
| export function getIdString(tenants: Tenant[]): string { | ||
| return tenants | ||
| .map((t) => t.id) | ||
| .sort() | ||
| .join(","); | ||
| } | ||
| } |
Oops, something went wrong.