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:
Joakim Jäderberg
@@ -30,11 +30,11 @@ export default async function Profile() {
|
||||
const lang = await getLang()
|
||||
|
||||
const addressParts = []
|
||||
if (user.address.streetAddress) {
|
||||
if (user.address?.streetAddress) {
|
||||
addressParts.push(user.address.streetAddress)
|
||||
}
|
||||
|
||||
if (user.address.city) {
|
||||
if (user.address?.city) {
|
||||
addressParts.push(user.address.city)
|
||||
}
|
||||
|
||||
@@ -43,8 +43,8 @@ export default async function Profile() {
|
||||
region: new Intl.DisplayNames([lang], { type: "region" }),
|
||||
}
|
||||
|
||||
if (user.address.country) {
|
||||
const countryCode = isValidCountry(user.address.country)
|
||||
if (user.address?.country) {
|
||||
const countryCode = isValidCountry(user.address?.country)
|
||||
? countriesMap[user.address.country]
|
||||
: null
|
||||
const localizedCountry = countryCode
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import { TRPCError } from "@trpc/server"
|
||||
import { headers } from "next/headers"
|
||||
import { redirect } from "next/navigation"
|
||||
|
||||
import { overview } from "@scandic-hotels/common/constants/routes/myPages"
|
||||
import { logger } from "@scandic-hotels/common/logger"
|
||||
import { safeTry } from "@scandic-hotels/common/utils/safeTry"
|
||||
import { isValidSession } from "@scandic-hotels/trpc/utils/session"
|
||||
|
||||
import { getProfile } from "@/lib/trpc/memoizedRequests"
|
||||
@@ -33,29 +35,9 @@ export async function ProtectedLayout({ children }: React.PropsWithChildren) {
|
||||
redirect(redirectURL)
|
||||
}
|
||||
|
||||
const user = await getProfile()
|
||||
const [user, error] = await safeTry(getProfile())
|
||||
|
||||
if (user && "error" in user) {
|
||||
// redirect(redirectURL)
|
||||
logger.error("[layout:protected] error in user", user)
|
||||
switch (user.cause) {
|
||||
case "unauthorized": // fall through
|
||||
case "forbidden": // fall through
|
||||
case "token_expired":
|
||||
logger.error(
|
||||
`[layout:protected] user error, redirecting to: ${redirectURL}`
|
||||
)
|
||||
redirect(redirectURL)
|
||||
case "notfound":
|
||||
logger.error(`[layout:protected] notfound user loading error`)
|
||||
break
|
||||
case "unknown":
|
||||
logger.error(`[layout:protected] unknown user loading error`)
|
||||
break
|
||||
default:
|
||||
logger.error(`[layout:protected] unhandled user loading error`)
|
||||
break
|
||||
}
|
||||
if (error instanceof TRPCError && error.code === "INTERNAL_SERVER_ERROR") {
|
||||
return (
|
||||
<p>
|
||||
{intl.formatMessage({
|
||||
|
||||
@@ -16,9 +16,12 @@ export function UserExists() {
|
||||
const isUserLoggedIn = isValidClientSession(session)
|
||||
const lang = useLang()
|
||||
|
||||
const { data, isLoading: isLoadingUser } = trpc.user.get.useQuery(undefined, {
|
||||
enabled: isUserLoggedIn,
|
||||
})
|
||||
const { isLoading: isLoadingUser, error } = trpc.user.get.useQuery(
|
||||
undefined,
|
||||
{
|
||||
enabled: isUserLoggedIn,
|
||||
}
|
||||
)
|
||||
|
||||
if (!isUserLoggedIn) {
|
||||
return null
|
||||
@@ -28,16 +31,12 @@ export function UserExists() {
|
||||
return null
|
||||
}
|
||||
|
||||
if (data && "error" in data && data.error) {
|
||||
switch (data.cause) {
|
||||
case "notfound":
|
||||
redirect(
|
||||
`${logoutSafely[lang]}?redirectTo=${encodeURIComponent(userNotFound[lang])}`
|
||||
)
|
||||
default:
|
||||
break
|
||||
}
|
||||
switch (error?.data?.code) {
|
||||
case "NOT_FOUND":
|
||||
redirect(
|
||||
`${logoutSafely[lang]}?redirectTo=${encodeURIComponent(userNotFound[lang])}`
|
||||
)
|
||||
default:
|
||||
return null
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user