scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: netlify doesn't seem to handle redirects in a server action therefor we do the redirect on the client instead

Browse Source
This commit is contained in:
Joakim Jäderberg
2025-02-06 09:54:52 +00:00
parent 8ecaac4b52
commit c21d7bec62
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/error.tsx
View File

@@ -26,12 +26,12 @@ export default function Error({
return ( return (
<GenericError <GenericError
title={intl.formatMessage({ title={intl.formatMessage({
id: "We could not connect your accounts", id: "Something went wrong",
})} })}
> >
<Body textAlign="center"> <Body textAlign="center">
{intl.formatMessage({ {intl.formatMessage({
id: "We could not connect your accounts to give you access. Please contact us and we’ll help you resolve this issue.", id: "Please try again later",
})} })}
</Body> </Body>
<SASModalContactBlock /> <SASModalContactBlock />

13
app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/link/LinkAccountForm.tsx
View File

@@ -1,6 +1,7 @@
"use client" "use client"
import Image from "next/image" import Image from "next/image"
import { useRouter } from "next/navigation"
import { type ReactNode, useTransition } from "react" import { type ReactNode, useTransition } from "react"
import { FormProvider, useForm } from "react-hook-form" import { FormProvider, useForm } from "react-hook-form"
import { useIntl } from "react-intl" import { useIntl } from "react-intl"
@@ -24,8 +25,11 @@ export function LinkAccountForm({
onSubmit, onSubmit,
}: { }: {
initialDateOfBirth: string | null initialDateOfBirth: string | null
onSubmit: (dateOfBirth: string) => Promise<void> onSubmit: (
dateOfBirth: string
) => Promise<{ success: boolean; redirectUrl?: string }>
}) { }) {
const router = useRouter()
let [isPending, startTransition] = useTransition() let [isPending, startTransition] = useTransition()
const intl = useIntl() const intl = useIntl()
const form = useForm<LinkAccountForm>({ const form = useForm<LinkAccountForm>({
@@ -39,7 +43,12 @@ export function LinkAccountForm({
startTransition(async () => { startTransition(async () => {
if (!data.dateOfBirth || !data.termsAndConditions) return if (!data.dateOfBirth || !data.termsAndConditions) return
await onSubmit(data.dateOfBirth) const result = await onSubmit(data.dateOfBirth)
if (!result.success || !result.redirectUrl) {
throw new Error("Unable to redirect")
}
router.push(result.redirectUrl)
}) })
}) })

5
app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/link/page.tsx
View File

@@ -25,7 +25,10 @@ export default async function SASxScandicLinkPage({
console.log("updating date of birth") console.log("updating date of birth")
} }
redirect(`/${params.lang}/sas-x-scandic/login?intent=link`) return {
redirectUrl: `/${params.lang}/sas-x-scandic/login?intent=link`,
success: true,
}
} }
return alreadyLinked ? ( return alreadyLinked ? (

5
netlify.toml
View File

@@ -29,4 +29,7 @@ TERM = "xterm"
package = "@netlify/plugin-nextjs" package = "@netlify/plugin-nextjs"
[images] [images]
remote_images = ["https://imagevault-stage.scandichotels.com.*", "https://imagevault.scandichotels.com.*"] remote_images = [
"https://imagevault-stage.scandichotels.com.*",
"https://imagevault.scandichotels.com.*",
]