Skip to content

fix(auth): reject OAuth promise when popup is closed without completing login #1275

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

Open
deepak0x wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix(auth): reject OAuth promise when popup is closed without completing login #1275

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a14508
fix(auth): reject OAuth promise when popup is closed without completi…
deepak0x Apr 6, 2026
7d10bab
Merge branch 'develop' into fix/oauth-popup-promise-hang
deepak0x Apr 6, 2026
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
3 changes: 2 additions & 1 deletion packages/auth/src/loginWithRocketChatOAuth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const loginWithRocketChatOAuth = async (config: { api: Api }) => {
width=800,height=600,left=-1000,top=-1000,rel=opener`;
const popup = window.open(authorizeUrl, "Login", params);

return new Promise<any>((resolve) => {
return new Promise<any>((resolve, reject) => {
if (popup) {
const onMessage = async (e: MessageEvent) => {
if (e.origin !== new URL(config.api.baseUrl).origin) {
Expand All @@ -64,6 +64,7 @@ width=800,height=600,left=-1000,top=-1000,rel=opener`;
if (popup.closed) {
clearInterval(checkInterval);
window.removeEventListener("message", onMessage);
reject(new Error("OAuth login cancelled"));
}
}, 1000);
} else {
Expand Down