Merged in feat/SW-3549-pass-scandic-token (pull request #2989)
Feat/SW-3549 pass scandic token * WIP pass scandic token * pass scandic token when booking * Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token * pass user token when doing availability search * undo changes * merge * Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988) fix(SW-3551): Fix issue with BookingConfigProvider in RSC * wip move config to pages * Move config providing to pages * Merged in fix/update-promo-error-modal-text (pull request #2990) fix: update promo error modal text * fix: update promo error modal text Approved-by: Emma Zettervall * Merged in fix/sw-3514-missing-membership-input-for-multiroom (pull request #2991) fix(SW-3514): Show join Scandic Friends card for SAS multiroom * Show join card for room 2+ Approved-by: Hrishikesh Vaipurkar * Merged in feat/lokalise-rebuild (pull request #2993) Feat/lokalise rebuild * chore(lokalise): update translation ids * chore(lokalise): easier to switch between projects * chore(lokalise): update translation ids * . * . * . * . * . * . * chore(lokalise): update translation ids * chore(lokalise): update translation ids * . * . * . * chore(lokalise): update translation ids * chore(lokalise): update translation ids * . * . * chore(lokalise): update translation ids * chore(lokalise): update translation ids * chore(lokalise): new translations * merge * switch to errors for missing id's * merge * sync translations Approved-by: Linus Flood * Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994) feat(SW-3552): Removed scandic session on logout Approved-by: Joakim Jäderberg * merge * replace getRedemptionTokenSafely() with context based instead * Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls * Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls * merge * Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token * add booking scope remove unused getMembershipNumber() Approved-by: Anton Gunnarsson Approved-by: Hrishikesh Vaipurkar
This commit is contained in:
@@ -53,7 +53,7 @@ export default function OneTimePasswordForm({
|
||||
}
|
||||
|
||||
if (requestOtp.isError) {
|
||||
const cause = requestOtp.error?.data?.cause as RequestOtpError
|
||||
const cause = requestOtp.error?.data?.cause as unknown as RequestOtpError
|
||||
|
||||
const title = intl.formatMessage({
|
||||
id: "linkEuroBonusAccount.oneTimePasswordGenericError",
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import * as Sentry from "@sentry/nextjs"
|
||||
import { TRPCError } from "@trpc/server"
|
||||
import { headers } from "next/headers"
|
||||
import { redirect } from "next/navigation"
|
||||
|
||||
import { logger } from "@scandic-hotels/common/logger"
|
||||
import { safeTry } from "@scandic-hotels/common/utils/safeTry"
|
||||
|
||||
import { getProfile } from "@/lib/trpc/memoizedRequests"
|
||||
|
||||
@@ -17,9 +19,9 @@ export default async function Layout(
|
||||
|
||||
const { children } = props
|
||||
const intl = await getIntl()
|
||||
const user = await getProfile()
|
||||
const [user, error] = await safeTry(getProfile())
|
||||
|
||||
if (!user) {
|
||||
if (!user && !error) {
|
||||
logger.debug(`[webview:page] unable to load user`)
|
||||
return (
|
||||
<p>
|
||||
@@ -31,19 +33,21 @@ export default async function Layout(
|
||||
)
|
||||
}
|
||||
|
||||
if ("error" in user) {
|
||||
switch (user.cause) {
|
||||
case "unauthorized": // fall through
|
||||
case "forbidden": // fall through
|
||||
case "token_expired":
|
||||
const headersList = await headers()
|
||||
const returnURL = `/${params.lang}/webview${headersList.get("x-pathname")!}`
|
||||
const redirectURL = `/${params.lang}/webview/refresh?returnUrl=${encodeURIComponent(returnURL)}`
|
||||
logger.debug(
|
||||
`[webview:page] user error, redirecting to: ${redirectURL}`
|
||||
)
|
||||
redirect(redirectURL)
|
||||
case "notfound":
|
||||
const notValidSession =
|
||||
error instanceof TRPCError &&
|
||||
(error.code === "UNAUTHORIZED" || error.code === "FORBIDDEN")
|
||||
|
||||
if (notValidSession) {
|
||||
const headersList = await headers()
|
||||
const returnURL = `/${params.lang}/webview${headersList.get("x-pathname")!}`
|
||||
const redirectURL = `/${params.lang}/webview/refresh?returnUrl=${encodeURIComponent(returnURL)}`
|
||||
logger.debug(`[webview:page] user error, redirecting to: ${redirectURL}`)
|
||||
redirect(redirectURL)
|
||||
}
|
||||
|
||||
if (error instanceof TRPCError) {
|
||||
switch (error.code) {
|
||||
case "NOT_FOUND":
|
||||
return (
|
||||
<p>
|
||||
{intl.formatMessage({
|
||||
@@ -52,7 +56,15 @@ export default async function Layout(
|
||||
})}
|
||||
</p>
|
||||
)
|
||||
case "unknown":
|
||||
default:
|
||||
logger.error("[webview:page] unexpected error code loading user", error)
|
||||
Sentry.captureException(error, {
|
||||
data: {
|
||||
errorCode: error.code,
|
||||
message: "[webview:page] unexpected error code loading user",
|
||||
},
|
||||
})
|
||||
|
||||
return (
|
||||
<p>
|
||||
{intl.formatMessage({
|
||||
@@ -61,10 +73,6 @@ export default async function Layout(
|
||||
})}
|
||||
</p>
|
||||
)
|
||||
default:
|
||||
const u: never = user
|
||||
logger.error("[webview:page] unhandled user loading error", u)
|
||||
Sentry.captureMessage("[webview:page] unhandled user loading error", u)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user