Several type fixes (#855)

* Several type fixes

* Update ee/lib/stripe/client.ts

Co-authored-by: Alex Johansson <alexander@n1s.se>

* Typo

* Refactors createPaymentLink

* Simplify calendarClietn type

Co-authored-by: Alex Johansson <alexander@n1s.se>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
This commit is contained in:
Omar López 2021-10-05 16:46:48 -06:00 committed by GitHub
parent 4474e9dd74
commit 95b49a5995
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 24 deletions

View file

@ -159,7 +159,12 @@ const BookingPage = (props: BookingPageProps) => {
let successUrl = `/success?${query}`; let successUrl = `/success?${query}`;
if (content?.paymentUid) { if (content?.paymentUid) {
successUrl = createPaymentLink(content?.paymentUid, payload.name, date, false); successUrl = createPaymentLink({
paymentUid: content?.paymentUid,
name: payload.name,
date,
absolute: false,
});
} }
await router.push(successUrl); await router.push(successUrl);

View file

@ -1,4 +1,5 @@
import { loadStripe, Stripe } from "@stripe/stripe-js"; import { loadStripe, Stripe } from "@stripe/stripe-js";
import { Maybe } from "@trpc/server";
import { stringify } from "querystring"; import { stringify } from "querystring";
const stripePublicKey = process.env.NEXT_PUBLIC_STRIPE_PUBLIC_KEY!; const stripePublicKey = process.env.NEXT_PUBLIC_STRIPE_PUBLIC_KEY!;
@ -18,7 +19,13 @@ const getStripe = (userPublicKey?: string) => {
return stripePromise; return stripePromise;
}; };
export function createPaymentLink(paymentUid: string, name?: string, date?: string, absolute = true): string { export function createPaymentLink(opts: {
paymentUid: string;
name?: Maybe<string>;
date?: Maybe<string>;
absolute?: boolean;
}): string {
const { paymentUid, name, date, absolute = true } = opts;
let link = ""; let link = "";
if (absolute) link = process.env.NEXT_PUBLIC_APP_URL!; if (absolute) link = process.env.NEXT_PUBLIC_APP_URL!;
const query = stringify({ date, name }); const query = stringify({ date, name });

View file

@ -3,7 +3,7 @@ import Stripe from "stripe";
import { JsonValue } from "type-fest"; import { JsonValue } from "type-fest";
import { v4 as uuidv4 } from "uuid"; import { v4 as uuidv4 } from "uuid";
import { CalendarEvent, Person } from "@lib/calendarClient"; import { CalendarEvent } from "@lib/calendarClient";
import EventOrganizerRefundFailedMail from "@lib/emails/EventOrganizerRefundFailedMail"; import EventOrganizerRefundFailedMail from "@lib/emails/EventOrganizerRefundFailedMail";
import EventPaymentMail from "@lib/emails/EventPaymentMail"; import EventPaymentMail from "@lib/emails/EventPaymentMail";
import prisma from "@lib/prisma"; import prisma from "@lib/prisma";
@ -35,19 +35,14 @@ export async function handlePayment(
}, },
stripeCredential: { key: JsonValue }, stripeCredential: { key: JsonValue },
booking: { booking: {
user: { email: string; name: string; timeZone: string }; user: { email: string | null; name: string | null; timeZone: string } | null;
id: number; id: number;
title: string;
description: string;
startTime: { toISOString: () => string }; startTime: { toISOString: () => string };
endTime: { toISOString: () => string };
attendees: Person[];
location?: string;
uid: string; uid: string;
} }
) { ) {
const paymentFee = Math.round( const paymentFee = Math.round(
selectedEventType.price * parseFloat(paymentFeePercentage || "0") + parseInt(paymentFeeFixed || "0") selectedEventType.price * parseFloat(`${paymentFeePercentage}`) + parseInt(`${paymentFeeFixed}`)
); );
const { stripe_user_id, stripe_publishable_key } = stripeCredential.key as Stripe.OAuthToken; const { stripe_user_id, stripe_publishable_key } = stripeCredential.key as Stripe.OAuthToken;
@ -79,7 +74,11 @@ export async function handlePayment(
}); });
const mail = new EventPaymentMail( const mail = new EventPaymentMail(
createPaymentLink(payment.uid, booking.user.name, booking.startTime.toISOString()), createPaymentLink({
paymentUid: payment.uid,
name: booking.user?.name,
date: booking.startTime.toISOString(),
}),
evt, evt,
booking.uid booking.uid
); );

