Expose AzureAccount typings to other extensions (#14604)

extensions/azurecore/src/account-provider/auths/azureAuth.ts

@@ -12,10 +12,10 @@ import {
 	AzureAccount,
 	AzureAccountProviderMetadata,
 	AzureAuthType,
-	Deferred,
 	Resource,
 	Tenant
-} from '../interfaces';
+} from 'azurecore';
+import { Deferred } from '../interfaces';
 import * as url from 'url';
 
 import { SimpleTokenCache } from '../simpleTokenCache';
@@ -161,7 +161,7 @@ export abstract class AzureAuth implements vscode.Disposable {
 		const tenant = account.properties.tenants.find(t => t.id === tenantId);
 
 		if (!tenant) {
-			throw new AzureAuthError(localize('azure.tenantNotFound', "Specifed tenant with ID '{0}' not found.", tenantId), `Tenant ${tenantId} not found.`, undefined);
+			throw new AzureAuthError(localize('azure.tenantNotFound', "Specified tenant with ID '{0}' not found.", tenantId), `Tenant ${tenantId} not found.`, undefined);
 		}
 
 		const cachedTokens = await this.getSavedToken(tenant, resource, account.key);

extensions/azurecore/src/account-provider/auths/azureAuthCodeGrant.ts

@@ -4,7 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { AuthorizationCodePostData, AzureAuth, OAuthTokenResponse } from './azureAuth';
-import { AzureAccountProviderMetadata, AzureAuthType, Deferred, Resource, Tenant } from '../interfaces';
+import { AzureAccountProviderMetadata, AzureAuthType, Resource, Tenant } from 'azurecore';
+import { Deferred } from '../interfaces';
 import * as vscode from 'vscode';
 import * as crypto from 'crypto';
 import { SimpleTokenCache } from '../simpleTokenCache';

extensions/azurecore/src/account-provider/auths/azureDeviceCode.ts

@@ -18,12 +18,9 @@ import {
 	AzureAccountProviderMetadata,
 	AzureAuthType,
 	Tenant,
-	Resource,
-	Deferred,
-	// Tenant,
-	// Subscription
-} from '../interfaces';
-
+	Resource
+} from 'azurecore';
+import { Deferred } from '../interfaces';
 import { SimpleTokenCache } from '../simpleTokenCache';
 import { Logger } from '../../utils/Logger';
 const localize = nls.loadMessageBundle();

extensions/azurecore/src/account-provider/azureAccountProvider.ts

@@ -10,9 +10,9 @@ import * as nls from 'vscode-nls';
 import {
 	AzureAccountProviderMetadata,
 	AzureAuthType,
-	Deferred,
 	AzureAccount
-} from './interfaces';
+} from 'azurecore';
+import { Deferred } from './interfaces';
 
 import { SimpleTokenCache } from './simpleTokenCache';
 import { Logger } from '../utils/Logger';

extensions/azurecore/src/account-provider/azureAccountProviderService.ts

@@ -10,7 +10,8 @@ import * as vscode from 'vscode';
 import { SimpleTokenCache } from './simpleTokenCache';
 import providerSettings from './providerSettings';
 import { AzureAccountProvider as AzureAccountProvider } from './azureAccountProvider';
-import { AzureAccountProviderMetadata, ProviderSettings } from './interfaces';
+import { AzureAccountProviderMetadata } from 'azurecore';
+import { ProviderSettings } from './interfaces';
 import * as loc from '../localizedConstants';
 
 let localize = nls.loadMessageBundle();

extensions/azurecore/src/account-provider/interfaces.ts

