Skip to content

fix(auth): add timeout handling for OAuth fetch requests #220

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

Merged
yash-pouranik merged 2 commits into from
May 27, 2026
Merged

fix(auth): add timeout handling for OAuth fetch requests #220

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
120a5f0
fix(auth): add timeout handling for oauth fetch requests
udaycodespace May 27, 2026
e5bf0a2
fix(auth): align AppError import with repo conventions
udaycodespace May 27, 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
45 changes: 32 additions & 13 deletions apps/dashboard-api/src/controllers/auth.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ const {
deleteAccountSchema,
onlyEmailSchema,
resetPasswordSchema,
verifyOtpSchema
verifyOtpSchema,
AppError
} = require("@urbackend/common");
const { emitEvent } = require('../utils/emitEvent');

Expand Down Expand Up @@ -87,20 +88,38 @@ const clearGithubStateCookie = (res) => {
});
};

const OAUTH_FETCH_TIMEOUT_MS = 10000;

const fetchJson = async (url, options, defaultMessage) => {
const response = await fetch(url, options);
const payload = await response.json().catch(() => null);

if (!response.ok) {
const message =
payload?.error_description ||
payload?.error ||
payload?.message ||
defaultMessage;
throw new Error(message);
}
// Prevent OAuth requests from hanging forever
const controller = new AbortController();
const timeout = setTimeout(() => controller.abort(), OAUTH_FETCH_TIMEOUT_MS);
Comment thread
yash-pouranik marked this conversation as resolved.

return payload;
try {
const response = await fetch(url, {
...(options || {}),
signal: controller.signal,
});
const payload = await response.json().catch(() => null);

if (!response.ok) {
const message =
payload?.error_description ||
payload?.error ||
payload?.message ||
defaultMessage;
throw new AppError(message, response.status || 502);
}

return payload;
} catch (err) {
if (err.name === 'AbortError') {
throw new AppError('OAuth request timed out.', 504);
}
throw err;
} finally {
clearTimeout(timeout);
}
};

const exchangeGithubCodeForToken = async ({ code, req }) => {
Expand Down
Loading