@@ -12,6 +12,8 @@ import { crypto } from './node/crypto';
12
12
import { fetching } from './node/fetch' ;
13
13
import { ExtensionHost , GitHubTarget , getFlows } from './flows' ;
14
14
import { NETWORK_ERROR , USER_CANCELLATION_ERROR } from './common/errors' ;
15
+ import { Config } from './config' ;
16
+ import { base64Encode } from './node/buffer' ;
15
17
16
18
// This is the error message that we throw if the login was cancelled for any reason. Extensions
17
19
// calling `getSession` can handle this error to know that the user cancelled the login.
@@ -22,6 +24,7 @@ const REDIRECT_URL_INSIDERS = 'https://insiders.vscode.dev/redirect';
22
24
23
25
export interface IGitHubServer {
24
26
login ( scopes : string ) : Promise < string > ;
27
+ logout ( session : vscode . AuthenticationSession ) : Promise < void > ;
25
28
getUserInfo ( token : string ) : Promise < { id : string ; accountName : string } > ;
26
29
sendAdditionalTelemetryInfo ( session : vscode . AuthenticationSession ) : Promise < void > ;
27
30
friendlyName : string ;
@@ -78,9 +81,14 @@ export class GitHubServer implements IGitHubServer {
78
81
}
79
82
80
83
// TODO@joaomoreno TODO@TylerLeonhardt
84
+ private _isNoCorsEnvironment : boolean | undefined ;
81
85
private async isNoCorsEnvironment ( ) : Promise < boolean > {
86
+ if ( this . _isNoCorsEnvironment !== undefined ) {
87
+ return this . _isNoCorsEnvironment ;
88
+ }
82
89
const uri = await vscode . env . asExternalUri ( vscode . Uri . parse ( `${ vscode . env . uriScheme } ://vscode.github-authentication/dummy` ) ) ;
83
- return ( uri . scheme === 'https' && / ^ ( ( i n s i d e r s \. ) ? v s c o d e | g i t h u b ) \. / . test ( uri . authority ) ) || ( uri . scheme === 'http' && / ^ l o c a l h o s t / . test ( uri . authority ) ) ;
90
+ this . _isNoCorsEnvironment = ( uri . scheme === 'https' && / ^ ( ( i n s i d e r s \. ) ? v s c o d e | g i t h u b ) \. / . test ( uri . authority ) ) || ( uri . scheme === 'http' && / ^ l o c a l h o s t / . test ( uri . authority ) ) ;
91
+ return this . _isNoCorsEnvironment ;
84
92
}
85
93
86
94
public async login ( scopes : string ) : Promise < string > {
@@ -144,6 +152,58 @@ export class GitHubServer implements IGitHubServer {
144
152
throw new Error ( userCancelled ? CANCELLATION_ERROR : 'No auth flow succeeded.' ) ;
145
153
}
146
154
155
+ public async logout ( session : vscode . AuthenticationSession ) : Promise < void > {
156
+ this . _logger . trace ( `Deleting session (${ session . id } ) from server...` ) ;
157
+
158
+ if ( ! Config . gitHubClientSecret ) {
159
+ this . _logger . warn ( 'No client secret configured for GitHub authentication. The token has been deleted with best effort on this system, but we are unable to delete the token on server without the client secret.' ) ;
160
+ return ;
161
+ }
162
+
163
+ // Only attempt to delete OAuth tokens. They are always prefixed with `gho_`.
164
+ // https://docs.github.com/en/rest/apps/oauth-applications#about-oauth-apps-and-oauth-authorizations-of-github-apps
165
+ if ( ! session . accessToken . startsWith ( 'gho_' ) ) {
166
+ this . _logger . warn ( 'The token being deleted is not an OAuth token. It has been deleted locally, but we cannot delete it on server.' ) ;
167
+ return ;
168
+ }
169
+
170
+ if ( ! isSupportedTarget ( this . _type , this . _ghesUri ) ) {
171
+ this . _logger . trace ( 'GitHub.com and GitHub hosted GitHub Enterprise are the only options that support deleting tokens on the server. Skipping.' ) ;
172
+ return ;
173
+ }
174
+
175
+ const authHeader = 'Basic ' + base64Encode ( `${ Config . gitHubClientId } :${ Config . gitHubClientSecret } ` ) ;
176
+ const uri = this . getServerUri ( `/applications/${ Config . gitHubClientId } /token` ) ;
177
+
178
+ try {
179
+ // Defined here: https://docs.github.com/en/rest/apps/oauth-applications?apiVersion=2022-11-28#delete-an-app-token
180
+ const result = await fetching ( uri . toString ( true ) , {
181
+ method : 'DELETE' ,
182
+ headers : {
183
+ Accept : 'application/vnd.github+json' ,
184
+ Authorization : authHeader ,
185
+ 'X-GitHub-Api-Version' : '2022-11-28' ,
186
+ 'User-Agent' : `${ vscode . env . appName } (${ vscode . env . appHost } )`
187
+ } ,
188
+ body : JSON . stringify ( { access_token : session . accessToken } ) ,
189
+ } ) ;
190
+
191
+ if ( result . status === 204 ) {
192
+ this . _logger . trace ( `Successfully deleted token from session (${ session . id } ) from server.` ) ;
193
+ return ;
194
+ }
195
+
196
+ try {
197
+ const body = await result . text ( ) ;
198
+ throw new Error ( body ) ;
199
+ } catch ( e ) {
200
+ throw new Error ( `${ result . status } ${ result . statusText } ` ) ;
201
+ }
202
+ } catch ( e ) {
203
+ this . _logger . warn ( 'Failed to delete token from server.' + e . message ?? e ) ;
204
+ }
205
+ }
206
+
147
207
private getServerUri ( path : string = '' ) {
148
208
const apiUri = this . baseUri ;
149
209
// github.com and Hosted GitHub Enterprise instances
0 commit comments