Skip to content

Feature/restore location post auth #233

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Feature/restore location post auth #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e7d7c8
Reworked session handling at beginOAuth2Flow to handle original locat…
eozden-wq Aug 21, 2025
64a4a09
Setting destination query param the right way
eozden-wq Aug 21, 2025
2800f95
Fixed dev bug with url hostname in destination query param on client-…
eozden-wq Aug 21, 2025
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
9 changes: 7 additions & 2 deletions client/src/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ async function getUserProfile(request: NextRequest): Promise<User | null> {
return userProfile?.data ?? null
}

function redirectUnauthenticated(_request: NextRequest) {
return NextResponse.redirect(new URL("/auth/keycloak/login", siteConfig.apiUrl))
function redirectUnauthenticated(request: NextRequest) {
const loginUrl = new URL("/auth/keycloak/login", siteConfig.apiUrl)
loginUrl.searchParams.set("destination", request.nextUrl.href)
return NextResponse.redirect(loginUrl)
}

function redirectForbidden(request: NextRequest) {
Expand All @@ -36,6 +38,9 @@ function redirectForbidden(request: NextRequest) {
}

export async function middleware(request: NextRequest) {
request.nextUrl.host = request.headers.get("Host") ?? request.nextUrl.host
if (request.headers.get("Host")?.indexOf(":") === -1) request.nextUrl.port = ""

if (request.nextUrl.pathname.startsWith("/dashboard")) {
const userProfile = await getUserProfile(request)
// if the user is not logged in, go back to root
Expand Down
14 changes: 11 additions & 3 deletions server/src/routes/auth/keycloak/keycloak-handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,20 @@ export class KeycloakHandlers {
return codeVerifier
}

private static rememberDestination(request: Request, response: Response, session: DurHackSession): void {
const destination = request.query.destination != null ? destinationUrlSchema.parse(request.query.destination) : null

if (session.redirectTo == null && destination?.href == null) return
if (session.redirectTo === destination?.href) return

session.redirectTo = destination?.href
response.sessionDirty = true
}

beginOAuth2Flow(): Middleware {
return async (request: Request, response: Response) => {
const destination =
request.query.destination != null ? destinationUrlSchema.parse(request.query.destination) : null
const session = await getSession(request, response)
session.redirectTo = destination?.href
KeycloakHandlers.rememberDestination(request, response, session)

this.lazyLogout(response, session)
const codeVerifier = this.getOrGenerateCodeVerifier(response, session)
Expand Down