Merged in monorepo-step-1 (pull request #1080)

Migrate to a monorepo setup - step 1

* Move web to subfolder /apps/scandic-web

* Yarn + transitive deps

- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)

* Pin framer-motion to temporarily fix typing issue

https://github.com/adobe/react-spectrum/issues/7494

* Pin zod to avoid typ error

There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.

* Pin react-intl version

Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.

* Pin typescript version

Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.

* Setup workspaces

* Add design-system as a monorepo package

* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN

* Fix husky for monorepo setup

* Update netlify.toml

* Add lint script to root package.json

* Add stub readme

* Fix react-intl formatMessage types

* Test netlify.toml in root

* Remove root toml

* Update netlify.toml publish path

* Remove package-lock.json

* Update build for branch/preview builds


Approved-by: Linus Flood
This commit is contained in:
Anton Gunnarsson
2025-02-26 10:36:17 +00:00
committed by Linus Flood
parent 667cab6fb6
commit 80100e7631
2731 changed files with 30986 additions and 23708 deletions

View File

@@ -0,0 +1,3 @@
import { ProtectedLayout } from "@/components/ProtectedLayout"
export default ProtectedLayout

View File

@@ -0,0 +1,11 @@
import LoadingSpinner from "@/components/LoadingSpinner"
import { SASModal } from "./sas-x-scandic/components/SASModal"
export default function Loading() {
return (
<SASModal>
<LoadingSpinner />
</SASModal>
)
}

View File

@@ -0,0 +1,118 @@
import { cookies } from "next/headers"
import { redirect } from "next/navigation"
import { z } from "zod"
import { env } from "@/env/server"
import { serverClient } from "@/lib/trpc/server"
import { safeTry } from "@/utils/safeTry"
import { SAS_TOKEN_STORAGE_KEY, stateSchema } from "../sasUtils"
import type { NextRequest } from "next/server"
const searchParamsSchema = z.object({
code: z.string(),
state: z.string(),
})
const tokenResponseSchema = z.object({
access_token: z.string(),
expires_in: z.number(),
token_type: z.literal("Bearer"),
})
export async function GET(
request: NextRequest,
{ params }: { params: { lang: string } }
) {
const { lang } = params
const result = searchParamsSchema.safeParse({
code: request.nextUrl.searchParams.get("code"),
state: request.nextUrl.searchParams.get("state"),
})
if (!result.success) {
console.error("[SAS] Invalid search params", result.error)
redirect(`/${lang}/sas-x-scandic/error?errorCode=invalid_query`)
}
const { code, state } = result.data
const tokenResponse = await fetch(
new URL("oauth/token", env.SAS_AUTH_ENDPOINT),
{
method: "POST",
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
body: new URLSearchParams({
grant_type: "authorization_code",
code: code,
redirect_uri: new URL(
`/${lang}/sas-x-scandic/callback`,
new URL(env.PUBLIC_URL)
).toString(),
client_id: env.SAS_AUTH_CLIENTID,
}),
}
)
if (!tokenResponse.ok) {
const error = await tokenResponse.text()
console.error("[SAS] Failed to get token", error)
redirect(`/${lang}/sas-x-scandic/error?errorCode=token_error`)
}
const tokenData = tokenResponseSchema.parse(await tokenResponse.json())
const stateResult = stateSchema.safeParse(
JSON.parse(decodeURIComponent(state))
)
if (!stateResult.success) {
redirect(`/${lang}/sas-x-scandic/error?errorCode=invalid_state`)
}
const cookieStore = cookies()
cookieStore.set(SAS_TOKEN_STORAGE_KEY, tokenData.access_token, {
maxAge: 3600,
httpOnly: true,
})
if (
stateResult.data.intent === "link" ||
stateResult.data.intent === "unlink"
) {
const [data, error] = await safeTry(
serverClient().partner.sas.requestOtp({})
)
if (!data || error) {
console.error("[SAS] Failed to request OTP", error)
redirect(`/${lang}/sas-x-scandic/error`)
}
switch (data.status) {
case "ABUSED":
redirect(`/${params.lang}/sas-x-scandic/error?errorCode=tooManyCodes`)
case "NOTSENT":
redirect(`/${params.lang}/sas-x-scandic/error`)
case "NULL":
case "RETRY":
case "EXPIRED":
// These errors should never happen for request, but according to the API spec they can
throw new Error(`Unhandled request OTP status ${data.status}`)
}
console.log("[SAS] Request OTP response", data)
const otpUrl = new URL(
`/${lang}/sas-x-scandic/otp`,
new URL(env.PUBLIC_URL)
)
otpUrl.searchParams.set("intent", stateResult.data.intent)
otpUrl.searchParams.set("to", data.otpReceiver)
redirect(otpUrl.toString())
}
redirect(`/${lang}/sas-x-scandic/error?errorCode=unknown_intent`)
}

View File

