Skip to content

Commit

Permalink
Revert "feat: add postLoginRedirectURL support"
Browse files Browse the repository at this point in the history
This reverts commit d1e8dd5.
  • Loading branch information
DanielRivers committed Aug 19, 2024
1 parent d1e8dd5 commit db5fe69
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 21 deletions.
13 changes: 1 addition & 12 deletions src/runtime/server/api/callback.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,9 @@ import { useRuntimeConfig } from '#imports'
const config = useRuntimeConfig()

export default defineEventHandler(async (event) => {
const sessionManager = event.context.kinde.sessionManager

await getKindeClient().handleRedirectToApp(
sessionManager,
event.context.kinde!.sessionManager,
getRequestURL(event),
)

const postLoginRedirectURL = await sessionManager.getSessionItem('post-login-redirect-url') as string

if (postLoginRedirectURL) {
await sessionManager.removeSessionItem('post-login-redirect-url')
await sendRedirect(event, postLoginRedirectURL)
return
}

await sendRedirect(event, config.kinde.postLoginRedirectURL || '/')
})
9 changes: 1 addition & 8 deletions src/runtime/server/api/login.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@ import { useRuntimeConfig } from '#imports'
export default defineEventHandler(async (event) => {
const { kinde: kindeSettings } = useRuntimeConfig()
const query: Record<string, string> = getQuery(event)

const sessionManager = event.context.kinde.sessionManager

if (query.postLoginRedirectURL) {
sessionManager.setSessionItem('post-login-redirect-url', query.postLoginRedirectURL)
}

const loginURL = await getKindeClient().login(sessionManager, {
const loginURL = await getKindeClient().login(event.context.kinde.sessionManager, {
authUrlParams: {
audience: kindeSettings.audience,
...query,
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/server/middleware/kinde.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default defineEventHandler(async (event) => {

async function createSessionManager(event: H3Event): Promise<SessionManager> {
// TODO: improve memory session in future
const keysInCookie = ['refresh_token', 'access_token', 'id_token', 'ac-state-key', 'post-login-redirect-url']
const keysInCookie = ['refresh_token', 'access_token', 'id_token', 'ac-state-key']
const memorySession: Record<(typeof keysInCookie)[number], unknown> = {}

const config = useRuntimeConfig(event)
Expand Down

0 comments on commit db5fe69

Please sign in to comment.