vynte-infra/calendar
2
0
Fork 0
Code Issues Pull Requests Actions 1.6k Packages Projects Releases Wiki Activity

Merge pull request #85 from calcom/fix/build-hooks

Browse Source 
Fix/build hooks
This commit is contained in:
Agusti Fernandez Pardo
2022-05-20 03:23:15 +02:00
committed by GitHub
parent 2e8f42c5d7 f6746c4cf9
commit d991c68b08
6 changed files with 186 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/helpers/verifyApiKey.ts
+3 -3
View File
@@ -9,9 +9,9 @@ import prisma from "@calcom/prisma";
declare module "next" {
export interface NextApiRequest extends IncomingMessage {
userId: number;
query: {
apiKey: string;
};
method: string;
query: { [key: string]: string | string[] };
body: any;
}
}
lib/types.ts
+2 -1
View File
@@ -125,7 +125,7 @@ export type EventTypeCustomInputsResponse = BaseResponse & {
event_type_custom_inputs?: Partial<EventTypeCustomInput>[];
};
// From rrule https://jakubroztocil.github.io/rrule freq
enum Frequency {
export enum Frequency {
"YEARLY",
"MONTHLY",
"WEEKLY",
@@ -150,6 +150,7 @@ interface EventTypeExtended extends Omit<EventType, "recurringEvent" | "location
type: DefaultLocationType | AppStoreLocationType;
}[];
}
// EventType
export type EventTypeResponse = BaseResponse & {
event_type?: Partial<EventTypeExtended>;
lib/validations/event-type.ts
+27 -1
View File
@@ -1,7 +1,11 @@
import { z } from "zod";
import { AppStoreLocationType, DefaultLocationType } from "@calcom/app-store/locations";
import { _EventTypeModel as EventType } from "@calcom/prisma/zod";
import { Frequency } from "@lib/types";
import { timeZone } from "@lib/validations/shared/timeZone";
import { jsonSchema } from "./shared/jsonSchema";
export const schemaEventTypeBaseBodyParams = EventType.pick({
@@ -87,4 +91,26 @@ export const schemaEventTypeReadPublic = EventType.pick({
description: true,
locations: true,
metadata: true,
});
}).merge(
z.object({
// { dtstart?: Date | undefined; interval?: number | undefined; count?: number | undefined; freq?: Frequency | undefined; until?: Date | undefined; tzid?: string | undefined; } | undefined'
// recurringEvent: jsonSchema.nullable(),
recurringEvent: z.object({
dtstart: z.date().optional(),
interval: z.number().int().optional(),
count: z.number().int().optional(),
freq: z.nativeEnum(Frequency).optional(),
until: z.date().optional(),
tzid: timeZone,
}),
locations: z.array(
z.object({
link: z.string().optional(),
address: z.string().optional(),
hostPhoneNumber: z.string().optional(),
type: z.nativeEnum(DefaultLocationType).or(z.nativeEnum(AppStoreLocationType)),
})
),
metadata: jsonSchema.nullable(),
})
);
lib/validations/webhook.ts
+5 -3
View File
@@ -24,7 +24,8 @@ export const schemaWebhookCreateBodyParams = schemaWebhookBaseBodyParams.merge(s
const schemaWebhookEditParams = z
.object({
payloadTemplate: z.string().optional(),
eventTriggers: z.string().optional(),
/** @todo: don't use any here and validate eventTriggers proper */
eventTriggers: z.any(),
subscriberUrl: z.string().optional(),
})
.strict();
@@ -37,7 +38,8 @@ export const schemaWebhookReadPublic = Webhook.pick({
eventTypeId: true,
payloadTemplate: true,
eventTriggers: true,
eventType: true,
app: true,
/** @todo: find out why this breaks the api */
// eventType: true,
// app: true,
appId: true,
});
package.json
-1
View File
@@ -19,7 +19,6 @@
},
"devDependencies": {
"@calcom/tsconfig": "*",
"@calcom/types": "*",
"@typescript-eslint/eslint-plugin": "^5.25.0",
"babel-jest": "^28.1.0",
"jest": "^28.0.3",
pages/api/booking-references/[id].ts
+149 -165
View File
@@ -22,177 +22,161 @@ export async function bookingReferenceById(
res.status(400).json({ message: "Your query was invalid" });
return;
}
// const userWithBookings = await prisma.user.findUnique({
// where: { id: userId },
// include: { bookings: true },
// });
// if (!userWithBookings) throw new Error("User not found");
// const userBookingIds = userWithBookings.bookings.map((booking: { id: number }) => booking.id).flat();
// console.log(userBookingIds);
// const bookingReferences = await prisma.bookingReference
// .findMany({ where: { id: { in: userBookingIds } } })
// .then((bookingReferences) => {
// console.log(bookingReferences);
// return bookingReferences.map((bookingReference) => bookingReference.id);
// });
const userWithBookings = await prisma.user.findUnique({
where: { id: userId },
include: { bookings: true },
});
if (!userWithBookings) throw new Error("User not found");
const userBookingIds = userWithBookings.bookings.map((booking: { id: number }) => booking.id).flat();
const bookingReferences = await prisma.bookingReference
.findMany({ where: { id: { in: userBookingIds } } })
.then((bookingReferences) => bookingReferences.map((bookingReference) => bookingReference.id));
// res.status(400).json({ message: "Booking reference not found" });
// return;
// }
// if (userBookingIds.includes(safeQuery.data.id)) {
// if (!bookingReferences?.includes(safeQuery.data.id)) {
// throw new Error("BookingReference: bookingId not found");
switch (method) {
case "GET":
/**
* @swagger
* /booking-references/{id}:
* get:
* operationId: getBookingReferenceById
* summary: Find a booking reference
* parameters:
* - in: path
* name: id
* schema:
* type: integer
* required: true
* description: ID of the booking reference to get
* tags:
* - booking-references
* responses:
* 200:
* description: OK
* 401:
* description: Authorization information is missing or invalid.
* 404:
* description: BookingReference was not found
*/
// console.log(safeQuery.data.id);
const bookingReference = await prisma.bookingReference.findFirst().catch((error: Error) => {
console.log("hoerr:", error);
});
// console.log(bookingReference);
if (!bookingReference) res.status(404).json({ message: "Booking reference not found" });
else res.status(200).json({ booking_reference: bookingReference });
if (!bookingReferences?.includes(safeQuery.data.id)) res.status(401).json({ message: "Unauthorized" });
else {
switch (method) {
case "GET":
/**
* @swagger
* /booking-references/{id}:
* get:
* operationId: getBookingReferenceById
* summary: Find a booking reference
* parameters:
* - in: path
* name: id
* schema:
* type: integer
* required: true
* description: ID of the booking reference to get
* tags:
* - booking-references
* responses:
* 200:
* description: OK
* 401:
* description: Authorization information is missing or invalid.
* 404:
* description: BookingReference was not found
*/
await prisma.bookingReference
.findFirst({ where: { id: safeQuery.data.id } })
.then((data) => schemaBookingReferenceReadPublic.parse(data))
.then((booking_reference) => res.status(200).json({ booking_reference }))
.catch((error: Error) => {
console.log(error);
res.status(404).json({
message: `BookingReference with id: ${safeQuery.data.id} not found`,
error,
});
});
// .then((data) => {
// console.log(data);
// return schemaBookingReferenceReadPublic.parse(data);
// })
// .then((booking_reference) => res.status(200).json({ booking_reference }))
// .catch((error: Error) => {
// console.log(error);
// res.status(404).json({
// message: `BookingReference with id: ${safeQuery.data.id} not found`,
// error,
// });
// });
break;
case "PATCH":
/**
* @swagger
* /booking-references/{id}:
* patch:
* operationId: editBookingReferenceById
* summary: Edit an existing booking reference
* requestBody:
* description: Edit an existing booking reference related to one of your bookings
* required: true
* content:
* application/json:
* schema:
* type: object
* properties:
* days:
* type: array
* example: email@example.com
* startTime:
* type: string
* example: 1970-01-01T17:00:00.000Z
* endTime:
* type: string
* example: 1970-01-01T17:00:00.000Z
* parameters:
* - in: path
* name: id
* schema:
* type: integer
* required: true
* description: ID of the booking reference to edit
* tags:
* - booking-references
* responses:
* 201:
* description: OK, safeBody.data edited successfuly
* 400:
* description: Bad request. BookingReference body is invalid.
* 401:
* description: Authorization information is missing or invalid.
*/
break;
case "PATCH":
/**
* @swagger
* /booking-references/{id}:
* patch:
* operationId: editBookingReferenceById
* summary: Edit an existing booking reference
* requestBody:
* description: Edit an existing booking reference related to one of your bookings
* required: true
* content:
* application/json:
* schema:
* type: object
* properties:
* days:
* type: array
* example: email@example.com
* startTime:
* type: string
* example: 1970-01-01T17:00:00.000Z
* endTime:
* type: string
* example: 1970-01-01T17:00:00.000Z
* parameters:
* - in: path
* name: id
* schema:
* type: integer
* required: true
* description: ID of the booking reference to edit
* tags:
* - booking-references
* responses:
* 201:
* description: OK, safeBody.data edited successfuly
* 400:
* description: Bad request. BookingReference body is invalid.
* 401:
* description: Authorization information is missing or invalid.
*/
const safeBody = schemaBookingEditBodyParams.safeParse(body);
if (!safeBody.success) {
console.log(safeBody.error);
res.status(400).json({ message: "Invalid request body", error: safeBody.error });
return;
}
await prisma.bookingReference
.update({ where: { id: safeQuery.data.id }, data: safeBody.data })
.then((data) => schemaBookingReferenceReadPublic.parse(data))
.then((booking_reference) => res.status(200).json({ booking_reference }))
.catch((error: Error) =>
res.status(404).json({
message: `BookingReference with id: ${safeQuery.data.id} not found`,
error,
const safeBody = schemaBookingEditBodyParams.safeParse(body);
if (!safeBody.success) {
console.log(safeBody.error);
res.status(400).json({ message: "Invalid request body", error: safeBody.error });
return;
}
await prisma.bookingReference
.update({ where: { id: safeQuery.data.id }, data: safeBody.data })
.then((data) => schemaBookingReferenceReadPublic.parse(data))
.then((booking_reference) => res.status(200).json({ booking_reference }))
.catch((error: Error) =>
res.status(404).json({
message: `BookingReference with id: ${safeQuery.data.id} not found`,
error,
})
);
break;
case "DELETE":
/**
* @swagger
* /booking-references/{id}:
* delete:
* operationId: removeBookingReferenceById
* summary: Remove an existing booking reference
* parameters:
* - in: path
* name: id
* schema:
* type: integer
* required: true
* description: ID of the booking reference to delete
* tags:
* - booking-references
* responses:
* 201:
* description: OK, bookingReference removed successfuly
* 400:
* description: Bad request. BookingReference id is invalid.
* 401:
* description: Authorization information is missing or invalid.
*/
await prisma.bookingReference
.delete({
where: { id: safeQuery.data.id },
})
);
break;
case "DELETE":
/**
* @swagger
* /booking-references/{id}:
* delete:
* operationId: removeBookingReferenceById
* summary: Remove an existing booking reference
* parameters:
* - in: path
* name: id
* schema:
* type: integer
* required: true
* description: ID of the booking reference to delete
* tags:
* - booking-references
* responses:
* 201:
* description: OK, bookingReference removed successfuly
* 400:
* description: Bad request. BookingReference id is invalid.
* 401:
* description: Authorization information is missing or invalid.
*/
await prisma.bookingReference
.delete({
where: { id: safeQuery.data.id },
})
.then(() =>
res.status(200).json({
message: `BookingReference with id: ${safeQuery.data.id} deleted`,
})
)
.catch((error: Error) =>
res.status(404).json({
message: `BookingReference with id: ${safeQuery.data.id} not found`,
error,
})
);
break;
.then(() =>
res.status(200).json({
message: `BookingReference with id: ${safeQuery.data.id} deleted`,
})
)
.catch((error: Error) =>
res.status(404).json({
message: `BookingReference with id: ${safeQuery.data.id} not found`,
error,
})
);
break;
default:
res.status(405).json({ message: "Method not allowed" });
break;
default:
res.status(405).json({ message: "Method not allowed" });
break;
}
}
// } else res.status(401).json({ message: "Unauthorized" });
}
export default withMiddleware("HTTP_GET_DELETE_PATCH")(