Merged in feature/wrap-logging (pull request #2511)

Feature/wrap logging

* feat: change all logging to go through our own logger function so that we can control log levels

* move packages/trpc to using our own logger

* merge


Approved-by: Linus Flood
This commit is contained in:
Joakim Jäderberg
2025-07-03 12:37:04 +00:00
parent 7e32ed294d
commit daf765f3d5
110 changed files with 681 additions and 441 deletions

View File

@@ -2,6 +2,7 @@ import { type NextRequest, NextResponse } from "next/server"
import { AuthError } from "next-auth"
import { Lang } from "@scandic-hotels/common/constants/language"
import { logger } from "@scandic-hotels/common/logger"
import { env } from "@/env/server"
import { internalServerError } from "@/server/errors/next"
@@ -20,7 +21,7 @@ export async function GET(
const returnUrl = request.headers.get("x-returnurl")
const isSeamless = request.headers.get("x-logout-source") === "seamless"
console.log(
logger.debug(
`[logout] source: ${request.headers.get("x-logout-source") || "normal"}`
)
@@ -32,7 +33,7 @@ export async function GET(
if (returnUrl) {
redirectTo = returnUrl
} else {
console.log(
logger.debug(
`[login] missing returnUrl, using fallback: ${redirectToFallback}`
)
redirectTo = redirectToFallback
@@ -42,9 +43,9 @@ export async function GET(
// Make relative URL to absolute URL
if (redirectTo.startsWith("/")) {
console.log(`[logout] make redirectTo absolute, from ${redirectTo}`)
logger.debug(`[logout] make redirectTo absolute, from ${redirectTo}`)
redirectTo = new URL(redirectTo, publicURL).href
console.log(`[logout] make redirectTo absolute, to ${redirectTo}`)
logger.debug(`[logout] make redirectTo absolute, to ${redirectTo}`)
}
try {
@@ -72,21 +73,21 @@ export async function GET(
break
}
const redirectUrl = new URL(redirectUrlValue)
console.log(
logger.debug(
`[logout] creating redirect to seamless logout: ${redirectUrl}`
)
redirectTo = redirectUrl.toString()
} catch (e) {
console.error(
"Unable to create URL for seamless logout, proceeding without it."
logger.error(
"Unable to create URL for seamless logout, proceeding without it.",
e
)
console.error(e)
}
}
try {
redirectTo = `${env.CURITY_ISSUER_USER}/authn/authenticate/logout?redirect_uri=${encodeURIComponent(redirectTo)}`
console.log(`[logout] final redirectUrl: ${redirectTo}`)
logger.debug(`[logout] final redirectUrl: ${redirectTo}`)
/**
* Passing `redirect: false` to `signOut` will return a result object
@@ -99,16 +100,16 @@ export async function GET(
})
if (redirectUrlObj) {
console.log(`[logout] redirecting to: ${redirectUrlObj.redirect}`)
logger.debug(`[logout] redirecting to: ${redirectUrlObj.redirect}`)
return NextResponse.redirect(redirectUrlObj.redirect)
} else {
console.error(`[logout] missing redirectUrlObj reponse from signOut()`)
logger.error(`[logout] missing redirectUrlObj reponse from signOut()`)
}
} catch (error) {
if (error instanceof AuthError) {
console.log({ signOutAuthError: error })
logger.error("signOutAuthError", { signOutAuthError: error })
} else {
console.log({ signOutError: error })
logger.error("signOutError", { signOutError: error })
}
}

View File

@@ -4,6 +4,8 @@ import * as Sentry from "@sentry/nextjs"
import { useEffect } from "react"
import { useIntl } from "react-intl"
import { logger } from "@scandic-hotels/common/logger"
export default function Error({
error,
}: {
@@ -14,7 +16,7 @@ export default function Error({
useEffect(() => {
if (!error) return
console.error({ breadcrumbsError: error })
logger.error("Breadcrumbs Error", { breadcrumbsError: error })
Sentry.captureException(error)
}, [error])

View File

@@ -4,6 +4,8 @@ import * as Sentry from "@sentry/nextjs"
import { useEffect } from "react"
import { useIntl } from "react-intl"
import { logger } from "@scandic-hotels/common/logger"
export default function Error({
error,
}: {
@@ -14,7 +16,7 @@ export default function Error({
useEffect(() => {
if (!error) return
console.error(error)
logger.error("My Pages", error)
Sentry.captureException(error)
}, [error])