Skip to content

[EchoLayer (Stag)] Changes to OAuth service and update undefined state #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
squireai-staging wants to merge 1 commit into from
Closed

[EchoLayer (Stag)] Changes to OAuth service and update undefined state #589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion codex-vscode/src/services/oauth.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,14 @@ export class OAuthService implements IOAuthService {
);
}

// The Promise.race method is used here to race two promises against each other:
// 1. OAuthService.codeExchangePromise.promise - This promise resolves when the user completes the authorization process.
// 2. A timeout promise that rejects after 60 seconds, indicating the user did not complete the login in time.
// The first promise to settle (either resolve or reject) will determine the outcome of the authenticate method.
return Promise.race([
OAuthService.codeExchangePromise.promise,
new Promise<ErrorResponse>((_, reject) =>
setTimeout(() => {
// TODO we should make this alot simpler
this.clearCodeExchangePromise();
reject({
errorType: "cancelled",
Expand All @@ -46,6 +49,7 @@ export class OAuthService implements IOAuthService {
]);
}


// postAuthorization returns a function that is called from the promiseFromEvent function when the event is fired
private postAuthorization: () => PromiseAdapter<vscode.Uri, UserInfo> =
() =>
Expand Down