packages/trpc/server/routers/viewer/organizations/updateUser.handler.ts (1)

120-157: Remove redundant format validation after validateBase64Image

Same issue as in updateProfile.handler.ts - the base64 prefix check is redundant after validateBase64Image and creates a format support mismatch.

Apply the same fix to remove redundant validation:

   if (input.avatar) {
     // Comprehensive validation using magic numbers
     const validation = validateBase64Image(input.avatar);
     if (!validation.isValid) {
       throw new TRPCError({
         code: "BAD_REQUEST",
         message: `Invalid avatar image: ${validation.error}`,
       });
     }

-    // Additional check for supported base64 formats (after validation)
-    if (
-      input.avatar.startsWith("data:image/png;base64,") ||
-      input.avatar.startsWith("data:image/jpeg;base64,") ||
-      input.avatar.startsWith("data:image/jpg;base64,") ||
-      input.avatar.startsWith("data:image/svg+xml;base64,")
-    ) {
+    if (input.avatar === "") {
+      data.avatarUrl = null;
+    } else {
       try {
         const avatar = await resizeBase64Image(input.avatar);
         data.avatarUrl = await uploadAvatar({
           avatar,
           userId: user.id,
         });
       } catch (error) {
         throw new TRPCError({
           code: "BAD_REQUEST",
           message: error instanceof Error ? error.message : "Failed to upload avatar",
         });
       }
-    } else if (input.avatar === "") {
-      data.avatarUrl = null;
-    } else {
-      throw new TRPCError({
-        code: "BAD_REQUEST",
-        message: "Unsupported image format. Please use PNG, JPEG, or SVG.",
-      });
     }
   }

packages/ui/components/image-uploader/ImageUploader.tsx (1)

94-220: Extract duplicated validateImageFile function

This validation function is identical to the one in BannerUploader.tsx. Both components should share a common validation utility.

See the suggestion in BannerUploader.tsx review for extracting this to a shared utility file.

packages/lib/server/imageValidation.ts (2)

123-132: Consider optimizing SVG content scanning for performance.

Converting the entire buffer to UTF-8 string for content scanning could be expensive for large SVG files. Consider scanning the first few KB or using a streaming approach for better performance.

-      const textContent = buffer.toString("utf8");
+      // Only scan first 10KB for dangerous patterns to improve performance
+      const scanLength = Math.min(buffer.length, 10 * 1024);
+      const textContent = buffer.subarray(0, scanLength).toString("utf8");

---

175-191: Simplify the JPEG format handling logic.

The function works correctly but has redundant logic in the JPEG validation section.

  // Handle JPEG variations
  if (
-    (detectedFormat === "jpeg" && (expectedFormat === "jpg" || expectedFormat === "jpeg")) ||
-    (expectedFormat === "jpeg" && detectedFormat === "jpeg")
+    (detectedFormat === "jpeg" && (expectedFormat === "jpg" || expectedFormat === "jpeg"))
  ) {
    return true;
  }

The second condition is redundant since expectedFormat === "jpeg" && detectedFormat === "jpeg" is already covered by the direct comparison on line 190.

packages/trpc/server/routers/viewer/organizations/update.handler.ts (2)

165-199: LGTM: Comprehensive banner validation and error handling

The banner validation implementation is thorough with proper TRPC error handling. The try-catch block ensures robust error handling during upload operations.

Consider removing the format checking after validation (lines 175-199) since validateBase64Image already validates the format. The current approach adds redundancy:

  if (input.banner) {
    // Validate the banner image data
    const validation = validateBase64Image(input.banner);
    if (!validation.isValid) {
      throw new TRPCError({
        code: "BAD_REQUEST",
        message: `Invalid banner image: ${validation.error}`,
      });
    }

-   if (
-     input.banner.startsWith("data:image/png;base64,") ||
-     input.banner.startsWith("data:image/jpeg;base64,") ||
-     input.banner.startsWith("data:image/jpg;base64,") ||
-     input.banner.startsWith("data:image/svg+xml;base64,")
-   ) {
      try {
        const banner = await resizeBase64Image(input.banner, { maxSize: 1500 });
        data.bannerUrl = await uploadLogo({
          logo: banner,
          teamId: currentOrgId,
          isBanner: true,
        });
      } catch (error) {
        throw new TRPCError({
          code: "BAD_REQUEST",
          message: error instanceof Error ? error.message : "Failed to upload banner",
        });
      }
-   } else {
-     throw new TRPCError({
-       code: "BAD_REQUEST",
-       message: "Unsupported banner format. Please use PNG, JPEG, or SVG.",
-     });
-   }
  }

---

204-236: LGTM: Consistent logo validation pattern

The logo validation follows the same comprehensive pattern as the banner validation, maintaining consistency in the codebase.

Same optimization opportunity applies here - the format checking after validation is redundant since validateBase64Image already handles format validation.

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

Learnt from: CR
PR: calcom/cal.com#0
File: .cursor/rules/review.mdc:0-0
Timestamp: 2025-07-28T11:50:23.918Z
Learning: For large pull requests (>500 lines changed or >10 files touched), advise splitting into smaller, focused PRs by feature, layer, dependency chain, or file/module

apps/web/public/static/locales/en/common.json (2)

3475-3481: Reduce translation overhead: consolidate file-type-specific errors into a single parameterized message

You’ve added five highly specific strings (PDF/HTML/script/ZIP/executable). Consider replacing them with one generic, parameterized string to minimize duplication and future translation effort. It also aligns with existing patterns like invalid_file_type_extension that accept parameters.

Proposed consolidation (optional):

-  "pdf_files_cannot_be_uploaded_as_images": "PDF files cannot be uploaded as images",
-  "html_files_cannot_be_uploaded_as_images": "HTML files cannot be uploaded as images",
-  "script_files_cannot_be_uploaded_as_images": "Script files cannot be uploaded as images",
-  "zip_files_cannot_be_uploaded_as_images": "ZIP files cannot be uploaded as images",
-  "executable_files_cannot_be_uploaded_as_images": "Executable files cannot be uploaded as images",
+  "unsupported_non_image_file": "Only image files are allowed. Received {{detectedType}}",

This keeps “only_image_files_allowed” for the generic case and provides a single, specific variant that can show the detected type.

---

3476-3476: Align image-validation messages with the existing parameterized pattern

• Update the English JSON entry for invalid_image_file_format to mirror invalid_file_type_extension:

  apps/web/public/static/locales/en/common.json
  -  "invalid_image_file_format": "Invalid image file format",
  +  "invalid_image_file_format": "Unsupported image format. Accepted types: {{acceptedTypes}}",

• Note that only_image_files_allowed isn’t referenced in any code or tests; consider removing this unused key to reduce clutter.

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.