cleanups

Author: ameer2468

apps/web/app/(org)/onboarding/components/CustomDomainPage.tsx

@@ -3,7 +3,7 @@
 import { Button } from "@cap/ui";
 import { Effect } from "effect";
 import { useRouter } from "next/navigation";
-import { startTransition, useState } from "react";
+import { type MouseEvent, startTransition, useState } from "react";
 import { toast } from "sonner";
 import { UpgradeModal } from "@/components/UpgradeModal";
 import { useEffectMutation } from "@/lib/EffectRuntime";
@@ -35,9 +35,9 @@ export function CustomDomainPage() {
 		},
 	});
 
-	const handleSubmit = async (e: React.MouseEvent<HTMLButtonElement>) => {
+	const handleSubmit = async (e: MouseEvent<HTMLButtonElement>) => {
 		e.preventDefault();
-		customDomainMutation.mutate();
+		await customDomainMutation.mutateAsync();
 	};
 
 	return (

apps/web/app/(org)/onboarding/components/InviteTeamPage.tsx

@@ -9,7 +9,7 @@ import { useMutation } from "@tanstack/react-query";
 import clsx from "clsx";
 import { Effect } from "effect";
 import { useRouter } from "next/navigation";
-import { startTransition, useId, useState } from "react";
+import { type MouseEvent, startTransition, useId, useState } from "react";
 import { toast } from "sonner";
 import { useEffectMutation } from "@/lib/EffectRuntime";
 import { withRpc } from "@/lib/Rpcs";
@@ -58,12 +58,12 @@ export function InviteTeamPage() {
 		},
 	});
 
-	const handleSubmit = async (e: React.MouseEvent<HTMLButtonElement>) => {
+	const handleSubmit = async (e: MouseEvent<HTMLButtonElement>) => {
 		e.preventDefault();
-		inviteTeamMutation.mutate();
+		await inviteTeamMutation.mutateAsync();
 	};
 
-	const planCheckout = async (e: React.MouseEvent<HTMLButtonElement>) => {
+	const planCheckout = async (e: MouseEvent<HTMLButtonElement>) => {
 		e.preventDefault();
 		try {
 			const planId = getProPlanId(isAnnually ? "yearly" : "monthly");
@@ -94,13 +94,11 @@ export function InviteTeamPage() {
 		} catch (error) {
 			console.error("Plan checkout error:", error);
 			toast.error("Something went wrong. Please try again.");
-		} finally {
-			planCheckoutMutation.mutate(e);
 		}
 	};
 
 	const planCheckoutMutation = useMutation({
-		mutationFn: (e: React.MouseEvent<HTMLButtonElement>) => planCheckout(e),
+		mutationFn: (e: MouseEvent<HTMLButtonElement>) => planCheckout(e),
 		onError: (error) => {
 			console.error("Plan checkout error:", error);
 			toast.error("Something went wrong. Please try again.");

apps/web/app/api/webhooks/stripe/route.ts

@@ -275,24 +275,8 @@ export const POST = async (req: Request) => {
 							invite_quota: inviteQuota,
 							price_id: subscription.items.data[0]?.price.id,
 							quantity: inviteQuota,
-							is_onboarding:
-								typeof session.metadata === "object" &&
-								session.metadata !== null &&
-								"isOnBoarding" in session.metadata &&
-								typeof (session.metadata as Record<string, unknown>)
-									.isOnBoarding === "string"
-									? ((session.metadata as Record<string, unknown>)
-											.isOnBoarding as string)
-									: "false",
-							platform:
-								typeof session.metadata === "object" &&
-								session.metadata !== null &&
-								"platform" in session.metadata &&
-								typeof (session.metadata as Record<string, unknown>)
-									.platform === "string"
-									? ((session.metadata as Record<string, unknown>)
-											.platform as string)
-									: "web",
+							is_onboarding: session.metadata?.isOnBoarding === "true",
+							platform: session.metadata?.platform === "web",
 							is_first_purchase: isFirstPurchase,
 							is_guest_checkout: isGuestCheckout,
 						},

packages/web-backend/src/Users/UsersOnboarding.ts

@@ -94,12 +94,16 @@ export class UsersOnboarding extends Effect.Service<UsersOnboarding>()(
 						if (data.organizationIcon) {
 							const organizationIcon = data.organizationIcon;
 							const uploadEffect = Effect.gen(function* () {
-								const {
-									data: fileData,
-									contentType,
-									fileName,
-								} = organizationIcon;
-								const fileExtension = fileName.split(".").pop();
+								const { data: fileData, contentType } = organizationIcon;
+								const allowedExt = new Map<string, string>([
+									["image/png", "png"],
+									["image/jpeg", "jpg"],
+									["image/webp", "webp"],
+									["image/svg+xml", "svg"],
+								]);
+								const fileExtension = allowedExt.get(contentType);
+								if (!fileExtension)
+									throw new Error("Unsupported icon content type");
 								const fileKey = `organizations/${organizationId}/icon-${Date.now()}.${fileExtension}`;
 
 								const [bucket] = yield* s3Buckets.getBucketAccess(

packages/web-domain/src/User.ts

@@ -60,6 +60,7 @@ export const OnboardingStepResult = Schema.Union(
 	}),
 	Schema.Struct({
 		step: Schema.Literal("inviteTeam"),
+		data: Schema.Void,
 	}),
 	Schema.Struct({
 		step: Schema.Literal("download"),