provider errors

calcom · Dec 20, 2024 · 9fbf3f1 · 9fbf3f1
1 parent 064e8d9
commit 9fbf3f1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/apps/web/app/api/plain-hash/route.ts b/apps/web/app/api/plain-hash/route.ts
@@ -9,8 +9,8 @@ import { apiRouteMiddleware } from "@calcom/lib/server/apiRouteMiddleware";
 const responseSchema = z.object({
   hash: z.string(),
   email: z.string().email(),
-  fullName: z.string().optional(),
   shortName: z.string(),
+  fullName: z.string().optional(),
 });
 
 async function handler(request: Request) {
@@ -33,7 +33,6 @@ async function handler(request: Request) {
     return new Response("Unauthorized - No session email found", { status: 401 });
   }
 
-  // Environment variable check
   const secret = process.env.PLAIN_CHAT_HMAC_SECRET_KEY;
   if (!secret) {
     return new Response("Missing Plain Chat secret", { status: 500 });
@@ -50,8 +49,8 @@ async function handler(request: Request) {
   const response = responseSchema.parse({
     hash,
     email: session.user.email,
-    fullName: session.user.name,
     shortName,
+    fullName: session.user.name,
   });
 
   console.log("Sending response:", response);

diff --git a/apps/web/lib/app-providers-app-dir.tsx b/apps/web/lib/app-providers-app-dir.tsx
@@ -270,6 +270,7 @@ const AppProviders = (props: PageWrapperProps) => {
   const RemainingProviders = (
     <EventCollectionProvider options={{ apiPath: "/api/collect-events" }}>
       <SessionProvider>
+        <PlainChat />
         <CustomI18nextProvider i18n={props.i18n}>
           <TooltipProvider>
             {/* color-scheme makes background:transparent not work which is required by embed. We need to ensure next-theme adds color-scheme to `body` instead of `html`(https://github.com/pacocoursey/next-themes/blob/main/src/index.tsx#L74). Once that's done we can enable color-scheme support */}
@@ -304,7 +305,6 @@ const AppProviders = (props: PageWrapperProps) => {
 
   return (
     <>
-      <PlainChat />
       <DynamicHelpscoutProvider>
         <DynamicIntercomProvider>
           <DynamicPostHogProvider>{Hydrated}</DynamicPostHogProvider>

diff --git a/apps/web/lib/plain/plainChat.tsx b/apps/web/lib/plain/plainChat.tsx
@@ -3,7 +3,6 @@ import { usePathname, useSearchParams } from "next/navigation";
 import Script from "next/script";
 import { useEffect, useState } from "react";
 
-// Add interface for Plain Chat configuration
 interface PlainChatConfig {
   appId: string;
   customerDetails: {
@@ -96,9 +95,9 @@ const PlainChat = () => {
           appId: "liveChatApp_01JFJJK1RF3XA2ZDAEHERJ0VZZ",
           customerDetails: {
             email,
-            fullName: "John",
             shortName,
             emailHash: hash,
+            fullName,
           },
           links: [
             {
@@ -195,9 +194,7 @@ const PlainChat = () => {
   `;
 
   useEffect(() => {
-    // Check if we're on /event-types with ?plain parameter after config is loaded
     if (pathname === "/event-types" && searchParams?.has("openPlain") && config) {
-      // Small delay to ensure Plain is fully initialized
       setTimeout(() => {
         openPlain();
       }, 100);