mirror of
https://github.com/yusufipk/OpenFrame.git
synced 2026-09-11 17:46:06 +00:00
feat(invitations): guide invited users without an account through sign-up
Clicking an invitation link while signed out dropped the visitor on a bare login form, even though most invitees have no account yet and nothing on screen told them to create one. Signed-out visitors now get the invitation itself: who invited them, which workspace/project, which role, and which address it was sent to. The primary call to action follows whether an account already exists for that address — "Create your account" when it does not, "Sign in to accept" when it does. The sign-up path carries the invitation forward, so a new account lands back on the invitation and from there on the shared workspace/project instead of the onboarding wizard: - the register link passes invitationToken, the invited email and a callbackUrl - the register form locks the email to the invited address and shows what is being joined - the verification email round-trips the destination through a sanitized `next` parameter - login and verify-email keep the pending destination in their sign-in links Signing in with a different address than the one invited now explains the mismatch instead of silently redirecting to the dashboard. Callback sanitization moves to lib/safe-redirect.ts so login, register, verify-email and the verification route share one open-redirect guard.
This commit is contained in:
@@ -3,6 +3,7 @@ import { consumeVerificationToken } from '@/lib/email-verification';
|
||||
import { rateLimit } from '@/lib/rate-limit';
|
||||
import { logError } from '@/lib/logger';
|
||||
import { getPublicOrigin } from '@/lib/request-origin';
|
||||
import { getSafeCallbackUrl } from '@/lib/safe-redirect';
|
||||
|
||||
// A raw 32-byte hex token is exactly 64 characters.
|
||||
const TOKEN_REGEX = /^[0-9a-f]{64}$/;
|
||||
@@ -31,7 +32,15 @@ export async function GET(request: NextRequest) {
|
||||
return redirectTo('/login?error=InvalidVerificationToken');
|
||||
}
|
||||
|
||||
return redirectTo('/login?verified=true');
|
||||
// Keep the post-verification destination (e.g. an invitation) if one was carried along.
|
||||
const next = getSafeCallbackUrl(request.nextUrl.searchParams.get('next'), {
|
||||
origin,
|
||||
fallback: '',
|
||||
});
|
||||
|
||||
return redirectTo(
|
||||
next ? `/login?verified=true&callbackUrl=${encodeURIComponent(next)}` : '/login?verified=true'
|
||||
);
|
||||
} catch (err) {
|
||||
logError('Email verification error:', err);
|
||||
return redirectTo('/login?error=VerificationFailed');
|
||||
|
||||
Reference in New Issue
Block a user