Skip to content

Commit 28b21b2

Browse files
committed
trim trailing slash from org urls
1 parent 04c454b commit 28b21b2

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

emails/emails/subscription-cancel.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import { Warning } from "../components/warning.js";
66
import { Card } from "../components/card.js";
77

88
import { z } from "zod";
9+
import { trimTrailingSlash } from "../lib/url.js";
910

1011
export const schema = z.object({
1112
user_name: z.string(),
1213
org_name: z.string(),
13-
org_url: z.string(),
14+
org_url: z.string().transform(trimTrailingSlash),
1415
cancel_date: z.string(),
1516
survey_url: z.string().optional(),
1617
support_email: z.email().optional(),

emails/emails/trial-ending-soon.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ import {
1212
import { Warning } from "../components/warning.js";
1313

1414
import { z } from "zod";
15+
import { trimTrailingSlash } from "../lib/url.js";
1516

1617
export const schema = z.object({
1718
user_name: z.string(),
1819
org_name: z.string(),
19-
org_url: z.url(),
20+
org_url: z.url().transform(trimTrailingSlash),
2021
trial_end_date: z.string(),
2122
behavior_on_trial_end: z.enum(["cancel", "continue"]).optional(),
2223
support_email: z.email().optional(),

emails/lib/url.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export const trimTrailingSlash = (url: string): string =>
2+
url.endsWith("/") ? url.slice(0, -1) : url;

0 commit comments

Comments
 (0)