Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-27 13:16:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wire in a auth callback parameter to indicate Copilot terms were shown to the user (microsoft/vscode-internalbacklog#5761) (#262439)

Browse Source 
* implement as a bag

* nit

---------

Co-authored-by: TylerLeonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
This commit is contained in:
Benjamin Pasero
2025-08-22 07:42:25 +02:00
committed by GitHub
parent 8c4dda46cd
commit d44d16c464
4 changed files with 61 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/github-authentication/src/github.ts
View File

@@ -44,6 +44,27 @@ interface GitHubAuthenticationProviderOptions extends vscode.AuthenticationProvi
* leaving it up to the user to choose the social sign-in provider on the sign-in page.
*/
readonly provider?: GitHubSocialSignInProvider;
readonly extraAuthorizeParameters?: Record<string, string>;
}
function isGitHubAuthenticationProviderOptions(object: any): object is GitHubAuthenticationProviderOptions {
if (!object || typeof object !== 'object') {
throw new Error('Options are not an object');
}
if (object.provider !== undefined && !isSocialSignInProvider(object.provider)) {
throw new Error(`Provider is invalid: ${object.provider}`);
}
if (object.extraAuthorizeParameters !== undefined) {
if (!object.extraAuthorizeParameters || typeof object.extraAuthorizeParameters !== 'object') {
throw new Error('Extra parameters must be a record of string keys and string values.');
}
for (const [key, value] of Object.entries(object.extraAuthorizeParameters)) {
if (typeof key !== 'string' || typeof value !== 'string') {
throw new Error('Extra parameters must be a record of string keys and string values.');
}
}
}
return true;
}
export class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
@@ -338,12 +359,15 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
scopes: JSON.stringify(scopes),
});
if (options && !isGitHubAuthenticationProviderOptions(options)) {
throw new Error('Invalid options');
}
const sessions = await this._sessionsPromise;
const loginWith = options?.account?.label;
const signInProvider = isSocialSignInProvider(options?.provider) ? options.provider : undefined;
const signInProvider = options?.provider;
this._logger.info(`Logging in with${signInProvider ? ` ${signInProvider}, ` : ''} '${loginWith ? loginWith : 'any'}' account...`);
const scopeString = sortedScopes.join(' ');
const token = await this._githubServer.login(scopeString, signInProvider, loginWith);
const token = await this._githubServer.login(scopeString, signInProvider, options?.extraAuthorizeParameters, loginWith);
const session = await this.tokenToSession(token, scopes);
this.afterSessionLoad(session);