View file

@ -1,4 +1,4 @@
import { Prisma, Credential } from "@prisma/client"; import { Credential } from "@prisma/client";
import { EventResult } from "@lib/events/EventManager"; import { EventResult } from "@lib/events/EventManager";
import logger from "@lib/logger"; import logger from "@lib/logger";
@ -110,10 +110,7 @@ const o365Auth = (credential) => {
}; };
}; };
const userData = Prisma.validator<Prisma.UserArgs>()({ export type Person = { name: string; email: string; timeZone: string };
select: { name: true, email: true, timeZone: true },
});
export type Person = Prisma.UserGetPayload<typeof userData>;
export interface CalendarEvent { export interface CalendarEvent {
type: string; type: string;

5
lib/types/utils.ts Normal file
View file

@ -0,0 +1,5 @@
export type RequiredNotNull<T> = {
[P in keyof T]: NonNullable<T[P]>;
};
export type Ensure<T, K extends keyof T> = T & RequiredNotNull<Pick<T, K>>;

View file

@ -239,8 +239,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
const teamMembers = const teamMembers =
eventType.schedulingType === SchedulingType.COLLECTIVE eventType.schedulingType === SchedulingType.COLLECTIVE
? users.slice(1).map((user) => ({ ? users.slice(1).map((user) => ({
email: user.email, email: user.email || "",
name: user.name, name: user.name || "",
timeZone: user.timeZone, timeZone: user.timeZone,
})) }))
: []; : [];
@ -257,8 +257,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
startTime: reqBody.start, startTime: reqBody.start,
endTime: reqBody.end, endTime: reqBody.end,
organizer: { organizer: {
name: users[0].name, name: users[0].name || "Nameless",
email: users[0].email, email: users[0].email || "Email-less",
timeZone: users[0].timeZone, timeZone: users[0].timeZone,
}, },
attendees: attendeesList, attendees: attendeesList,
@ -328,6 +328,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
let referencesToCreate: PartialReference[] = []; let referencesToCreate: PartialReference[] = [];
type User = Prisma.UserGetPayload<typeof userData>; type User = Prisma.UserGetPayload<typeof userData>;
let user: User | null = null; let user: User | null = null;
for (const currentUser of users) { for (const currentUser of users) {
if (!currentUser) { if (!currentUser) {
console.error(`currentUser not found`); console.error(`currentUser not found`);
@ -404,6 +405,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
} }
} }
} }
if (!user) throw Error("Can't continue, user not found.");
// After polling videoBusyTimes, credentials might have been changed due to refreshment, so query them again. // After polling videoBusyTimes, credentials might have been changed due to refreshment, so query them again.
const eventManager = new EventManager(await refreshCredentials(user.credentials)); const eventManager = new EventManager(await refreshCredentials(user.credentials));
@ -446,11 +450,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
if (typeof eventType.price === "number" && eventType.price > 0) { if (typeof eventType.price === "number" && eventType.price > 0) {
try { try {
const [firstStripeCredential] = user.credentials.filter((cred) => cred.type == "stripe_payment"); const [firstStripeCredential] = user.credentials.filter((cred) => cred.type == "stripe_payment");
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
/* @ts-ignore https://github.com/prisma/prisma/issues/9389 */
if (!booking.user) booking.user = user; if (!booking.user) booking.user = user;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
/* @ts-ignore https://github.com/prisma/prisma/issues/9389 */
const payment = await handlePayment(evt, eventType, firstStripeCredential, booking); const payment = await handlePayment(evt, eventType, firstStripeCredential, booking);
res.status(201).json({ ...booking, message: "Payment required", paymentUid: payment.uid }); res.status(201).json({ ...booking, message: "Payment required", paymentUid: payment.uid });