From 65e8dab1b2dbf68513b517485a3347892d12afb6 Mon Sep 17 00:00:00 2001
From: giancarlo <giancarlopsk@gmail.com>
Date: Thu, 2 May 2024 01:16:50 +0700
Subject: [PATCH] Update codebase to enhance debugging and improve user
 interface

The codebase has been updated throughout to improve debugging capabilities notably in the PostgresDatabaseWebhookVerifierService and create-reader modules. User interface has also been enhanced in the marketing layout and blog page. Minor reordering of entries in email-templates and adjustment of configurations in turbo.json has also been performed.
---
 apps/web/.env                                 |  1 -
 .../(marketing)/_components/site-footer.tsx   |  2 +-
 apps/web/app/(marketing)/blog/[slug]/page.tsx |  4 +--
 apps/web/app/(marketing)/layout.tsx           |  4 +--
 packages/cms/keystatic/src/create-reader.ts   |  6 ++++-
 .../src/server/services/verifier/index.ts     |  4 +--
 ...tgres-database-webhook-verifier.service.ts | 11 +++++++-
 packages/email-templates/package.json         |  4 +--
 packages/mailers/src/impl/resend/index.ts     |  2 +-
 turbo.json                                    | 27 +++++++++++++++++--
 10 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/apps/web/.env b/apps/web/.env
index c72c1b102..736d67fce 100644
--- a/apps/web/.env
+++ b/apps/web/.env
@@ -26,7 +26,6 @@ CMS_CLIENT=keystatic
 
 # KEYSTATIC
 NEXT_PUBLIC_KEYSTATIC_CONTENT_PATH=./content
-KEYSTATIC_PATH_PREFIX=apps/web
 
 # LOCALES PATH
 NEXT_PUBLIC_LOCALES_PATH=apps/web/public/locales