@@ -0,0 +1,40 @@
"use client"
import Link from "next/link"
import { useIntl } from "react-intl"
import { scandicXSAS } from "@/constants/routes/myPages"
import ErrorCircleFilledIcon from "@/components/Icons/ErrorCircleFilled"
import Button from "@/components/TempDesignSystem/Button"
import Body from "@/components/TempDesignSystem/Text/Body"
import Title from "@/components/TempDesignSystem/Text/Title"
import useLang from "@/hooks/useLang"
import { SASModal, SASModalContactBlock, SASModalDivider } from "./SASModal"
export function AlreadyLinkedError() {
const intl = useIntl()
const lang = useLang()
return (
<SASModal>
<ErrorCircleFilledIcon height={64} width={64} color="red" />
<Title as="h2" level="h1" textAlign="center" textTransform="regular">
{intl.formatMessage({ id: "Accounts are already linked" })}
</Title>
<Body textAlign="center">
{/* TODO copy */}
{intl.formatMessage({
id: "We could not connect your accounts to give you access. Please contact us and well help you resolve this issue.",
})}
</Body>
<Button theme="base" asChild>
<Link href={scandicXSAS[lang]}>
{intl.formatMessage({ id: "View your account" })}
</Link>
</Button>
<SASModalDivider />
<SASModalContactBlock />
</SASModal>
)
}

View File

@@ -0,0 +1,40 @@
"use client"
import { Link } from "react-aria-components"
import { useIntl } from "react-intl"
import { profile } from "@/constants/routes/myPages"
import ErrorCircleFilledIcon from "@/components/Icons/ErrorCircleFilled"
import Button from "@/components/TempDesignSystem/Button"
import Body from "@/components/TempDesignSystem/Text/Body"
import Title from "@/components/TempDesignSystem/Text/Title"
import useLang from "@/hooks/useLang"
import { SASModal, SASModalContactBlock, SASModalDivider } from "./SASModal"
export function DateOfBirthError() {
const intl = useIntl()
const lang = useLang()
return (
<SASModal>
<ErrorCircleFilledIcon height={64} width={64} color="red" />
<Title as="h2" level="h1" textAlign="center" textTransform="regular">
{intl.formatMessage({ id: "Date of birth not matching" })}
</Title>
<Body textAlign="center">
{/* TODO copy */}
{intl.formatMessage({
id: "We could not connect your accounts to give you access. Please contact us and well help you resolve this issue.",
})}
</Body>
<Button theme="base">
<Link href={profile[lang]}>
{intl.formatMessage({ id: "View your account" })}
</Link>
</Button>
<SASModalDivider />
<SASModalContactBlock />
</SASModal>
)
}

View File

@@ -0,0 +1,28 @@
"use client"
import { useIntl } from "react-intl"
import Button from "@/components/TempDesignSystem/Button"
import Body from "@/components/TempDesignSystem/Text/Body"
import { GenericError } from "./GenericError"
export function FailedAttemptsError() {
const intl = useIntl()
return (
<GenericError
title={intl.formatMessage({ id: "Too many failed attempts" })}
variant="info"
>
<Body textAlign="center">
{intl.formatMessage({
id: "Please wait 1 hour before trying again.",
})}
</Body>
<Button theme="base" disabled>
{intl.formatMessage({ id: "Send new code" })}
</Button>
</GenericError>
)
}

View File

@@ -0,0 +1,39 @@
"use client"
import Image from "next/image"
import ErrorCircleFilledIcon from "@/components/Icons/ErrorCircleFilled"
import Title from "@/components/TempDesignSystem/Text/Title"
import { SASModal } from "./SASModal"
import type { ReactNode } from "react"
export function GenericError({
title,
variant = "error",
children,
}: {
title: ReactNode
variant?: "error" | "info"
children: ReactNode
}) {
return (
<SASModal>
{variant === "error" ? (
<ErrorCircleFilledIcon height={64} width={64} color="red" />
) : (
<Image
src="/_static/img/scandic-loyalty-time.svg"
alt=""
width={140}
height={110}
style={{ marginTop: 16 }}
/>
)}
<Title as="h3" level="h1" textAlign="center" textTransform="regular">
{title}
</Title>
{children}
</SASModal>
)
}

View File

@@ -0,0 +1,45 @@
.container {
display: flex;
flex-direction: column;
align-items: center;
gap: var(--Spacing-x3);
background-color: white;
width: 100%;
padding: var(--Spacing-x3) var(--Spacing-x3) var(--Spacing-x4);
text-align: center;
border-radius: var(--Corner-radius-Medium) var(--Corner-radius-Medium) 0 0;
margin-top: auto;
@media screen and (min-width: 768px) {
& {
border-radius: var(--Corner-radius-Medium);
margin-top: initial;
width: 560px;
}
}
}
.divider {
width: 100%;
position: relative;
& > span {
position: relative;
padding: 0 var(--Spacing-x2);
background-color: white;
}
&::before {
position: absolute;
bottom: calc(50% - 1px);
content: "";
display: block;
height: 1px;
width: 100%;
background-color: var(--Base-Border-Subtle);
}
}
.contactBlockTitle {
margin-bottom: var(--Spacing-x1);
}

View File

