Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

revert to neutralizeFormula

Pedro Ladeira7694232c28ab
diff --git a/apps/web/lib/actions/partners/update-partner-profile.ts b/apps/web/lib/actions/partners/update-partner-profile.ts
index 71c59432ac..d2fdfab384 100644
--- a/apps/web/lib/actions/partners/update-partner-profile.ts
+++ b/apps/web/lib/actions/partners/update-partner-profile.ts
@@ -17,7 +17,6 @@ import { partnerProfileChangeHistoryLogSchema } from "@/lib/zod/schemas/partner-
import {
MAX_PARTNER_DESCRIPTION_LENGTH,
PartnerProfileDetailsSchema,
- sanitizeFormulaInput,
} from "@/lib/zod/schemas/partners";
import {
APP_DOMAIN_WITH_NGROK,
@@ -35,23 +34,13 @@ import { authPartnerActionClient } from "../safe-action";
const updatePartnerProfileSchema = z
.object({
- name: z
- .string()
- .trim()
- .min(1, "Name is required")
- .optional()
- .transform(sanitizeFormulaInput)
- .refine((v) => v === undefined || v.length > 0, "Name is required"),
+ name: z.string().trim().min(1, "Name is required").optional(),
email: z.email().optional(),
username: z.string().trim().toLowerCase().min(3).max(100).optional(),
image: uploadedImageSchema.nullish(),
- description: z
- .string()
- .max(MAX_PARTNER_DESCRIPTION_LENGTH)
- .nullish()
- .transform(sanitizeFormulaInput),
+ description: z.string().max(MAX_PARTNER_DESCRIPTION_LENGTH).nullish(),
profileType: z.enum(PartnerProfileType).optional(),
- companyName: z.string().nullish().transform(sanitizeFormulaInput),
+ companyName: z.string().nullish(),
syncIdentity: z.boolean().optional(),
})
.extend(PartnerProfileDetailsSchema.partial().shape)
diff --git a/apps/web/lib/analytics/utils/convert-to-csv.ts b/apps/web/lib/analytics/utils/convert-to-csv.ts
index 6e8dfbe062..71316d939b 100644
--- a/apps/web/lib/analytics/utils/convert-to-csv.ts
+++ b/apps/web/lib/analytics/utils/convert-to-csv.ts
@@ -1,5 +1,9 @@
import { json2csv } from "json-2-csv";
+const FORMULA_TRIGGER_CHARS = /^[=+\-@\t\r]/;
+const neutralizeFormula = (value: string) =>
+ FORMULA_TRIGGER_CHARS.test(value) ? `'${value}` : value;
+
export const convertToCSV = (data: object[]) => {
return json2csv(data, {
parseValue(fieldValue, defaultParser) {
@@ -11,6 +15,10 @@ export const convertToCSV = (data: object[]) => {
return fieldValue.toISOString();
}
+ if (typeof fieldValue === "string") {
+ return defaultParser(neutralizeFormula(fieldValue));
+ }
+
return defaultParser(fieldValue);
},
});
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index 6d3fff6b62..b7ffc40429 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -754,16 +754,6 @@ const partnerImageSchema = z.union([
z.string().nullish(), // make image optional
]);
-export const sanitizeFormulaInput = <T extends string | null | undefined>(
- value: T,
-): T => {
- if (typeof value !== "string") {
- return value;
- }
-
- return value.replace(/^[=+\-@\t\r]+/, "").trimStart() as T;
-};
-
export const onboardPartnerSchema = createPartnerSchema
.omit({
username: true,
@@ -772,16 +762,10 @@ export const onboardPartnerSchema = createPartnerSchema
linkProps: true,
})
.extend({
- name: z
- .string()
- .min(1, "Name is required")
- .transform(sanitizeFormulaInput)
- .refine((v) => v.length > 0, "Name is required"),
- description:
- createPartnerSchema.shape.description.transform(sanitizeFormulaInput),
+ name: z.string().min(1, "Name is required"),
image: partnerImageSchema,
profileType: z.enum(PartnerProfileType).default("individual"),
- companyName: z.string().nullish().transform(sanitizeFormulaInput),
+ companyName: z.string().nullish(),
})
.refine(
(data) => {