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

View File

@@ -6,7 +6,10 @@ export const data = async (pageContext) => {
const { urlParsed } = pageContext
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 - searchParams:', searchParams)
@@ -15,12 +18,17 @@ export const data = async (pageContext) => {
path = '/',
status = 'draft',
documentId,
uid
uid,
} = searchParams
// Validate 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')
}
@@ -45,10 +53,9 @@ export const data = async (pageContext) => {
// Use Vike's redirect
throw redirect(redirectUrl)
} catch (error) {
// If it's a redirect, let it pass through
if (error.redirectTo) {
if (error._isAbortError) {
throw error
}
@@ -59,7 +66,7 @@ export const data = async (pageContext) => {
redirectUrl: null,
error: error.message || 'Failed to process preview request',
pageContext: Object.keys(pageContext),
urlParsed: pageContext.urlParsed
urlParsed: pageContext.urlParsed,
}
}
}