@@ -3,129 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as azdata from 'azdata';
-
-/**
- * Represents a tenant (an Azure Active Directory instance) to which a user has access
- */
-export interface Tenant {
-	/**
-	 * Globally unique identifier of the tenant
-	 */
-	id: string;
-
-	/**
-	 * Display name of the tenant
-	 */
-	displayName: string;
-
-	/**
-	 * Identifier of the user in the tenant
-	 */
-	userId?: string;
-
-	/**
-	 * The category the user has set their tenant to (e.g. Home Tenant)
-	 */
-	tenantCategory?: string;
-}
-
-/**
- * Represents a resource exposed by an Azure Active Directory
- */
-export interface Resource {
-	/**
-	 * Identifier of the resource
-	 */
-	id: string;
-
-	/**
-	 * Endpoint url used to access the resource
-	 */
-	endpoint: string;
-
-	/**
-	 * Resource ID for azdata
-	 */
-	azureResourceId?: azdata.AzureResource
-}
-
-/**
- * Represents settings for an AAD account provider
- */
-interface Settings {
-	/**
-	 * Host of the authority
-	 */
-	host?: string;
-
-	/**
-	 * Identifier of the client application
-	 */
-	clientId?: string;
-
-	/**
-	 * Information that describes the Microsoft resource management resource
-	 */
-	microsoftResource?: Resource
-
-	/**
-	 * Information that describes the AAD graph resource
-	 */
-	graphResource?: Resource;
-
-	/**
-	 * Information that describes the MS graph resource
-	 */
-	msGraphResource?: Resource;
-
-	/**
-	 * Information that describes the Azure resource management resource
-	 */
-	armResource?: Resource;
-
-	/**
-	 * Information that describes the SQL Azure resource
-	 */
-	sqlResource?: Resource;
-
-	/**
-	 * Information that describes the OSS RDBMS resource
-	 */
-	ossRdbmsResource?: Resource;
-
-	/**
-	 * Information that describes the Azure Key Vault resource
-	 */
-	azureKeyVaultResource?: Resource;
-
-	/**
-	 * Information that describes the Azure Dev Ops resource
-	 */
-	azureDevOpsResource?: Resource;
-
-	/**
-	 * A list of tenant IDs to authenticate against. If defined, then these IDs will be used
-	 * instead of querying the tenants endpoint of the armResource
-	 */
-	adTenants?: string[];
-
-	// AuthorizationCodeGrantFlowSettings //////////////////////////////////
-
-	/**
-	 * An optional site ID that brands the interactive aspect of sign in
-	 */
-	siteId?: string;
-
-	/**
-	 * Redirect URI that is used to signify the end of the interactive aspect of sign it
-	 */
-	redirectUri?: string;
-
-	scopes?: string[]
-
-	portalEndpoint?: string
-}
+import * as azurecore from 'azurecore';
 
 /**
  * Mapping of configuration key with the metadata to instantiate the account provider
@@ -139,44 +17,7 @@ export interface ProviderSettings {
 	/**
 	 * Metadata for the provider
 	 */
-	metadata: AzureAccountProviderMetadata;
-}
-
-/**
- * Extension of account provider metadata to override settings type for Azure account providers
- */
-export interface AzureAccountProviderMetadata extends azdata.AccountProviderMetadata {
-	/**
-	 * Azure specific account provider settings.
-	 */
-	settings: Settings;
-}
-
-export enum AzureAuthType {
-	AuthCodeGrant = 0,
-	DeviceCode = 1
-}
-
-/**
- * Properties specific to an Azure account
- */
-interface AzureAccountProperties {
-	/**
-	 * Auth type of azure used to authenticate this account.
-	 */
-	azureAuthType?: AzureAuthType
-
-	providerSettings: AzureAccountProviderMetadata;
-	/**
-	 * Whether or not the account is a Microsoft account
-	 */
-	isMsAccount: boolean;
-
-	/**
-	 * A list of tenants (aka directories) that the account belongs to
-	 */
-	tenants: Tenant[];
-
+	metadata: azurecore.AzureAccountProviderMetadata;
 }
 
 export interface Subscription {
@@ -185,16 +26,6 @@ export interface Subscription {
 	displayName: string
 }
 
-/**
- * Override of the Account type to enforce properties that are AzureAccountProperties
- */
-export interface AzureAccount extends azdata.Account {
-	/**
-	 * AzureAccountProperties specifically used for Azure accounts
-	 */
-	properties: AzureAccountProperties;
-}
-
 /**
  * Token returned from a request for an access token
  */