development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-05 19:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates from the rename (#179901)

Browse source 
* Updates from the rename

Azure Cloud -> Microsoft Sovereign Cloud

* remove azure once more
This commit is contained in:
Tyler James Leonhardt 2023-04-13 13:01:13 -07:00 committed by GitHub
parent 468c8b4642
commit 3a02bc9de1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/microsoft-authentication/src/AADHelper.ts
View file

@ -275,7 +275,7 @@ export class AzureActiveDirectoryService {
const runsServerless = vscode.env.remoteName === undefined && vscode.env.uiKind === vscode.UIKind.Web;
if (runsServerless && this._loginEndpointUrl !== defaultLoginEndpointUrl) {
throw new Error('Sign in to non-public Azure clouds is not supported on the web.');
throw new Error('Sign in to non-public clouds is not supported on the web.');
}
if (runsRemote || runsServerless) {

32
extensions/microsoft-authentication/src/extension.ts
View file

@ -9,7 +9,7 @@ import { BetterTokenStorage } from './betterSecretStorage';
import { UriEventHandler } from './UriEventHandler';
import TelemetryReporter from '@vscode/extension-telemetry';
async function initAzureCloudAuthProvider(context: vscode.ExtensionContext, telemetryReporter: TelemetryReporter, uriHandler: UriEventHandler, tokenStorage: BetterTokenStorage<IStoredSession>): Promise<vscode.Disposable | undefined> {
async function initMicrosoftSovereignCloudAuthProvider(context: vscode.ExtensionContext, telemetryReporter: TelemetryReporter, uriHandler: UriEventHandler, tokenStorage: BetterTokenStorage<IStoredSession>): Promise<vscode.Disposable | undefined> {
let settingValue = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get<string | undefined>('endpoint');
let authProviderName: string | undefined;
if (!settingValue) {
@ -27,7 +27,7 @@ async function initAzureCloudAuthProvider(context: vscode.ExtensionContext, tele
try {
uri = vscode.Uri.parse(settingValue, true);
} catch (e) {
vscode.window.showErrorMessage(vscode.l10n.t('Azure Cloud login URI is not a valid URI: {0}', e.message ?? e));
vscode.window.showErrorMessage(vscode.l10n.t('Microsoft Sovereign Cloud login URI is not a valid URI: {0}', e.message ?? e));
return;
}
@ -36,38 +36,38 @@ async function initAzureCloudAuthProvider(context: vscode.ExtensionContext, tele
settingValue += '/';
}
const azureEnterpriseAuthProvider = new AzureActiveDirectoryService(
const aadService = new AzureActiveDirectoryService(
vscode.window.createOutputChannel(vscode.l10n.t('Microsoft Sovereign Cloud Authentication'), { log: true }),
context,
uriHandler,
tokenStorage,
settingValue);
await azureEnterpriseAuthProvider.initialize();
await aadService.initialize();
authProviderName ||= uri.authority;
const disposable = vscode.authentication.registerAuthenticationProvider('microsoft-sovereign-cloud', authProviderName, {
onDidChangeSessions: azureEnterpriseAuthProvider.onDidChangeSessions,
getSessions: (scopes: string[]) => azureEnterpriseAuthProvider.getSessions(scopes),
onDidChangeSessions: aadService.onDidChangeSessions,
getSessions: (scopes: string[]) => aadService.getSessions(scopes),
createSession: async (scopes: string[]) => {
try {
/* __GDPR__
"login" : {
"owner": "TylerLeonhardt",
"comment": "Used to determine the usage of the Azure Cloud Auth Provider.",
"comment": "Used to determine the usage of the Microsoft Sovereign Cloud Auth Provider.",
"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
}
*/
telemetryReporter.sendTelemetryEvent('loginAzureCloud', {
telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloud', {
// Get rid of guids from telemetry.
scopes: JSON.stringify(scopes.map(s => s.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}'))),
});
return await azureEnterpriseAuthProvider.createSession(scopes.sort());
return await aadService.createSession(scopes.sort());
} catch (e) {
/* __GDPR__
"loginFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
*/
telemetryReporter.sendTelemetryEvent('loginAzureCloudFailed');
telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloudFailed');
throw e;
}
@ -77,14 +77,14 @@ async function initAzureCloudAuthProvider(context: vscode.ExtensionContext, tele
/* __GDPR__
"logout" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
*/
telemetryReporter.sendTelemetryEvent('logoutAzureCloud');
telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloud');
await azureEnterpriseAuthProvider.removeSessionById(id);
await aadService.removeSessionById(id);
} catch (e) {
/* __GDPR__
"logoutFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
*/
telemetryReporter.sendTelemetryEvent('logoutAzureCloudFailed');
telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloudFailed');
}
}
}, { supportsMultipleAccounts: true });
@ -154,12 +154,12 @@ export async function activate(context: vscode.ExtensionContext) {
}
}, { supportsMultipleAccounts: true }));
let azureCloudAuthProviderDisposable = await initAzureCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
let microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(async e => {
if (e.affectsConfiguration('microsoft-sovereign-cloud.endpoint')) {
azureCloudAuthProviderDisposable?.dispose();
azureCloudAuthProviderDisposable = await initAzureCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
microsoftSovereignCloudAuthProviderDisposable?.dispose();
microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
}
}));