fix redirect error

This commit is contained in:
nicwands
2026-06-01 11:49:10 -04:00
parent 6776a14757
commit a4cb4856d1
2 changed files with 67 additions and 56 deletions

View File

@@ -1,59 +1,63 @@
<template> <template>
<div class="preview-redirect"> <div class="preview-redirect">
<h1>Preview Handler</h1> <h1>Preview Handler</h1>
<div v-if="error" class="error"> <div v-if="error" class="error">
<h2>Debug Information</h2> <h2>Debug Information</h2>
<p><strong>Error:</strong> {{ error }}</p> <p><strong>Error:</strong> {{ error }}</p>
<p v-if="pageContext"><strong>PageContext keys:</strong> {{ pageContext.join(', ') }}</p> <p v-if="pageContext">
<pre v-if="urlParsed">{{ JSON.stringify(urlParsed, null, 2) }}</pre> <strong>PageContext keys:</strong> {{ pageContext.join(', ') }}
</p>
<pre v-if="urlParsed">{{ JSON.stringify(urlParsed, null, 2) }}</pre>
</div>
<div v-else-if="redirectUrl">
<p>Redirecting to preview...</p>
<p>
If you are not redirected automatically,
<a :href="redirectUrl">click here</a>.
</p>
</div>
<div v-else>
<p>Processing preview request...</p>
</div>
</div> </div>
<div v-else-if="redirectUrl">
<p>Redirecting to preview...</p>
<p>If you are not redirected automatically, <a :href="redirectUrl">click here</a>.</p>
</div>
<div v-else>
<p>Processing preview request...</p>
</div>
</div>
</template> </template>
<script setup> <script setup>
import { useData } from 'vike-vue/useData' import { useData } from 'vike-vue/useData'
import { onMounted } from 'vue' import { onMounted } from 'vue'
const data = useData() const { redirectUrl, error, pageContext, urlParsed } = useData()
const { redirectUrl, error, pageContext, urlParsed } = data
onMounted(() => { onMounted(() => {
if (redirectUrl) { if (redirectUrl) {
window.location.href = redirectUrl window.location.href = redirectUrl
} }
}) })
</script> </script>
<style scoped> <style scoped>
.preview-redirect { .preview-redirect {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
min-height: 50vh; min-height: 50vh;
text-align: center; text-align: center;
} }
h1 { h1 {
margin-bottom: 1rem; margin-bottom: 1rem;
} }
a { a {
color: #007bff; color: #007bff;
text-decoration: none; text-decoration: none;
} }
a:hover { a:hover {
text-decoration: underline; text-decoration: underline;
} }
</style> </style>

View File

@@ -5,33 +5,41 @@ export const data = async (pageContext) => {
// Extract URL parameters safely // Extract URL parameters safely
const { urlParsed } = pageContext const { urlParsed } = pageContext
const searchParams = urlParsed?.search || {} const searchParams = urlParsed?.search || {}
console.log('Preview route - pageContext keys:', Object.keys(pageContext)) console.log(
'Preview route - pageContext keys:',
Object.keys(pageContext),
)
console.log('Preview route - urlParsed:', urlParsed) console.log('Preview route - urlParsed:', urlParsed)
console.log('Preview route - searchParams:', searchParams) console.log('Preview route - searchParams:', searchParams)
const { const {
secret, secret,
path = '/', path = '/',
status = 'draft', status = 'draft',
documentId, documentId,
uid uid,
} = searchParams } = searchParams
// Validate preview secret // Validate preview secret
if (!secret || secret !== import.meta.env.VITE_PREVIEW_SECRET) { if (!secret || secret !== import.meta.env.VITE_PREVIEW_SECRET) {
console.log('Invalid secret:', secret, 'Expected:', import.meta.env.VITE_PREVIEW_SECRET) console.log(
'Invalid secret:',
secret,
'Expected:',
import.meta.env.VITE_PREVIEW_SECRET,
)
throw redirect('/preview-unauthorized') throw redirect('/preview-unauthorized')
} }
// Build the preview URL path (not full URL since we're redirecting within same origin) // Build the preview URL path (not full URL since we're redirecting within same origin)
const previewPath = path || '/' const previewPath = path || '/'
const previewUrl = new URL(previewPath, 'http://localhost') const previewUrl = new URL(previewPath, 'http://localhost')
// Add preview parameters // Add preview parameters
previewUrl.searchParams.set('preview', 'true') previewUrl.searchParams.set('preview', 'true')
previewUrl.searchParams.set('status', status) previewUrl.searchParams.set('status', status)
// Optional: include document metadata for advanced preview functionality // Optional: include document metadata for advanced preview functionality
if (documentId) { if (documentId) {
previewUrl.searchParams.set('documentId', documentId) previewUrl.searchParams.set('documentId', documentId)
@@ -39,27 +47,26 @@ export const data = async (pageContext) => {
if (uid) { if (uid) {
previewUrl.searchParams.set('uid', uid) previewUrl.searchParams.set('uid', uid)
} }
const redirectUrl = previewUrl.pathname + previewUrl.search const redirectUrl = previewUrl.pathname + previewUrl.search
console.log('Redirecting to:', redirectUrl) console.log('Redirecting to:', redirectUrl)
// Use Vike's redirect // Use Vike's redirect
throw redirect(redirectUrl) throw redirect(redirectUrl)
} catch (error) { } catch (error) {
// If it's a redirect, let it pass through // If it's a redirect, let it pass through
if (error.redirectTo) { if (error._isAbortError) {
throw error throw error
} }
console.error('Preview data error:', error) console.error('Preview data error:', error)
// For debugging, let's not redirect on error, but show what went wrong // For debugging, let's not redirect on error, but show what went wrong
return { return {
redirectUrl: null, redirectUrl: null,
error: error.message || 'Failed to process preview request', error: error.message || 'Failed to process preview request',
pageContext: Object.keys(pageContext), pageContext: Object.keys(pageContext),
urlParsed: pageContext.urlParsed urlParsed: pageContext.urlParsed,
} }
} }
} }