Merged in feature/refactor-lang (pull request #387)

feat: SW-238 Avoid prop drilling of lang

Approved-by: Michael Zetterberg
This commit is contained in:
Niclas Edenvin
2024-08-14 11:00:20 +00:00
parent 35128dbf44
commit e67212bd94
94 changed files with 378 additions and 322 deletions

View File

@@ -5,13 +5,11 @@ import { overview } from "@/constants/routes/myPages"
import { serverClient } from "@/lib/trpc/server"
import { auth } from "@/auth"
import type { LangParams, LayoutArgs } from "@/types/params"
import { getLang } from "@/i18n/serverContext"
export default async function ProtectedLayout({
children,
params,
}: React.PropsWithChildren<LayoutArgs<LangParams>>) {
}: React.PropsWithChildren) {
const session = await auth()
/**
* Fallback to make sure every route nested in the
@@ -19,16 +17,16 @@ export default async function ProtectedLayout({
*/
const h = headers()
const redirectTo = encodeURIComponent(
h.get("x-url") ?? h.get("x-pathname") ?? overview[params.lang]
h.get("x-url") ?? h.get("x-pathname") ?? overview[getLang()]
)
if (!session) {
redirect(`/${params.lang}/login?redirectTo=${redirectTo}`)
redirect(`/${getLang()}/login?redirectTo=${redirectTo}`)
}
const user = await serverClient().user.get()
if (!user || "error" in user) {
redirect(`/${params.lang}/login?redirectTo=${redirectTo}`)
redirect(`/${getLang()}/login?redirectTo=${redirectTo}`)
}
return children