feat(mcp): update change customer func

Author: taltultc

doit-mcp-server/src/app.ts

@@ -128,29 +128,16 @@ app.post("/customer-context", async (c) => {
       );
     }
 
-    if (!payload.DoitEmployee) {
-      // request validation for non-doit employees
-      const validatePromise = await handleValidateUserRequest({}, apiKey);
-      const result = validatePromise.content[0].text;
-
-      if (!result.toLowerCase().includes(payload.sub)) {
-        return await renderAuthorizationRejection(
-          c,
-          oauthReqInfo?.redirectUri || "/"
-        );
-      }
-
-      return await handleApprove(c);
-    }
+    const doitEmployeeContext = payload.DoitEmployee
+      ? {
+          customerContext: "EE8CtpzYiKp0dVAESVrB",
+        }
+      : {};
 
-    // request validation for doit employees
     const validatePromise = await handleValidateUserRequest(
-      {
-        customerContext: "EE8CtpzYiKp0dVAESVrB",
-      },
+      doitEmployeeContext,
       apiKey
     );
-
     const result = validatePromise.content[0].text;
 
     if (!result.toLowerCase().includes(payload.sub)) {
@@ -160,6 +147,11 @@ app.post("/customer-context", async (c) => {
       );
     }
 
+    if (!payload.DoitEmployee) {
+      // request validation for non-doit employees
+      return await handleApprove(c);
+    }
+
     const content = await renderCustomerContextScreen(
       action,
       oauthReqInfo,

doit-mcp-server/src/index.ts

@@ -66,13 +66,21 @@ export class ContextStorage extends DurableObject {
   }
 
   async saveContext(customerContext: string): Promise<void> {
-    console.log("Saving customer context:", customerContext, this.ctx.id);
+    console.log(
+      "Saving customer context:",
+      customerContext,
+      this.ctx.id.toString().slice(-6)
+    );
     await this.ctx.storage.put("customerContext", customerContext);
   }
 
   async loadContext(): Promise<string | null> {
     const context = await this.ctx.storage.get<string>("customerContext");
-    console.log("Loaded customer context:", context, this.ctx.id);
+    console.log(
+      "Loaded customer context:",
+      context,
+      this.ctx.id.toString().slice(-6)
+    );
     return context || null;
   }
 }

src/tools/changeCustomer.ts

@@ -15,8 +15,6 @@ export const ChangeCustomerArgumentsSchema = z.object({
 // Interfaces
 export interface ChangeCustomerResponse {
   success: boolean;
-  previousContext?: string;
-  newContext: string;
   message: string;
 }
 
@@ -53,24 +51,28 @@ export async function handleChangeCustomerRequest(
 
     const previousContext = args.customerContext;
 
-    // Update the customer context if callback is provided
-    if (updateCustomerContext) {
-      await updateCustomerContext(newContext);
-    }
-
     // Verify that the new context is valid
     const newCustomerDomain = await handleValidateUserRequest(
       { customerContext: newContext }, // Validate doers
       token
     );
 
+    if (newCustomerDomain.content[0].text.toLowerCase().includes("failed")) {
+      return createErrorResponse(
+        "Customer context is invalid. Please try again with a valid customer id."
+      );
+    }
+
+    // Update the customer context if callback is provided
+    if (updateCustomerContext) {
+      await updateCustomerContext(newContext);
+    }
+
     const domain = newCustomerDomain.content[0].text.split("Domain: ")[1];
 
     // Create response
     const response: ChangeCustomerResponse = {
       success: true,
-      previousContext,
-      newContext,
       message: `Customer context successfully changed to '${domain}'`,
     };