Skip to content

FIX - wrong auth reid page #15

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
MeMMa137 merged 1 commit into from
May 5, 2026
Merged

FIX - wrong auth reid page #15

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion client/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ export default function App() {
}

if (PROTECTED.has(pathname) && !auth.user) {
window.location.replace("/api/auth/hackclub/login");
const returnTo = `${pathname}${window.location.search}${window.location.hash}`;
window.location.replace(`/api/auth/hackclub/login?returnTo=${encodeURIComponent(returnTo)}`);
return null;
}

Expand Down
19 changes: 17 additions & 2 deletions server/authRoutes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,26 @@ function clearBypassSession(req) {
delete req.session.devBypassLoggedOut;
}

function normalizeReturnTo(value) {
if (typeof value !== "string") return "/main";
const trimmed = value.trim();
if (!trimmed || !trimmed.startsWith("/") || trimmed.startsWith("//")) {
return "/main";
}
return trimmed;
}

export function createAuthRouter() {
const router = express.Router();

router.get("/hackclub/login", oauthStartLimiter, (req, res) => {
const returnTo = normalizeReturnTo(req.query?.returnTo);

if (shouldBypassAuth(req)) {
clearBypassSession(req);
req.session.devBypassUser = getLocalBypassUser();
res.redirect(302, `${getAppOrigin()}/main`);
req.session.devBypassReturnTo = returnTo;
res.redirect(302, `${getAppOrigin()}${returnTo}`);
return;
}

Expand All @@ -89,6 +101,7 @@ export function createAuthRouter() {

req.session.oauthState = state;
req.session.oauthRedirectUri = redirectUri;
req.session.oauthReturnTo = returnTo;

const url = getAuthorizeUrl({ state, redirectUri });
res.redirect(302, url);
Expand All @@ -97,6 +110,7 @@ export function createAuthRouter() {
router.get("/hackclub/callback", oauthCallbackLimiter, async (req, res) => {
const storedRedirectUri = req.session?.oauthRedirectUri;
const sessionState = req.session?.oauthState;
const returnTo = normalizeReturnTo(req.session?.oauthReturnTo);
const redirectUri =
typeof storedRedirectUri === "string" && storedRedirectUri
? storedRedirectUri
Expand All @@ -105,6 +119,7 @@ export function createAuthRouter() {
if (req.session) {
delete req.session.oauthState;
delete req.session.oauthRedirectUri;
delete req.session.oauthReturnTo;
}

const appOrigin = redirectUri ? appOriginFromRedirectUri(redirectUri) : getAppOrigin();
Expand Down Expand Up @@ -141,7 +156,7 @@ export function createAuthRouter() {
req.session.userId = user.id;
req.session.hackclubSub = user.hackclub_sub;

res.redirect(302, `${appOrigin}/main`);
res.redirect(302, `${appOrigin}${returnTo}`);
} catch (error) {
console.error("[auth] Hack Club callback failed:", error);
res.redirect(302, `${getAppOrigin()}/?error=oauth_callback`);
Expand Down