public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: conflicts

pull/9078/head
Agusti Fernandez Pardo 2022-05-27 21:18:47 +02:00
parent b52832f333
commit 8627b28a8e
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/helpers/verifyApiKey.ts
View File

@ -40,6 +40,5 @@ export const verifyApiKey: NextMiddleware = async (req, res, next) => {
if (!apiKey.userId) return res.status(404).json({ error: "No user found for this apiKey" }); if (!apiKey.userId) return res.status(404).json({ error: "No user found for this apiKey" });
/* We save the user id in the request for later use */ /* We save the user id in the request for later use */
req.userId = apiKey.userId; req.userId = apiKey.userId;
console.log(`User ${apiKey.userId} verified`);
await next(); await next();
}; };

16
pages/api/event-types/index.ts
View File

@ -10,7 +10,6 @@ async function createOrlistAllEventTypes(
{ method, body, userId }: NextApiRequest, { method, body, userId }: NextApiRequest,
res: NextApiResponse<EventTypesResponse | EventTypeResponse> res: NextApiResponse<EventTypesResponse | EventTypeResponse>
) { ) {
console.log("userId:", userId);
if (method === "GET") { if (method === "GET") {
/** /**
* @swagger * @swagger
@ -37,22 +36,7 @@ async function createOrlistAllEventTypes(
select: { eventTypes: true }, select: { eventTypes: true },
}) })
.catch((error) => res.status(404).json({ message: "No event types were found", error })); .catch((error) => res.status(404).json({ message: "No event types were found", error }));
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
console.log(`userid is: ${userId}`, "eventTypes:", data);
>>>>>>> 6099bfb (fix: more logging)
// const event_types = data.map(
// async (eventType) => await schemaEventTypeReadPublic.safeParseAsync(eventType)
// );
>>>>>>> d374031 (fix: more logging)
if (data) res.status(200).json({ event_types: data.eventTypes });
console.log(`userid is: ${userId}`, "eventTypes:", data);
// const event_types = data.map(
// async (eventType) => await schemaEventTypeReadPublic.safeParseAsync(eventType)
// );
if (data) res.status(200).json({ event_types: data.eventTypes }); if (data) res.status(200).json({ event_types: data.eventTypes });
else else
(error: Error) => (error: Error) =>