Skip to content

Correct logout query params #135

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.

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 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/runtime/server/handler/logout.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useRuntimeConfig } from '#imports'
import { eventHandler, getQuery, getRequestURL, sendRedirect } from 'h3'
import { withQuery } from 'ufo'
import * as providerPresets from '../../providers'
import { configMerger, convertObjectToSnakeCase } from '../utils/oidc'
import { configMerger, convertObjectToCamelCase, convertObjectToSnakeCase } from '../utils/oidc'
import { clearUserSession, getUserSession } from '../utils/session'

export function logoutEventHandler({ onSuccess }: OAuthConfig<UserSession>) {
Expand All @@ -15,7 +15,7 @@ export function logoutEventHandler({ onSuccess }: OAuthConfig<UserSession>) {
const config = configMerger(useRuntimeConfig().oidc.providers[provider] as OidcProviderConfig, providerPresets[provider])

if (config.logoutUrl) {
const logoutParams = getQuery(event)
const logoutParams = convertObjectToCamelCase(getQuery(event))
const logoutRedirectUri = logoutParams.logoutRedirectUri || config.logoutRedirectUri

// Set logout_hint and id_token_hint dynamic parameters if specified. According to https://openid.net/specs/openid-connect-rpinitiated-1_0.html#RPLogout
Expand Down
9 changes: 8 additions & 1 deletion src/runtime/server/utils/oidc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { RefreshTokenRequest, TokenRequest, TokenRespose, UserSession } fro
import { createConsola } from 'consola'
import { createDefu } from 'defu'
import { sendRedirect } from 'h3'
import { snakeCase } from 'scule'
import { camelCase, snakeCase } from 'scule'
import { normalizeURL } from 'ufo'
import { textToBase64 } from 'undio'
import { createProviderFetch, type OidcProviderConfig } from './provider'
Expand Down Expand Up @@ -129,6 +129,13 @@ export function convertObjectToSnakeCase(object: Record<string, any>) {
}, {} as Record<string, any>)
}

export function convertObjectToCamelCase(object: Record<string, any>) {
return Object.entries(object).reduce((acc, [key, value]) => {
acc[camelCase(key)] = value
return acc
}, {} as Record<string, any>)
}

export async function oidcErrorHandler(event: H3Event, errorText: string, errorCode: number = 500) {
const logger = useOidcLogger()
await clearUserSession(event, true)
Expand Down