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/middlewares/authRequired.ts

@@ -1,5 +1,6 @@
 import { type NextMiddleware, NextResponse } from "next/server"
 
+import { logger } from "@scandic-hotels/common/logger"
 import { findLang } from "@scandic-hotels/common/utils/languages"
 
 import { authRequired, mfaRequired } from "@/constants/routes/authRequired"
@@ -89,7 +90,7 @@ export const middleware = auth(async (request) => {
   const redirectOpts = {
     headers,
   }
-  console.log(`[authRequired] redirecting to: ${redirectUrl}`, redirectOpts)
+  logger.debug(`[authRequired] redirecting to: ${redirectUrl}`, redirectOpts)
   return NextResponse.redirect(redirectUrl, redirectOpts)
 }) as unknown as NextMiddleware // See comment above
 

apps/scandic-web/middlewares/myPages.ts

@@ -6,6 +6,7 @@ import {
   profile,
   profileEdit,
 } from "@scandic-hotels/common/constants/routes/myPages"
+import { logger } from "@scandic-hotels/common/logger"
 import { findLang } from "@scandic-hotels/common/utils/languages"
 import { resolve as resolveEntry } from "@scandic-hotels/trpc/utils/entry"
 
@@ -25,7 +26,7 @@ export const middleware: NextMiddleware = async (request) => {
     const nextUrlPublic = getPublicNextURL(request)
     const overviewUrl = overview[lang]
     const redirectUrl = new URL(overviewUrl, nextUrlPublic)
-    console.log(`[myPages] redirecting to: ${redirectUrl}`)
+    logger.debug(`[myPages] redirecting to: ${redirectUrl}`)
     return NextResponse.redirect(redirectUrl, {
       status: 308,
     })

apps/scandic-web/middlewares/redirect.ts

@@ -1,6 +1,7 @@
 import { type NextMiddleware, NextResponse } from "next/server"
 
 import { getCacheClient } from "@scandic-hotels/common/dataCache"
+import { logger } from "@scandic-hotels/common/logger"
 import { findLang } from "@scandic-hotels/common/utils/languages"
 
 import { notFound } from "@/server/errors/next"
@@ -65,7 +66,7 @@ export const middleware: NextMiddleware = async (request) => {
     headers.set("x-continue", "1")
     return NextResponse.next({ headers })
   } catch (e) {
-    console.error("Redirect error: ", e)
+    logger.error("Redirect error: ", e)
     throw notFound()
   }
 }

apps/scandic-web/middlewares/webView.ts

@@ -1,5 +1,6 @@
 import { type NextMiddleware, NextResponse } from "next/server"
 
+import { logger } from "@scandic-hotels/common/logger"
 import { findLang } from "@scandic-hotels/common/utils/languages"
 import { resolve as resolveEntry } from "@scandic-hotels/trpc/utils/entry"
 
@@ -92,7 +93,7 @@ export const middleware: NextMiddleware = async (request) => {
     // Authorization header is required for webviews
     // It should be base64 encoded
     if (!authorizationToken) {
-      console.error("Authorization header is missing")
+      logger.error("Authorization header is missing")
       return badRequest("Authorization header is missing")
     }
 
@@ -100,7 +101,7 @@ export const middleware: NextMiddleware = async (request) => {
     // It should be base64 encoded
     const initializationVector = request.headers.get("X-AES-IV")!
     if (!initializationVector) {
-      console.error("initializationVector header is missing")
+      logger.error("initializationVector header is missing")
       return badRequest("initializationVector header is missing")
     }
 
@@ -121,8 +122,7 @@ export const middleware: NextMiddleware = async (request) => {
     })
   } catch (e) {
     if (e instanceof Error) {
-      console.error("Error in webView middleware")
-      console.error(`${e.name}: ${e.message}`)
+      logger.error(`Error in webView middleware - ${e.name}: ${e.message}`)
     }
 
     return badRequest()