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

apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/destination_overview_page/[uid]/error.tsx

@@ -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"
+
 import { DestinationOverviewPageError } from "@/components/ContentType/DestinationPage/DestinationOverviewPage/error"
 
 export default function Error({
@@ -16,7 +18,7 @@ export default function Error({
   useEffect(() => {
     if (!error) return
 
-    console.error(error)
+    logger.error("Destination overview page", error)
     Sentry.captureException(error)
   }, [error])
 

apps/scandic-web/app/[lang]/(live)/(public)/dtmc/route.ts

@@ -1,6 +1,8 @@
 import { NextResponse } from "next/server"
 import { AuthError } from "next-auth"
 
+import { logger } from "@scandic-hotels/common/logger"
+
 import { dtmcApiCallback } from "@/constants/routes/dtmc"
 import { env } from "@/env/server"
 import { internalServerError, serviceUnavailable } from "@/server/errors/next"
@@ -21,22 +23,22 @@ export async function GET() {
     )
 
     if (redirectUrl) {
-      console.log(`[dtmc] redirecting to: ${redirectUrl}`)
+      logger.debug(`[dtmc] redirecting to: ${redirectUrl}`)
       return NextResponse.redirect(redirectUrl)
     } else {
-      console.error(`[dtmc] missing redirectUrl response from signIn()`)
+      logger.error(`[dtmc] missing redirectUrl response from signIn()`)
       return internalServerError(
         "[dtmc] Missing redirect URL from authentication service"
       )
     }
   } catch (error) {
     if (error instanceof AuthError) {
-      console.error({ signInAuthError: error })
+      logger.error("signInAuthError", { signInAuthError: error })
       return serviceUnavailable(
         "[dtmc] Microsoft authentication service unavailable"
       )
     } else {
-      console.error({ signInError: error })
+      logger.error("signInError", { signInError: error })
       return internalServerError(
         "[dtmc] Unexpected error during authentication"
       )

apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/gla-payment-callback/page.tsx

@@ -1,6 +1,7 @@
 import { notFound } from "next/navigation"
 
 import { myStay } from "@scandic-hotels/common/constants/routes/myStay"
+import { logger } from "@scandic-hotels/common/logger"
 import { BookingErrorCodeEnum } from "@scandic-hotels/trpc/enums/bookingErrorCode"
 
 import { PaymentCallbackStatusEnum } from "@/constants/booking"
@@ -25,7 +26,7 @@ export default async function GuaranteePaymentCallbackPage(
 ) {
   const searchParams = await props.searchParams
   const params = await props.params
-  console.log(`[gla-payment-callback] callback started`)
+  logger.debug(`[gla-payment-callback] callback started`)
   const lang = params.lang
   const status = searchParams.status
   const confirmationNumber = searchParams.confirmationNumber
@@ -49,7 +50,7 @@ export default async function GuaranteePaymentCallbackPage(
         />
       )
     }
-    console.log(`[gla-payment-callback] redirecting to: ${myStayUrl}`)
+    logger.debug(`[gla-payment-callback] redirecting to: ${myStayUrl}`)
     return <TrackGuarantee status={status} redirectUrl={myStayUrl} />
   }
 
@@ -76,7 +77,7 @@ export default async function GuaranteePaymentCallbackPage(
           : BookingErrorCodeEnum.TransactionFailed
       )
     } catch {
-      console.error(
+      logger.error(
         `[gla-payment-callback] failed to get booking status for ${confirmationNumber}, status: ${status}`
       )
       if (status === PaymentCallbackStatusEnum.Cancel) {
@@ -86,7 +87,10 @@ export default async function GuaranteePaymentCallbackPage(
         errorMessage = `Failed to get booking status for ${confirmationNumber}, status: ${status}`
       }
     }
-    console.log(errorMessage)
+
+    if (errorMessage) {
+      logger.error(errorMessage)
+    }
 
     if (isAncillaryFlow) {
       searchObject.set("ancillary", "ancillary")

apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/page.tsx

@@ -1,5 +1,6 @@
 import { notFound } from "next/navigation"
 
+import { logger } from "@scandic-hotels/common/logger"
 import { getServiceToken } from "@scandic-hotels/common/tokenManager"
 import { BookingErrorCodeEnum } from "@scandic-hotels/trpc/enums/bookingErrorCode"
 import { getBooking } from "@scandic-hotels/trpc/routers/booking/utils"
@@ -31,13 +32,13 @@ export default async function PaymentCallbackPage(
 ) {
   const searchParams = await props.searchParams
   const params = await props.params
-  console.log(`[payment-callback] callback started`)
+  logger.debug(`[payment-callback] callback started`)
   const lang = params.lang
   const status = searchParams.status
   const confirmationNumber = searchParams.confirmationNumber
 
   if (!status || !confirmationNumber) {
-    console.error(
+    logger.error(
       `[payment-callback] missing status or confirmationNumber in search params`
     )
     notFound()
@@ -71,7 +72,7 @@ export default async function PaymentCallbackPage(
   }
 
   if (!token) {
-    console.error(
+    logger.error(
       `[payment-callback] no token found for user, cannot fetch booking`
     )
     notFound()
@@ -89,7 +90,7 @@ export default async function PaymentCallbackPage(
     const expire = Math.floor(Date.now() / 1000) + 60
     const sig = encrypt(expire.toString())
     const confirmationUrl = `${bookingConfirmation(lang)}?RefId=${encodeURIComponent(refId)}`
-    console.log(
+    logger.debug(
       `[payment-callback] rendering success callback with confirmation number: ${confirmationNumber}`
     )
 
@@ -126,7 +127,7 @@ export default async function PaymentCallbackPage(
           : BookingErrorCodeEnum.TransactionFailed
       )
     } catch {
-      console.error(
+      logger.error(
         `[payment-callback] failed to get booking status for ${confirmationNumber}, status: ${status}`
       )
       searchObject.set("errorCode", BookingErrorCodeEnum.TransactionFailed)
@@ -135,7 +136,7 @@ export default async function PaymentCallbackPage(
   }
 
   if (status === PaymentCallbackStatusEnum.Error) {
-    console.error(
+    logger.error(
       `[payment-callback] error status received for ${confirmationNumber}, status: ${status}`
     )
     searchObject.set("errorCode", BookingErrorCodeEnum.TransactionFailed)

apps/scandic-web/app/[lang]/(live)/(public)/login/route.ts

@@ -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"
@@ -25,7 +26,7 @@ export async function GET(
   const isSeamlessMagicLink =
     request.headers.get("x-login-source") === "seamless-magiclink"
 
-  console.log(
+  logger.debug(
     `[login] source: ${request.headers.get("x-login-source") || "normal"}`
   )
 
@@ -34,8 +35,8 @@ export async function GET(
     request.nextUrl.searchParams.get("redirectTo")
   const redirectToFallback = "/"
 
-  console.log(`[login] redirectTo cookie value: ${redirectToCookieValue}`)
-  console.log(
+  logger.debug(`[login] redirectTo cookie value: ${redirectToCookieValue}`)
+  logger.debug(
     `[login] redirectTo search param value: ${redirectToSearchParamValue}`
   )
 
@@ -43,7 +44,7 @@ export async function GET(
     if (returnUrl) {
       redirectTo = returnUrl
     } else {
-      console.log(
+      logger.debug(
         `[login] missing returnUrl, using fallback: ${redirectToFallback}`
       )
       redirectTo = redirectToFallback
@@ -54,9 +55,9 @@ export async function GET(
 
     // Make relative URL to absolute URL
     if (redirectTo.startsWith("/")) {
-      console.log(`[login] make redirectTo absolute, from ${redirectTo}`)
+      logger.debug(`[login] make redirectTo absolute, from ${redirectTo}`)
       redirectTo = new URL(redirectTo, publicURL).href
-      console.log(`[login] make redirectTo absolute, to ${redirectTo}`)
+      logger.debug(`[login] make redirectTo absolute, to ${redirectTo}`)
     }
 
     // Clean up cookie from authRequired middleware
@@ -90,9 +91,11 @@ export async function GET(
           break
       }
       const redirectUrl = new URL(redirectUrlValue)
-      console.log(`[login] creating redirect to seamless login: ${redirectUrl}`)
+      logger.debug(
+        `[login] creating redirect to seamless login: ${redirectUrl}`
+      )
       redirectUrl.searchParams.set("returnurl", redirectTo)
-      console.log(
+      logger.debug(
         `[login] returnurl for seamless login: ${redirectUrl.searchParams.get("returnurl")}`
       )
       redirectTo = redirectUrl.toString()
@@ -105,7 +108,7 @@ export async function GET(
           "; Max-Age=300; Path=/; HttpOnly; SameSite=Lax"
       )
     } catch (e) {
-      console.error(
+      logger.error(
         "[login] unable to create URL for seamless login, proceeding without it.",
         e
       )
@@ -113,7 +116,7 @@ export async function GET(
   }
 
   try {
-    console.log(`[login] final redirectUrl: ${redirectTo}`)
+    logger.debug(`[login] final redirectUrl: ${redirectTo}`)
 
     /** Record<string, any> is next-auth typings */
     const params: Record<string, any> = {
@@ -174,16 +177,16 @@ export async function GET(
       const redirectOpts = {
         headers: redirectHeaders,
       }
-      console.log(`[login] redirecting to: ${redirectUrl}`, redirectOpts)
+      logger.debug(`[login] redirecting to: ${redirectUrl}`, redirectOpts)
       return NextResponse.redirect(redirectUrl, redirectOpts)
     } else {
-      console.error(`[login] missing redirectUrl reponse from signIn()`)
+      logger.error(`[login] missing redirectUrl reponse from signIn()`)
     }
   } catch (error) {
     if (error instanceof AuthError) {
-      console.error({ signInAuthError: error })
+      logger.error("signInAuthError", { signInAuthError: error })
     } else {
-      console.error({ signInError: error })
+      logger.error("signInError", { signInError: error })
     }
   }
 

apps/scandic-web/app/[lang]/(live)/(public)/verifymagiclink/route.ts

@@ -1,6 +1,8 @@
 import { type NextRequest, NextResponse } from "next/server"
 import { AuthError } from "next-auth"
 
+import { logger } from "@scandic-hotels/common/logger"
+
 import { badRequest, internalServerError } from "@/server/errors/next"
 import { getPublicURL } from "@/server/utils"
 
@@ -16,7 +18,7 @@ export async function GET(
 
   const loginKey = request.nextUrl.searchParams.get("loginKey")
   if (!loginKey) {
-    console.log(
+    logger.debug(
       `[verifymagiclink] missing required loginKey, aborting bad request`
     )
     return badRequest()
@@ -24,14 +26,14 @@ export async function GET(
 
   let redirectTo: string
 
-  console.log(`[verifymagiclink] verifying callback`)
+  logger.debug(`[verifymagiclink] verifying callback`)
 
   const redirectToCookieValue = request.cookies.get(
     "magicLinkRedirectTo"
   )?.value // Set redirect url from the magicLinkRedirect Cookie which is set when intiating login
   const redirectToFallback = "/"
 
-  console.log(
+  logger.debug(
     `[verifymagiclink] magicLinkRedirectTo cookie value: ${redirectToCookieValue}`
   )
 
@@ -39,11 +41,11 @@ export async function GET(
 
   // Make relative URL to absolute URL
   if (redirectTo.startsWith("/")) {
-    console.log(
+    logger.debug(
       `[verifymagiclink] make redirectTo absolute, from ${redirectTo}`
     )
     redirectTo = new URL(redirectTo, publicURL).href
-    console.log(`[verifymagiclink] make redirectTo absolute, to ${redirectTo}`)
+    logger.debug(`[verifymagiclink] make redirectTo absolute, to ${redirectTo}`)
   }
 
   // Update Seamless login url as Magic link login has a different authenticator in Curity
@@ -59,7 +61,7 @@ export async function GET(
   )
 
   try {
-    console.log(`[verifymagiclink] final redirectUrl: ${redirectTo}`)
+    logger.debug(`[verifymagiclink] final redirectUrl: ${redirectTo}`)
 
     const params = await context.params
     /**
@@ -92,18 +94,18 @@ export async function GET(
     )
 
     if (redirectUrl) {
-      console.log(`[verifymagiclink] redirecting to: ${redirectUrl}`)
+      logger.debug(`[verifymagiclink] redirecting to: ${redirectUrl}`)
       return NextResponse.redirect(redirectUrl)
     } else {
-      console.error(
+      logger.error(
         `[verifymagiclink] missing redirectUrl reponse from signIn()`
       )
     }
   } catch (error) {
     if (error instanceof AuthError) {
-      console.error({ signInAuthError: error })
+      logger.error("signInAuthError", { signInAuthError: error })
     } else {
-      console.error({ signInError: error })
+      logger.error("signInError", { signInError: error })
     }
   }