@@ -0,0 +1,53 @@
"use client"
import { useIntl } from "react-intl"
import Link from "@/components/TempDesignSystem/Link"
import Body from "@/components/TempDesignSystem/Text/Body"
import Title from "@/components/TempDesignSystem/Text/Title"
import styles from "./SASModal.module.css"
export function SASModal({ children }: { children: React.ReactNode }) {
return <section className={styles.container}>{children}</section>
}
export function SASModalDivider() {
const intl = useIntl()
return (
<div className={styles.divider}>
<Body asChild color="uiTextPlaceholder">
<span>{intl.formatMessage({ id: "or" })}</span>
</Body>
</div>
)
}
export function SASModalContactBlock() {
const intl = useIntl()
const phone = intl.formatMessage({ id: "+46 8 517 517 00" })
return (
<div style={{ display: "flex", flexDirection: "column" }}>
<Title
level="h4"
as="h3"
textTransform="regular"
className={styles.contactBlockTitle}
>
{intl.formatMessage({ id: "Contact our memberservice" })}
</Title>
<Link
href={`tel:${phone.replaceAll(" ", "")}`}
textDecoration="underline"
>
{phone}
</Link>
<Link href="mailto:member@scandichotels.com" textDecoration="underline">
member@scandichotels.com
</Link>
</div>
)
}

View File

@@ -0,0 +1,28 @@
"use client"
import { useIntl } from "react-intl"
import Button from "@/components/TempDesignSystem/Button"
import Body from "@/components/TempDesignSystem/Text/Body"
import { GenericError } from "./GenericError"
export function TooManyCodesError() {
const intl = useIntl()
return (
<GenericError
title={intl.formatMessage({ id: "Youve requested too many codes" })}
variant="info"
>
<Body textAlign="center">
{intl.formatMessage({
id: "Please wait 1 hour before trying again.",
})}
</Body>
<Button theme="base" disabled>
{intl.formatMessage({ id: "Send new code" })}
</Button>
</GenericError>
)
}

View File

@@ -0,0 +1,28 @@
"use client"
import { useIntl } from "react-intl"
import Button from "@/components/TempDesignSystem/Button"
import Body from "@/components/TempDesignSystem/Text/Body"
import { GenericError } from "./GenericError"
export function TooManyFailedAttemptsError() {
const intl = useIntl()
return (
<GenericError
title={intl.formatMessage({ id: "Too many failed attempts." })}
variant="info"
>
<Body textAlign="center">
{intl.formatMessage({
id: "Please wait 1 hour before trying again.",
})}
</Body>
<Button theme="base" disabled>
{intl.formatMessage({ id: "Send new code" })}
</Button>
</GenericError>
)
}

View File

@@ -0,0 +1,40 @@
"use client"
import * as Sentry from "@sentry/nextjs"
import { useEffect } from "react"
import { useIntl } from "react-intl"
import Body from "@/components/TempDesignSystem/Text/Body"
import { GenericError } from "./components/GenericError"
import { SASModalContactBlock } from "./components/SASModal"
export default function Error({
error,
}: {
error: Error & { digest?: string }
}) {
const intl = useIntl()
useEffect(() => {
if (!error) return
console.error(error)
Sentry.captureException(error)
}, [error])
return (
<GenericError
title={intl.formatMessage({
id: "Something went wrong",
})}
>
<Body textAlign="center">
{intl.formatMessage({
id: "Please try again later",
})}
</Body>
<SASModalContactBlock />
</GenericError>
)
}

View File

@@ -0,0 +1,50 @@
import Body from "@/components/TempDesignSystem/Text/Body"
import { getIntl } from "@/i18n"
import { AlreadyLinkedError } from "../components/AlreadyLinkedError"
import { DateOfBirthError } from "../components/DateOfBirthError"
import { GenericError } from "../components/GenericError"
import { SASModalContactBlock } from "../components/SASModal"
import { TooManyCodesError } from "../components/TooManyCodesError"
import { TooManyFailedAttemptsError } from "../components/TooManyFailedAttemptsError"
import type { LangParams, PageArgs, SearchParams } from "@/types/params"
export default async function Page({
searchParams,
}: PageArgs<LangParams> & SearchParams<{ errorCode?: "dateOfBirthMismatch" }>) {
const intl = await getIntl()
const { errorCode } = searchParams
if (errorCode === "dateOfBirthMismatch") {
return <DateOfBirthError />
}
if (errorCode === "tooManyFailedAttempts") {
return <TooManyFailedAttemptsError />
}
if (errorCode === "tooManyCodes") {
return <TooManyCodesError />
}
if (errorCode === "alreadyLinked") {
return <AlreadyLinkedError />
}
return (
<GenericError
title={intl.formatMessage({
id: "We could not connect your accounts",
})}
>
<Body textAlign="center">
{intl.formatMessage({
id: "We could not connect your accounts to give you access. Please contact us and well help you resolve this issue.",
})}
</Body>
<SASModalContactBlock />
</GenericError>
)
}

View File

