ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-25 22:30:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update product references from 'sqlops' to 'azdata' (#4259)

Browse Source 
* Update extensions to use azdata

* Switch core code to use azdata
This commit is contained in:
Karl Burtram
2019-03-01 13:59:37 -08:00
committed by GitHub
parent 220685a522
commit 84890eb1b4
371 changed files with 3208 additions and 3184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
extensions/azurecore/src/account-provider/azureAccountProvider.ts
View File

@@ -6,7 +6,7 @@
'use strict';
import * as adal from 'adal-node';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import * as request from 'request';
import * as nls from 'vscode-nls';
import * as vscode from 'vscode';
@@ -22,7 +22,7 @@ import TokenCache from './tokenCache';
const localize = nls.loadMessageBundle();
export class AzureAccountProvider implements sqlops.AccountProvider {
export class AzureAccountProvider implements azdata.AccountProvider {
// CONSTANTS ///////////////////////////////////////////////////////////
private static WorkSchoolAccountType: string = 'work_school';
private static MicrosoftAccountType: string = 'microsoft';
@@ -57,7 +57,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
* @param {"data".AccountKey} accountKey Key identifying the account to delete tokens for
* @returns {Thenable<void>} Promise to clear requested tokens from the token cache
*/
public clear(accountKey: sqlops.AccountKey): Thenable<void> {
public clear(accountKey: azdata.AccountKey): Thenable<void> {
return this.doIfInitialized(() => this.clearAccountTokens(accountKey));
}
@@ -69,14 +69,14 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
return this._tokenCache.clear();
}
public getSecurityToken(account: AzureAccount, resource: sqlops.AzureResource): Thenable<AzureAccountSecurityTokenCollection> {
public getSecurityToken(account: AzureAccount, resource: azdata.AzureResource): Thenable<AzureAccountSecurityTokenCollection> {
return this.doIfInitialized(() => this.getAccessTokens(account, resource));
}
public initialize(restoredAccounts: sqlops.Account[]): Thenable<sqlops.Account[]> {
public initialize(restoredAccounts: azdata.Account[]): Thenable<azdata.Account[]> {
let self = this;
let rehydrationTasks: Thenable<sqlops.Account>[] = [];
let rehydrationTasks: Thenable<azdata.Account>[] = [];
for (let account of restoredAccounts) {
// Purge any invalid accounts
if (!account) {
@@ -90,7 +90,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
// Attempt to get fresh tokens. If this fails then the account is stale.
// NOTE: Based on ADAL implementation, getting tokens should use the refresh token if necessary
let task = this.getAccessTokens(account, sqlops.AzureResource.ResourceManagement)
let task = this.getAccessTokens(account, azdata.AzureResource.ResourceManagement)
.then(
() => {
return account;
@@ -145,7 +145,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
return Promise.resolve();
}
private clearAccountTokens(accountKey: sqlops.AccountKey): Thenable<void> {
private clearAccountTokens(accountKey: azdata.AccountKey): Thenable<void> {
// Put together a query to look up any tokens associated with the account key
let query = <adal.TokenResponse>{ userId: accountKey.accountId };
@@ -161,12 +161,12 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
: Promise.reject(localize('accountProviderNotInitialized', 'Account provider not initialized, cannot perform action'));
}
private getAccessTokens(account: AzureAccount, resource: sqlops.AzureResource): Thenable<AzureAccountSecurityTokenCollection> {
private getAccessTokens(account: AzureAccount, resource: azdata.AzureResource): Thenable<AzureAccountSecurityTokenCollection> {
let self = this;
const resourceIdMap = new Map<sqlops.AzureResource, string>([
[sqlops.AzureResource.ResourceManagement, self._metadata.settings.armResource.id],
[sqlops.AzureResource.Sql, self._metadata.settings.sqlResource.id]
const resourceIdMap = new Map<azdata.AzureResource, string>([
[azdata.AzureResource.ResourceManagement, self._metadata.settings.armResource.id],
[azdata.AzureResource.Sql, self._metadata.settings.sqlResource.id]
]);
let accessTokenPromises: Thenable<void>[] = [];
@@ -185,7 +185,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
if (error) {
// TODO: We'll assume for now that the account is stale, though that might not be accurate
account.isStale = true;
sqlops.accounts.accountUpdated(account);
azdata.accounts.accountUpdated(account);
reject(error);
return;
@@ -245,7 +245,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
let title = isAddAccount ?
localize('addAccount', 'Add {0} account', self._metadata.displayName) :
localize('refreshAccount', 'Refresh {0} account', self._metadata.displayName);
return sqlops.accounts.beginAutoOAuthDeviceCode(self._metadata.id, title, oAuth.userCodeInfo.message, oAuth.userCodeInfo.userCode, oAuth.userCodeInfo.verificationUrl)
return azdata.accounts.beginAutoOAuthDeviceCode(self._metadata.id, title, oAuth.userCodeInfo.message, oAuth.userCodeInfo.userCode, oAuth.userCodeInfo.verificationUrl)
.then(() => {
return new Promise<adal.TokenResponse>((resolve, reject) => {
let context = oAuth.context;
@@ -254,14 +254,14 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
if (err) {
if (self._autoOAuthCancelled) {
// Auto OAuth was cancelled by the user, indicate this with the error we return
reject(<sqlops.UserCancelledSignInError>{ userCancelledSignIn: true });
reject(<azdata.UserCancelledSignInError>{ userCancelledSignIn: true });
} else {
// Auto OAuth failed for some other reason
sqlops.accounts.endAutoOAuthDeviceCode();
azdata.accounts.endAutoOAuthDeviceCode();
reject(err);
}
} else {
sqlops.accounts.endAutoOAuthDeviceCode();
azdata.accounts.endAutoOAuthDeviceCode();
resolve(<adal.TokenResponse>response);
}

8
extensions/azurecore/src/account-provider/azureAccountProviderService.ts
View File

@@ -6,7 +6,7 @@
'use strict';
import * as constants from '../constants';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import * as events from 'events';
import * as nls from 'vscode-nls';
import * as path from 'path';
@@ -27,7 +27,7 @@ export class AzureAccountProviderService implements vscode.Disposable {
// MEMBER VARIABLES ////////////////////////////////////////////////////////
private _accountDisposals: { [accountProviderId: string]: vscode.Disposable };
private _accountProviders: { [accountProviderId: string]: AzureAccountProvider };
private _credentialProvider: sqlops.CredentialProvider;
private _credentialProvider: azdata.CredentialProvider;
private _configChangePromiseChain: Thenable<void>;
private _currentConfig: vscode.WorkspaceConfiguration;
private _event: events.EventEmitter;
@@ -55,7 +55,7 @@ export class AzureAccountProviderService implements vscode.Disposable {
// 2a) Store the credential provider for use later
// 2b) Register the configuration change handler
// 2c) Perform an initial config change handling
return sqlops.credentials.getProvider(AzureAccountProviderService.CredentialNamespace)
return azdata.credentials.getProvider(AzureAccountProviderService.CredentialNamespace)
.then(credProvider => {
self._credentialProvider = credProvider;
@@ -138,7 +138,7 @@ export class AzureAccountProviderService implements vscode.Disposable {
let tokenCache = new CredentialServiceTokenCache(self._credentialProvider, tokenCacheKey, tokenCachePath);
let accountProvider = new AzureAccountProvider(<AzureAccountProviderMetadata>provider.metadata, tokenCache);
self._accountProviders[provider.metadata.id] = accountProvider;
self._accountDisposals[provider.metadata.id] = sqlops.accounts.registerAccountProvider(provider.metadata, accountProvider);
self._accountDisposals[provider.metadata.id] = azdata.accounts.registerAccountProvider(provider.metadata, accountProvider);
resolve();
} catch (e) {
console.error(`Failed to register account provider: ${e}`);

6
extensions/azurecore/src/account-provider/interfaces.ts
View File

@@ -1,6 +1,6 @@
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
/**
* Represents a tenant (an Azure Active Directory instance) to which a user has access
@@ -123,7 +123,7 @@ export interface ProviderSettings {
/**
* Extension of account provider metadata to override settings type for Azure account providers
*/
export interface AzureAccountProviderMetadata extends sqlops.AccountProviderMetadata {
export interface AzureAccountProviderMetadata extends azdata.AccountProviderMetadata {
/**
* Azure specific account provider settings.
*/
@@ -148,7 +148,7 @@ export interface AzureAccountProperties {
/**
* Override of the Account type to enforce properties that are AzureAccountProperties
*/
export interface AzureAccount extends sqlops.Account {
export interface AzureAccount extends azdata.Account {
/**
* AzureAccountProperties specifically used for Azure accounts
*/

4
extensions/azurecore/src/account-provider/tokenCache.ts
View File

@@ -6,7 +6,7 @@
'use strict';
import * as adal from 'adal-node';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import * as crypto from 'crypto';
import * as fs from 'fs';
@@ -19,7 +19,7 @@ export default class TokenCache implements adal.TokenCache {
private _activeOperation: Thenable<any>;
constructor(
private _credentialProvider: sqlops.CredentialProvider,
private _credentialProvider: azdata.CredentialProvider,
private _credentialServiceKey: string,
private _cacheSerializationPath: string
) {