Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 00:28:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include an ability to change the default client id (#238736)

Browse Source 
Include an ability to change the client id

So our migration is easy to test
This commit is contained in:
Tyler James Leonhardt
2025-01-24 16:46:50 -08:00
committed by GitHub
parent be7d0e0bdd
commit a9ce0b5556
4 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
extensions/microsoft-authentication/src/common/scopeData.ts
View File

@@ -3,14 +3,21 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
const DEFAULT_CLIENT_ID = 'aebc6443-996d-45c2-90f0-388ff96faa56';
const DEFAULT_TENANT = 'organizations';
import { workspace } from 'vscode';
const DEFAULT_CLIENT_ID_V1 = 'aebc6443-996d-45c2-90f0-388ff96faa56';
const DEFAULT_TENANT_V1 = 'organizations';
const DEFAULT_CLIENT_ID_V2 = 'c27c220f-ce2f-4904-927d-333864217eeb';
const DEFAULT_TENANT_V2 = 'common';
const OIDC_SCOPES = ['openid', 'email', 'profile', 'offline_access'];
const GRAPH_TACK_ON_SCOPE = 'User.Read';
export class ScopeData {
private readonly _defaultClientId: string;
private readonly _defaultTenant: string;
/**
* The full list of scopes including:
* * the original scopes passed to the constructor
@@ -40,6 +47,14 @@ export class ScopeData {
readonly tenant: string;
constructor(readonly originalScopes: readonly string[] = []) {
if (workspace.getConfiguration('microsoft-authentication').get<'v1' | 'v2'>('clientIdVersion') === 'v2') {
this._defaultClientId = DEFAULT_CLIENT_ID_V2;
this._defaultTenant = DEFAULT_TENANT_V2;
} else {
this._defaultClientId = DEFAULT_CLIENT_ID_V1;
this._defaultTenant = DEFAULT_TENANT_V1;
}
const modifiedScopes = [...originalScopes];
modifiedScopes.sort();
this.allScopes = modifiedScopes;
@@ -55,7 +70,7 @@ export class ScopeData {
return current.split('VSCODE_CLIENT_ID:')[1];
}
return prev;
}, undefined) ?? DEFAULT_CLIENT_ID;
}, undefined) ?? this._defaultClientId;
}
private getTenantId(scopes: string[]) {
@@ -64,7 +79,7 @@ export class ScopeData {
return current.split('VSCODE_TENANT:')[1];
}
return prev;
}, undefined) ?? DEFAULT_TENANT;
}, undefined) ?? this._defaultTenant;
}
private getScopesToSend(scopes: string[]) {