@@ -0,0 +1,53 @@
.layout {
background-size: cover;
background-position: center;
height: 100vh;
display: grid;
grid-template-rows: 80px 1fr;
}
.header {
background: white;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
justify-content: center;
align-items: center;
padding: 0 var(--Spacing-x2);
}
.content {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.logo {
margin-left: auto;
margin-right: auto;
}
.backLink {
align-items: center;
color: var(--Scandic-Brand-Burgundy);
display: flex;
font-size: var(--Spacing-x2);
gap: var(--Spacing-x1);
.long {
display: none;
}
}
@media screen and (min-width: 768px) {
.backLink {
.short {
display: none;
}
.long {
display: block;
}
}
}

View File

@@ -0,0 +1,62 @@
import { ArrowLeft } from "react-feather"
import { overview as profileOverview } from "@/constants/routes/myPages"
import Image from "@/components/Image"
import Link from "@/components/TempDesignSystem/Link"
import { getIntl } from "@/i18n"
import background from "@/public/_static/img/partner/sas/sas_x_scandic_airplane_window_background.jpg"
import styles from "./layout.module.css"
import type { PropsWithChildren } from "react"
import type { LangParams, LayoutArgs } from "@/types/params"
export default async function SasXScandicLayout({
children,
params,
}: PropsWithChildren<LayoutArgs<LangParams>>) {
const intl = await getIntl()
return (
<div
className={styles.layout}
style={{ backgroundImage: `url(${background.src})` }}
>
<header className={styles.header}>
{/* TODO should this link to my-pages sas page? */}
<Link className={styles.backLink} href={profileOverview[params.lang]}>
<ArrowLeft height={20} width={20} />
<span className={styles.long}>
{intl.formatMessage({ id: "Back to scandichotels.com" })}
</span>
<span className={styles.short}>
{intl.formatMessage({ id: "Back" })}
</span>
</Link>
<MainMenuLogo />
</header>
<section className={styles.content}>{children}</section>
</div>
)
}
async function MainMenuLogo() {
const intl = await getIntl()
return <Logo alt={intl.formatMessage({ id: "Back to scandichotels.com" })} />
}
function Logo({ alt }: { alt: string }) {
return (
<Image
alt={alt}
className={styles.logo}
height={22}
src="/_static/img/scandic-logotype.svg"
priority
width={103}
/>
)
}

View File

@@ -0,0 +1,149 @@
"use client"
import Image from "next/image"
import { useParams, useRouter } from "next/navigation"
import { useTransition } from "react"
import { FormProvider, useForm } from "react-hook-form"
import { useIntl } from "react-intl"
import { profileEdit } from "@/constants/routes/myPages"
import { ArrowRightIcon } from "@/components/Icons"
import Button from "@/components/TempDesignSystem/Button"
import Checkbox from "@/components/TempDesignSystem/Form/Checkbox"
import Label from "@/components/TempDesignSystem/Form/Label"
import Link from "@/components/TempDesignSystem/Link"
import Body from "@/components/TempDesignSystem/Text/Body"
import Title from "@/components/TempDesignSystem/Text/Title"
import styles from "./link-sas.module.css"
import type { LangParams } from "@/types/params"
type LinkAccountForm = {
termsAndConditions: boolean
}
export function LinkAccountForm({
userDateOfBirth,
}: {
userDateOfBirth: string | null
}) {
const router = useRouter()
const params = useParams<LangParams>()
let [isPending, startTransition] = useTransition()
const intl = useIntl()
const form = useForm<LinkAccountForm>({
defaultValues: {
termsAndConditions: false,
},
})
const handleSubmit = form.handleSubmit((data) => {
startTransition(async () => {
if (!data.termsAndConditions) return
const url = `/${params.lang}/sas-x-scandic/login?intent=link`
router.push(url)
})
})
const termsAndConditions = form.watch("termsAndConditions")
const disableSubmit = !userDateOfBirth || !termsAndConditions
return (
<FormProvider {...form}>
<form onSubmit={handleSubmit} className={styles.form}>
<div className={styles.titles}>
<Image
alt={"Scandic ❤️ SAS"}
height={25}
width={182}
src="/_static/img/partner/sas/sas-campaign-logo.png"
/>
<Title level="h3" textTransform="regular">
{intl.formatMessage({ id: "Link your accounts" })}
</Title>
</div>
<div className={styles.dateOfBirth}>
<Body textTransform="bold">
{userDateOfBirth
? intl.formatMessage(
{
id: "Birth date: {dateOfBirth, date, ::MMMM d yyyy}",
},
{
dateOfBirth: new Date(userDateOfBirth),
}
)
: intl.formatMessage({ id: "Birth date is missing" })}
</Body>
<Label size="small" className={styles.dateOfBirthDescription}>
{intl.formatMessage({
id: "We require your birth date in order to link your Scandic account with your SAS EuroBonus account. Please check that it is correct.",
})}
</Label>
<Link
href={profileEdit[params.lang]}
className={styles.dateOfBirthLink}
color="peach80"
variant="underscored"
>
{intl.formatMessage({
id: "Edit your personal details",
})}
<ArrowRightIcon color="peach80" height={18} width={18} />
</Link>
</div>
<div className={styles.termsAndConditions}>
<Checkbox
name="termsAndConditions"
registerOptions={{
required: {
value: true,
message: intl.formatMessage({
id: "You must accept the terms and conditions",
}),
},
disabled: !userDateOfBirth,
}}
>
<Body>
{intl.formatMessage({ id: "I accept the terms and conditions" })}
</Body>
</Checkbox>
<Body className={styles.termsDescription}>
{intl.formatMessage(
{
id: "By linking your accounts you accept the <sasScandicTermsAndConditionsLink>Scandic Friends & SAS Terms and Conditions</sasScandicTermsAndConditionsLink>. You will be connected throughout the duration of your employment or until further notice, and you can opt out at any time.",
},
{
sasScandicTermsAndConditionsLink: (str) => (
<Link
// TODO correct link
href={"#"}
weight="bold"
variant="default"
textDecoration="underline"
>
{str}
</Link>
),
}
)}
</Body>
</div>
<div className={styles.ctaContainer}>
<Button
theme="base"
fullWidth
className={styles.ctaButton}
type="submit"
disabled={isPending || disableSubmit}
>
{intl.formatMessage({ id: "Link my accounts" })}
</Button>
</div>
</form>
</FormProvider>
)
}

View File

@@ -0,0 +1,55 @@
.titles {
display: flex;
flex-direction: column;
align-items: center;
gap: var(--Spacing-x2);
margin-top: var(--Spacing-x3);
}
.dateOfBirth {
display: flex;
flex-direction: column;
gap: var(--Spacing-x1);
width: 100%;
background-color: var(--Main-Brand-WarmWhite);
padding: var(--Spacing-x2) var(--Spacing-x3);
}
.dateOfBirthLink {
display: flex;
align-items: center;
gap: var(--Spacing-x-half);
}
.dateOfBirthDescription {
color: var(--UI-Text-High-contrast);
}
.termsAndConditions {
display: flex;
flex-direction: column;
gap: var(--Spacing-x2);
}
.termsDescription {
margin-left: calc(var(--Spacing-x4) + var(--Spacing-x-half));
}
.ctaContainer {
display: flex;
justify-content: center;
padding: var(--Spacing-x3) var(--Spacing-x3) 0;
width: calc(100% + var(--Spacing-x3) + var(--Spacing-x3));
border-top: 1px solid var(--Base-Border-Subtle);
}
.ctaButton {
max-width: 350px;
}
.form {
display: flex;
flex-direction: column;
align-items: center;
gap: var(--Spacing-x3);
}

View File

@@ -0,0 +1,28 @@
import { redirect } from "next/navigation"
import React from "react"
import { getProfileSafely } from "@/lib/trpc/memoizedRequests"
import { SASModal } from "../components/SASModal"
import { LinkAccountForm } from "./LinkAccountForm"
import type { LangParams, PageArgs } from "@/types/params"
export default async function SASxScandicLinkPage({
params,
}: PageArgs<LangParams>) {
const profile = await getProfileSafely()
// TODO check if already linked
const alreadyLinked = false
if (alreadyLinked) {
redirect(`/${params.lang}/sas-x-scandic/error?errorCode=alreadyLinked`)
}
return (
<SASModal>
<LinkAccountForm userDateOfBirth={profile?.dateOfBirth ?? null} />
</SASModal>
)
}

View File

@@ -0,0 +1,41 @@
import React from "react"
import { scandicXSAS } from "@/constants/routes/myPages"
import CheckCircle from "@/components/Icons/CheckCircle"
import { Redirect } from "@/components/Redirect"
import Body from "@/components/TempDesignSystem/Text/Body"
import Title from "@/components/TempDesignSystem/Text/Title"
import { getIntl } from "@/i18n"
import { SASModal } from "../../components/SASModal"
import type { LangParams, PageArgs } from "@/types/params"
export default async function SASxScandicLinkPage({
params,
}: PageArgs<LangParams>) {
const intl = await getIntl()
return (
<SASModal>
<Redirect url={scandicXSAS[params.lang]} timeout={3000} />
<CheckCircle height={64} width={64} color="uiSemanticSuccess" />
<Title as="h2" level="h1" textAlign="center">
{intl.formatMessage({ id: "Your accounts are connected" })}
</Title>
<div>
<Body textAlign="center">
{intl.formatMessage({
id: "We successfully connected your accounts!",
})}
</Body>
<Body textAlign="center">
{intl.formatMessage({
id: "Redirecting you to my pages.",
})}
</Body>
</div>
</SASModal>
)
}

View File

@@ -0,0 +1,102 @@
import { redirect } from "next/navigation"
import React from "react"
import { z } from "zod"
import { env } from "@/env/server"
import Image from "@/components/Image"
import { Redirect } from "@/components/Redirect"
import Link from "@/components/TempDesignSystem/Link"
import Body from "@/components/TempDesignSystem/Text/Body"
import Footnote from "@/components/TempDesignSystem/Text/Footnote"
import Title from "@/components/TempDesignSystem/Text/Title"
import { getIntl } from "@/i18n"
import { SASModal } from "../components/SASModal"
import type { FormatXMLElementFn } from "intl-messageformat"
import type { LangParams, PageArgs, SearchParams } from "@/types/params"
import type { State } from "../sasUtils"
const searchParamsSchema = z.object({
intent: z.enum(["link", "unlink"]),
})
type Intent = z.infer<typeof searchParamsSchema>["intent"]
export default async function SASxScandicLoginPage({
searchParams,
params,
}: PageArgs<LangParams> & SearchParams) {
const result = searchParamsSchema.safeParse(searchParams)
if (!result.success) {
// TOOD where to redirect?
redirect(`/${params.lang}/sas-x-scandic/link`)
}
const parsedParams = result.data
const intl = await getIntl()
const redirectUri = new URL(
"/en/sas-x-scandic/callback",
env.PUBLIC_URL
).toString()
const state: State = { intent: parsedParams.intent }
const urlState = encodeURIComponent(JSON.stringify(state))
const clientId = env.SAS_AUTH_CLIENTID
const sasLoginHostname = env.SAS_AUTH_ENDPOINT
const audience = "eb-partner-api"
const scope = encodeURIComponent("openid profile email")
const loginLink = `${sasLoginHostname}/oauth/authorize?response_type=code&client_id=${clientId}&redirect_uri=${redirectUri}&scope=${scope}&state=${urlState}&audience=${audience}`
const intentDescriptions: Record<Intent, string> = {
link: intl.formatMessage({
id: "In order to verify your account linking we will ask you to sign in to your SAS EuroBonus account.",
}),
unlink: intl.formatMessage({
id: "Log in to your SAS Eurobonus account to confirm account unlinking.",
}),
}
return (
<SASModal>
<Redirect url={loginLink} timeout={3000} />
<Image
src="/_static/img/scandic-loyalty-time.svg"
alt=""
width="140"
height="110"
style={{ marginTop: 16 }}
/>
<Title as="h2" level="h1" textTransform="regular">
{intl.formatMessage({ id: "Redirecting you to SAS" })}
</Title>
<Body textAlign="center">{intentDescriptions[parsedParams.intent]}</Body>
<Footnote textAlign="center">
{intl.formatMessage<
React.ReactNode,
FormatXMLElementFn<React.ReactNode>
>(
{
id: "If you are not redirected automatically, please <loginLink>click here</loginLink>.",
},
{
loginLink: (str) => (
<Link
href={loginLink}
color="red"
variant="default"
size="tiny"
textDecoration="underline"
>
{str}
</Link>
),
}
)}
</Footnote>
</SASModal>
)
}

View File

@@ -0,0 +1,92 @@
.container-modal {
display: flex;
flex-direction: column;
align-items: center;
gap: var(--Spacing-x3);
background-color: white;
width: 100%;
padding: var(--Spacing-x3);
text-align: center;
border-radius: var(--Corner-radius-Medium) var(--Corner-radius-Medium) 0 0;
margin-top: auto;
@media screen and (min-width: 768px) {
& {
border-radius: var(--Corner-radius-Medium);
margin-top: initial;
width: 512px;
}
}
}
.otp-container {
display: flex;
gap: var(--Spacing-x1);
@media screen and (min-width: 768px) {
& {
gap: var(--Spacing-x2);
}
}
&.error .slot {
border: 1px solid var(--UI-Text-Error);
}
}
.slot {
position: relative;
display: flex;
align-items: center;
justify-content: center;
box-sizing: content-box;
width: 34px;
height: 0px;
padding: var(--Spacing-x3) 0;
font-family: var(--typography-Body-Regular-fontFamily);
border: 1px solid var(--Base-Border-Normal);
border-radius: var(--Corner-radius-Medium);
text-align: center;
&.active {
border: 1px solid var(--UI-Text-Active);
outline: 1px solid var(--UI-Text-Active);
}
}
.caret {
position: absolute;
pointer-events: none;
inset: 0;
display: flex;
align-items: center;
justify-content: center;
animation: blink 1s infinite;
& .child {
width: 1px;
height: 16px;
background-color: var(--UI-Text-Active);
}
}
.disabled-link {
cursor: default;
color: var(--UI-Text-Disabled);
opacity: 0.4;
}
.error-message {
display: flex;
align-items: center;
gap: var(--Spacing-x1);
}
@keyframes blink {
0%,
100% {
opacity: 1;
}
50% {
opacity: 0;
}
}

View File

@@ -0,0 +1,223 @@
"use client"
import { cx } from "class-variance-authority"
import { OTPInput, type SlotProps } from "input-otp"
import { useParams, useRouter } from "next/navigation"
import { type ReactNode, useState, useTransition } from "react"
import { useIntl } from "react-intl"
import { trpc } from "@/lib/trpc/client"
import ErrorCircleFilledIcon from "@/components/Icons/ErrorCircleFilled"
import Link from "@/components/TempDesignSystem/Link"
import Body from "@/components/TempDesignSystem/Text/Body"
import Caption from "@/components/TempDesignSystem/Text/Caption"
import Footnote from "@/components/TempDesignSystem/Text/Footnote"
import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
import { GenericError } from "../components/GenericError"
import { SASModal, SASModalContactBlock } from "../components/SASModal"
import Loading from "./loading"
import styles from "./OneTimePasswordForm.module.css"
import type { RequestOtpError } from "@/server/routers/partners/sas/otp/request/requestOtpError"
import type { OtpError } from "./page"
type Redirect = { url: string; type?: "replace" | "push" }
export type OnSubmitHandler = (args: { otp: string }) => Promise<Redirect>
export default function OneTimePasswordForm({
heading,
ingress,
footnote,
otpLength,
onSubmit,
error,
}: {
heading: string
ingress: string | ReactNode
footnote?: string | ReactNode
otpLength: number
onSubmit: OnSubmitHandler
error?: OtpError
}) {
const router = useRouter()
const params = useParams()
const [isPending, startTransition] = useTransition()
const [disableResend, setDisableResend] = useState(false)
const intl = useIntl()
const [otp, setOtp] = useState("")
const requestOtp = trpc.partner.sas.requestOtp.useMutation({})
if (requestOtp.isPending || isPending) {
return <Loading />
}
if (requestOtp.isError) {
const cause = requestOtp.error?.data?.cause as RequestOtpError
const title = intl.formatMessage({ id: "Error requesting OTP" })
const body = getRequestErrorBody(intl, cause?.errorCode)
return (
<GenericError title={title}>
<Body textAlign="center">{body}</Body>
<SASModalContactBlock />
</GenericError>
)
}
switch (requestOtp.data?.status) {
case "ABUSED":
router.push(`/${params.lang}/sas-x-scandic/error?errorCode=tooManyCodes`)
return <Loading />
case "NOTSENT":
router.push(`/${params.lang}/sas-x-scandic/error`)
return <Loading />
case "NULL":
case "RETRY":
case "EXPIRED":
// These errors should never happen for request, but according to the API spec they can
throw new Error(`Unhandled request OTP status ${requestOtp.data?.status}`)
}
function handleRequestNewOtp(event: React.MouseEvent) {
event.preventDefault()
if (disableResend) return
setOtp("")
requestOtp.reset()
requestOtp.mutate({})
setDisableResend(true)
setTimeout(() => {
setDisableResend(false)
}, 15_000)
}
function handleOTPEntered(otp: string) {
startTransition(async () => {
const redirectRes = await onSubmit({ otp })
setOtp("")
if (redirectRes.type === "replace") {
router.replace(redirectRes.url)
return
}
router.push(redirectRes.url)
})
}
const getResendOtpLink = (str: ReactNode) => (
<Link
href="#"
onClick={handleRequestNewOtp}
color="red"
variant="default"
size="tiny"
className={disableResend ? styles["disabled-link"] : ""}
>
{str}
</Link>
)
const errorMessages: Record<OtpError, ReactNode> = {
invalidCode: intl.formatMessage({
id: "The code youve entered is incorrect.",
}),
expiredCode: intl.formatMessage(
{
id: "The code youve entered have expired. <resendOtpLink>Resend code.</resendOtpLink>",
},
{
resendOtpLink: getResendOtpLink,
}
),
}
const errorMessage = error ? errorMessages[error] : undefined
return (
<SASModal>
<Subtitle textAlign={"center"}>{heading}</Subtitle>
<div>
<Body textAlign={"center"}>{ingress}</Body>
</div>
<OTPInput
autoFocus
value={otp}
onChange={setOtp}
maxLength={otpLength}
inputMode="numeric"
onComplete={(otp) => {
handleOTPEntered(otp)
}}
containerClassName={cx(styles["otp-container"], {
[styles.error]: Boolean(error),
})}
render={({ slots }) => (
<>
{slots.map((slot, idx) => (
<Slot key={idx} {...slot} />
))}
</>
)}
/>
{errorMessage && (
<div className={styles["error-message"]}>
<ErrorCircleFilledIcon height={20} width={20} color="red" />
<Caption color="red">{errorMessage}</Caption>
</div>
)}
<div>
<Footnote>{footnote}</Footnote>
<Footnote>
{intl.formatMessage(
{
id: "Didn't receive a code? <resendOtpLink>Resend code</resendOtpLink>",
},
{
resendOtpLink: getResendOtpLink,
}
)}
</Footnote>
</div>
</SASModal>
)
}
function Slot(props: SlotProps) {
return (
<div className={`${styles.slot} ${props.isActive ? styles.active : ""}`}>
{props.char !== null && <div>{props.char}</div>}
{props.hasFakeCaret && <FakeCaret />}
</div>
)
}
function FakeCaret() {
return (
<div className={styles.caret}>
<div className={styles.child} />
</div>
)
}
const getRequestErrorBody = (
intl: ReturnType<typeof useIntl>,
errorCode: RequestOtpError["errorCode"]
) => {
switch (errorCode) {
case "TOO_MANY_REQUESTS":
return intl.formatMessage({
id: "Too many requests. Please try again later.",
})
default:
return intl.formatMessage({
id: "An error occurred while requesting a new OTP",
})
}
}

View File

@@ -0,0 +1,11 @@
import LoadingSpinner from "@/components/LoadingSpinner"
import { SASModal } from "../components/SASModal"
export default function Loading() {
return (
<SASModal>
<LoadingSpinner />
</SASModal>
)
}

View File

@@ -0,0 +1,217 @@
import { cookies } from "next/headers"
import { redirect } from "next/navigation"
import { z } from "zod"
import { myPages } from "@/constants/routes/myPages"
import { serverClient } from "@/lib/trpc/server"
import { getIntl } from "@/i18n"
import { safeTry } from "@/utils/safeTry"
import { SAS_TOKEN_STORAGE_KEY } from "../sasUtils"
import OneTimePasswordForm, {
type OnSubmitHandler,
} from "./OneTimePasswordForm"
import type { ReactNode } from "react"
import type { LangParams, PageArgs, SearchParams } from "@/types/params"
import type { Lang } from "@/constants/languages"
const otpError = z.enum(["invalidCode", "expiredCode"])
const intent = z.enum(["link", "unlink"])
const searchParamsSchema = z.object({
intent: intent,
to: z.string(),
error: otpError.optional(),
})
export type OtpError = z.infer<typeof otpError>
type Intent = z.infer<typeof intent>
export default async function SASxScandicOneTimePasswordPage({
searchParams,
params,
}: PageArgs<LangParams> & SearchParams) {
const intl = await getIntl()
const cookieStore = cookies()
const tokenCookie = cookieStore.get(SAS_TOKEN_STORAGE_KEY)
const result = searchParamsSchema.safeParse(searchParams)
if (!result.success) {
throw new Error("Invalid search params")
}
const { intent, to, error } = result.data
if (!verifyTokenValidity(tokenCookie?.value)) {
redirect(`/${params.lang}/sas-x-scandic/login?intent=${intent}`)
}
const handleOtpVerified: OnSubmitHandler = async ({ otp }) => {
"use server"
const [data, error] = await safeTry(
serverClient().partner.sas.verifyOtp({ otp })
)
if (error || !data) {
throw error || new Error("OTP verification failed")
}
switch (data.status) {
case "ABUSED":
return {
url: `/${params.lang}/sas-x-scandic/error?errorCode=tooManyFailedAttempts`,
}
case "EXPIRED": {
const search = new URLSearchParams({
...searchParams,
error: "expiredCode",
}).toString()
return {
url: `/${params.lang}/sas-x-scandic/otp?${search}`,
}
}
case "RETRY": {
const search = new URLSearchParams({
...searchParams,
error: "invalidCode",
}).toString()
return {
url: `/${params.lang}/sas-x-scandic/otp?${search}`,
}
}
case "NOTSENT":
case "NULL":
case "SENT":
case "PENDING":
// These errors should never happen for verify, but according to the API spec they can
throw new Error("Unhandled OTP status")
}
switch (intent) {
case "link":
return handleLinkAccount({ lang: params.lang })
case "unlink":
return handleUnlinkAccount({ lang: params.lang })
}
}
const maskedContactInfo = () => (
<>
<br />
<strong>{to}</strong>
<br />
</>
)
const intentDescriptions: Record<Intent, ReactNode> = {
link: intl.formatMessage(
{
id: "Please enter the code sent to <maskedContactInfo></maskedContactInfo> in order to confirm your account linking.",
},
{ maskedContactInfo }
),
unlink: intl.formatMessage(
{
id: "Please enter the code sent to <maskedContactInfo></maskedContactInfo> in order to unlink your accounts.",
},
{ maskedContactInfo }
),
}
return (
<OneTimePasswordForm
heading={intl.formatMessage({ id: "Verification code" })}
ingress={intentDescriptions[intent]}
footnote={intl.formatMessage({
id: "This verifcation is needed for additional security.",
})}
otpLength={6}
onSubmit={handleOtpVerified}
error={error}
/>
)
}
function verifyTokenValidity(token: string | undefined) {
if (!token) {
return false
}
try {
const decoded = JSON.parse(atob(token.split(".")[1]))
const expiry = decoded.exp * 1000
return Date.now() < expiry
} catch {
return false
}
}
async function handleLinkAccount({
lang,
}: {
lang: Lang
}): ReturnType<OnSubmitHandler> {
const [res, error] = await safeTry(serverClient().partner.sas.linkAccount())
if (!res || error) {
console.error("[SAS] link account error", error)
return {
url: `/${lang}/sas-x-scandic/error`,
}
}
switch (res.linkingState) {
case "alreadyLinked":
return {
url: `/${lang}/sas-x-scandic/error?errorCode=alreadyLinked`,
type: "replace",
}
case "linked":
return {
url: `/${lang}/sas-x-scandic/link/success`,
type: "replace",
}
case "dateOfBirthMismatch":
return {
url: `/${lang}/sas-x-scandic/error?errorCode=dateOfBirthMismatch`,
type: "replace",
}
case "error":
return {
url: `/${lang}/sas-x-scandic/error`,
type: "replace",
}
}
}
async function handleUnlinkAccount({
lang,
}: {
lang: Lang
}): ReturnType<OnSubmitHandler> {
const [res, error] = await safeTry(serverClient().partner.sas.unlinkAccount())
if (!res || error) {
console.error("[SAS] unlink account error", error)
return {
url: `/${lang}/sas-x-scandic/error`,
}
}
switch (res.linkingState) {
case "unlinked":
return {
url: `/${lang}/sas-x-scandic/unlink/success`,
type: "replace",
}
case "notLinked":
return {
url: myPages[lang],
}
case "error":
return {
url: `/${lang}/sas-x-scandic/error`,
type: "replace",
}
}
}

View File

@@ -0,0 +1,8 @@
import { z } from "zod"
export const SAS_TOKEN_STORAGE_KEY = "sas-x-scandic-token"
export const stateSchema = z.object({
intent: z.enum(["link", "unlink"]),
})
export type State = z.infer<typeof stateSchema>

View File

@@ -0,0 +1,36 @@
import React from "react"
import { overview } from "@/constants/routes/myPages"
import CheckCircle from "@/components/Icons/CheckCircle"
import { Redirect } from "@/components/Redirect"
import Body from "@/components/TempDesignSystem/Text/Body"
import Title from "@/components/TempDesignSystem/Text/Title"
import { getIntl } from "@/i18n"
import { SASModal } from "../../components/SASModal"
import type { LangParams, PageArgs } from "@/types/params"
export default async function SASxScandicUnlinkSuccessPage({
params,
}: PageArgs<LangParams>) {
const intl = await getIntl()
return (
<SASModal>
<Redirect url={overview[params.lang]} timeout={3000} />
<CheckCircle height={64} width={64} color="uiSemanticSuccess" />
<Title as="h2" level="h1" textAlign="center">
{intl.formatMessage({ id: "Your accounts are now unlinked" })}
</Title>
<div>
<Body textAlign="center">
{intl.formatMessage({
id: "Redirecting you to My Pages.",
})}
</Body>
</div>
</SASModal>
)
}