DEV/microsoft_vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 00:04:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use CIMD if supported (#271403)

Browse Source 
* Use CIMD if supported

If the Authorization Server we are auth'ing against supports the Client ID Metadata auth flow, we use the client id metadata url from product.json as the client id in auth flows.

Fixes https://github.com/microsoft/vscode/issues/270811

* Update src/vs/workbench/api/browser/mainThreadAuthentication.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Tyler James Leonhardt 2025-10-14 16:06:20 -07:00 committed by GitHub
parent 62fdb96028
commit 286a752f5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.106.0",
"distro": "83bba123096af4c03a5f4419dc4e7f33d14e354c",
"distro": "cf7a6d44d8299723d955936df569ea424e6b68fd",
"author": {
"name": "Microsoft Corporation"
},

7
src/vs/base/common/oauth.ts
View File

@ -257,6 +257,13 @@ export interface IAuthorizationServerMetadata {
* OPTIONAL. JSON array containing a list of PKCE code challenge methods supported.
*/
code_challenge_methods_supported?: string[];
/**
* OPTIONAL. Boolean flag indicating whether the authorization server supports the
* client_id_metadata document.
* ref https://datatracker.ietf.org/doc/html/draft-parecki-oauth-client-id-metadata-document-03
*/
client_id_metadata_document_supported?: boolean;
}
/**

1
src/vs/base/common/product.ts
View File

@ -218,6 +218,7 @@ export interface IProductConfiguration {
readonly chatEntitlementUrl: string;
readonly mcpRegistryDataUrl: string;
};
readonly authClientIdMetadataUrl?: string;
readonly 'configurationSync.store'?: ConfigurationSyncStore;

8
src/vs/workbench/api/browser/mainThreadAuthentication.ts
View File

@ -28,6 +28,7 @@ import { IAuthorizationTokenResponse } from '../../../base/common/oauth.js';
import { IDynamicAuthenticationProviderStorageService } from '../../services/authentication/common/dynamicAuthenticationProviderStorage.js';
import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
import { IQuickInputService } from '../../../platform/quickinput/common/quickInput.js';
import { IProductService } from '../../../platform/product/common/productService.js';
export interface AuthenticationInteractiveOptions {
detail?: string;
@ -112,6 +113,7 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
constructor(
extHostContext: IExtHostContext,
@IProductService private readonly productService: IProductService,
@IAuthenticationService private readonly authenticationService: IAuthenticationService,
@IAuthenticationExtensionsService private readonly authenticationExtensionsService: IAuthenticationExtensionsService,
@IAuthenticationAccessService private readonly authenticationAccessService: IAuthenticationAccessService,
@ -153,11 +155,15 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
// Auth Provider Id is a combination of the authorization server and the resource, if provided.
const authProviderId = resource ? `${authorizationServer.toString(true)} ${resource.resource}` : authorizationServer.toString(true);
const clientDetails = await this.dynamicAuthProviderStorageService.getClientRegistration(authProviderId);
const clientId = clientDetails?.clientId;
let clientId = clientDetails?.clientId;
const clientSecret = clientDetails?.clientSecret;
let initialTokens: (IAuthorizationTokenResponse & { created_at: number })[] | undefined = undefined;
if (clientId) {
initialTokens = await this.dynamicAuthProviderStorageService.getSessionsForDynamicAuthProvider(authProviderId, clientId);
// If we don't already have a client id, check if the server supports the Client Id Metadata flow (see docs on the property)
// and add the "client id" if so.
} else if (serverMetadata.client_id_metadata_document_supported) {
clientId = this.productService.authClientIdMetadataUrl;
}
return await this._proxy.$registerDynamicAuthProvider(
authorizationServer,