mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Add Azure DevOps as a resource for authentication (#11146)
* Adding ado as auth resource * Removing Gov ADO resource * Correctly handling azureDevOpsResource not being present for usgov
This commit is contained in:
@@ -129,6 +129,10 @@ export abstract class AzureAuth implements vscode.Disposable {
|
|||||||
this.metadata.settings.azureKeyVaultResource
|
this.metadata.settings.azureKeyVaultResource
|
||||||
];
|
];
|
||||||
|
|
||||||
|
if (this.metadata.settings.azureDevOpsResource) {
|
||||||
|
this.resources = this.resources.concat(this.metadata.settings.azureDevOpsResource);
|
||||||
|
}
|
||||||
|
|
||||||
this.scopes = [...this.metadata.settings.scopes];
|
this.scopes = [...this.metadata.settings.scopes];
|
||||||
this.scopesString = this.scopes.join(' ');
|
this.scopesString = this.scopes.join(' ');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,6 +99,11 @@ interface Settings {
|
|||||||
*/
|
*/
|
||||||
azureKeyVaultResource?: 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
|
* 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
|
* instead of querying the tenants endpoint of the armResource
|
||||||
|
|||||||
@@ -48,6 +48,11 @@ const publicAzureSettings: ProviderSettings = {
|
|||||||
endpoint: 'https://vault.azure.net',
|
endpoint: 'https://vault.azure.net',
|
||||||
azureResourceId: AzureResource.AzureKeyVault
|
azureResourceId: AzureResource.AzureKeyVault
|
||||||
},
|
},
|
||||||
|
azureDevOpsResource: {
|
||||||
|
id: 'ado',
|
||||||
|
endpoint: '499b84ac-1321-427f-aa17-267ca6975798',
|
||||||
|
azureResourceId: AzureResource.AzureDevOps,
|
||||||
|
},
|
||||||
redirectUri: 'https://vscode-redirect.azurewebsites.net/',
|
redirectUri: 'https://vscode-redirect.azurewebsites.net/',
|
||||||
scopes: [
|
scopes: [
|
||||||
'openid', 'email', 'profile', 'offline_access',
|
'openid', 'email', 'profile', 'offline_access',
|
||||||
|
|||||||
3
src/sql/azdata.d.ts
vendored
3
src/sql/azdata.d.ts
vendored
@@ -2216,7 +2216,8 @@ declare module 'azdata' {
|
|||||||
OssRdbms = 2,
|
OssRdbms = 2,
|
||||||
AzureKeyVault = 3,
|
AzureKeyVault = 3,
|
||||||
Graph = 4,
|
Graph = 4,
|
||||||
MicrosoftResourceManagement = 5
|
MicrosoftResourceManagement = 5,
|
||||||
|
AzureDevOps = 6
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface DidChangeAccountsParams {
|
export interface DidChangeAccountsParams {
|
||||||
|
|||||||
@@ -406,7 +406,8 @@ export enum AzureResource {
|
|||||||
OssRdbms = 2,
|
OssRdbms = 2,
|
||||||
AzureKeyVault = 3,
|
AzureKeyVault = 3,
|
||||||
Graph = 4,
|
Graph = 4,
|
||||||
MicrosoftResourceManagement = 5
|
MicrosoftResourceManagement = 5,
|
||||||
|
AzureDevOps = 6
|
||||||
}
|
}
|
||||||
|
|
||||||
export class TreeItem extends vsExtTypes.TreeItem {
|
export class TreeItem extends vsExtTypes.TreeItem {
|
||||||
|
|||||||
Reference in New Issue
Block a user