diff --git a/apps/web/app/(marketing)/_components/site-footer.tsx b/apps/web/app/(marketing)/_components/site-footer.tsx
index afeec5710..708cc1692 100644
--- a/apps/web/app/(marketing)/_components/site-footer.tsx
+++ b/apps/web/app/(marketing)/_components/site-footer.tsx
@@ -7,7 +7,7 @@ import appConfig from '~/config/app.config';
 
 export function SiteFooter() {
   return (
-    <footer className={'border-t py-8 xl:py-12 2xl:py-14'}>
+    <footer className={'mt-auto border-t py-8 2xl:py-14'}>
       <div className={'px-8'}>
         <div className={'flex flex-col space-y-8 lg:flex-row lg:space-y-0'}>
           <div
diff --git a/apps/web/app/(marketing)/blog/[slug]/page.tsx b/apps/web/app/(marketing)/blog/[slug]/page.tsx
index 6b4553207..a50e78ab8 100644
--- a/apps/web/app/(marketing)/blog/[slug]/page.tsx
+++ b/apps/web/app/(marketing)/blog/[slug]/page.tsx
@@ -63,8 +63,8 @@ async function BlogPost({ params }: { params: { slug: string } }) {
   }
 
   return (
-    <div className={'container'}>
-      <Post post={post} content={post.content} />;
+    <div className={'container sm:max-w-none sm:p-0'}>
+      <Post post={post} content={post.content} />
     </div>
   );
 }
diff --git a/apps/web/app/(marketing)/layout.tsx b/apps/web/app/(marketing)/layout.tsx
index 260c7e727..67b228fc2 100644
--- a/apps/web/app/(marketing)/layout.tsx
+++ b/apps/web/app/(marketing)/layout.tsx
@@ -8,13 +8,13 @@ async function SiteLayout(props: React.PropsWithChildren) {
   const user = await getUser();
 
   return (
-    <>
+    <div className={'flex min-h-[100vh] flex-col'}>
       <SiteHeader user={user} />
 
       {props.children}
 
       <SiteFooter />
-    </>
+    </div>
   );
 }
 
diff --git a/packages/cms/keystatic/src/create-reader.ts b/packages/cms/keystatic/src/create-reader.ts
index 58531638d..5461be15b 100644
--- a/packages/cms/keystatic/src/create-reader.ts
+++ b/packages/cms/keystatic/src/create-reader.ts
@@ -9,10 +9,14 @@ export async function createKeystaticReader() {
   switch (STORAGE_KIND) {
     case 'local': {
       if (process.env.NEXT_RUNTIME === 'nodejs') {
+        const path = await import('node:path');
         const { default: config } = await import('./keystatic.config');
         const { createReader } = await import('@keystatic/core/reader');
 
-        return createReader('.', config);
+        const contentPath = process.env.NEXT_PUBLIC_KEYSTATIC_CONTENT_PATH;
+        const repositoryPath = path.join(process.cwd(), contentPath as string);
+
+        return createReader(repositoryPath, config);
       } else {
         // we should never get here but the compiler requires the check
         // to ensure we don't parse the package at build time
diff --git a/packages/database-webhooks/src/server/services/verifier/index.ts b/packages/database-webhooks/src/server/services/verifier/index.ts
index 730045571..a796c4e84 100644
--- a/packages/database-webhooks/src/server/services/verifier/index.ts
+++ b/packages/database-webhooks/src/server/services/verifier/index.ts
@@ -4,11 +4,11 @@ const WEBHOOK_SENDER_PROVIDER =
 export async function getDatabaseWebhookVerifier() {
   switch (WEBHOOK_SENDER_PROVIDER) {
     case 'postgres': {
-      const { PostgresDatabaseWebhookVerifierService } = await import(
+      const { createDatabaseWebhookVerifierService } = await import(
         './postgres-database-webhook-verifier.service'
       );
 
-      return new PostgresDatabaseWebhookVerifierService();
+      return createDatabaseWebhookVerifierService();
     }
 
     default:
diff --git a/packages/database-webhooks/src/server/services/verifier/postgres-database-webhook-verifier.service.ts b/packages/database-webhooks/src/server/services/verifier/postgres-database-webhook-verifier.service.ts
index 8d1fa7cb9..e45003d8c 100644
--- a/packages/database-webhooks/src/server/services/verifier/postgres-database-webhook-verifier.service.ts
+++ b/packages/database-webhooks/src/server/services/verifier/postgres-database-webhook-verifier.service.ts
@@ -10,12 +10,21 @@ const webhooksSecret = z
   .min(1)
   .parse(process.env.SUPABASE_DB_WEBHOOK_SECRET);
 
-export class PostgresDatabaseWebhookVerifierService
+export function createDatabaseWebhookVerifierService() {
+  return new PostgresDatabaseWebhookVerifierService();
+}
+
+class PostgresDatabaseWebhookVerifierService
   implements DatabaseWebhookVerifierService
 {
   verifySignatureOrThrow(request: Request) {
     const header = request.headers.get('X-Supabase-Event-Signature');
 
+    console.log({
+      header,
+      webhooksSecret,
+    });
+
     if (header !== webhooksSecret) {
       throw new Error('Invalid signature');
     }
diff --git a/packages/email-templates/package.json b/packages/email-templates/package.json
index d68e0612e..fe509c8d0 100644
--- a/packages/email-templates/package.json
+++ b/packages/email-templates/package.json
@@ -17,10 +17,10 @@
   },
   "devDependencies": {
     "@kit/eslint-config": "workspace:*",
+    "@kit/i18n": "workspace:*",
     "@kit/prettier-config": "workspace:*",
     "@kit/tailwind-config": "workspace:*",
-    "@kit/tsconfig": "workspace:*",
-    "@kit/i18n": "workspace:*"
+    "@kit/tsconfig": "workspace:*"
   },
   "eslintConfig": {
     "root": true,
diff --git a/packages/mailers/src/impl/resend/index.ts b/packages/mailers/src/impl/resend/index.ts
index 552c2b20c..6ba73f68e 100644
--- a/packages/mailers/src/impl/resend/index.ts
+++ b/packages/mailers/src/impl/resend/index.ts
@@ -44,7 +44,7 @@ export class ResendMailer implements Mailer {
     });
 
     if (!res.ok) {
-      throw new Error('Failed to send email');
+      throw new Error(`Failed to send email: ${res.statusText}`);
     }
   }
 }
diff --git a/turbo.json b/turbo.json
index 1c70aa706..3dc7f8d14 100644
--- a/turbo.json
+++ b/turbo.json
@@ -58,15 +58,38 @@
     }
   },
   "globalEnv": [
-    "SKIP_ENV_VALIDATION",
     "STRIPE_SECRET_KEY",
     "STRIPE_WEBHOOK_SECRET",
+    "NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY",
     "NEXT_PUBLIC_PRODUCT_NAME",
+    "NEXT_PUBLIC_SITE_URL",
+    "NEXT_PUBLIC_MONITORING_PROVIDER",
     "EMAIL_SENDER",
     "EMAIL_PORT",
     "EMAIL_HOST",
     "EMAIL_TLS",
     "EMAIL_USER",
-    "EMAIL_PASSWORD"
+    "EMAIL_PASSWORD",
+    "CMS_CLIENT",
+    "LOGGER",
+    "LEMON_SQUEEZY_SECRET_KEY",
+    "LEMON_SQUEEZY_SIGNING_SECRET",
+    "LEMON_SQUEEZY_STORE_ID",
+    "KEYSTATIC_STORAGE_KIND",
+    "KEYSTATIC_STORAGE_PROJECT",
+    "KEYSTATIC_STORAGE_REPO",
+    "KEYSTATIC_STORAGE_BRANCH_PREFIX",
+    "KEYSTATIC_PATH_PREFIX",
+    "KEYSTATIC_GITHUB_TOKEN",
+    "NEXT_PUBLIC_KEYSTATIC_CONTENT_PATH",
+    "WORDPRESS_API_URL",
+    "SUPABASE_DB_WEBHOOK_SECRET",
+    "INSTRUMENTATION_SERVICE_NAME",
+    "NEXT_PUBLIC_SENTRY_DSN",
+    "CAPTCHA_SECRET_TOKEN",
+    "NEXT_PUBLIC_BASELIME_KEY",
+    "NEXT_PUBLIC_SUPABASE_URL",
+    "NEXT_PUBLIC_SUPABASE_ANON_KEY",
+    "SUPABASE_SERVICE_ROLE_KEY"
   ]
 }
\ No newline at end of file