Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389)
feat(SW-2863): Move contentstack router to trpc package * Add exports to packages and lint rule to prevent relative imports * Add env to trpc package * Add eslint to trpc package * Apply lint rules * Use direct imports from trpc package * Add lint-staged config to trpc * Move lang enum to common * Restructure trpc package folder structure * WIP first step * update internal imports in trpc * Fix most errors in scandic-web Just 100 left... * Move Props type out of trpc * Fix CategorizedFilters types * Move more schemas in hotel router * Fix deps * fix getNonContentstackUrls * Fix import error * Fix entry error handling * Fix generateMetadata metrics * Fix alertType enum * Fix duplicated types * lint:fix * Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package * Fix broken imports * Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package Approved-by: Linus Flood
This commit is contained in:
@@ -1,5 +1,8 @@
|
||||
import { type NextMiddleware, NextResponse } from "next/server"
|
||||
|
||||
import { findLang } from "@scandic-hotels/common/utils/languages"
|
||||
import { resolve as resolveEntry } from "@scandic-hotels/trpc/utils/entry"
|
||||
|
||||
import {
|
||||
loyaltyPagesWebviews,
|
||||
myPagesWebviews,
|
||||
@@ -8,11 +11,9 @@ import {
|
||||
webviews,
|
||||
} from "@/constants/routes/webviews"
|
||||
import { env } from "@/env/server"
|
||||
import { badRequest, notFound } from "@/server/errors/next"
|
||||
import { badRequest, internalServerError, notFound } from "@/server/errors/next"
|
||||
|
||||
import { decryptData } from "@/utils/aes"
|
||||
import { resolve as resolveEntry } from "@/utils/entry"
|
||||
import { findLang } from "@/utils/languages"
|
||||
|
||||
import { getDefaultRequestHeaders } from "./utils"
|
||||
|
||||
@@ -148,7 +149,11 @@ async function handleWebviewRewrite({
|
||||
|
||||
const pathNameWithoutLang = path.replace(`/${lang}/webview`, "")
|
||||
|
||||
const { uid } = await resolveEntry(pathNameWithoutLang, lang)
|
||||
const { uid, error } = await resolveEntry(pathNameWithoutLang, lang)
|
||||
if (error) {
|
||||
throw internalServerError(error)
|
||||
}
|
||||
|
||||
if (uid) {
|
||||
headers.set("x-uid", uid)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user