Merge pull request #45 from ClearContracts/matt/catch-apis

Modify try...catch of API routes

src/pages/api/endVoting.ts

@@ -19,9 +19,9 @@ export default async function endVoting(
   req: NextApiRequest,
   res: NextApiResponse<Data>,
 ): Promise<void> {
-  const { pollId } = req.body;
-  // TODO: Add session check to verify it is coordinator. Also additional security step of verifying coordinator's signature before updating poll?
   try {
+    const { pollId } = req.body;
+    // TODO: Add session check to verify it is coordinator. Also additional security step of verifying coordinator's signature before updating poll?
     const findPoll = await prisma.poll.findFirst({
       where: {
         id: BigInt(pollId),

src/pages/api/getPoll/[pollId].ts

@@ -21,8 +21,8 @@ export default async function getPoll(
   req: NextApiRequest,
   res: NextApiResponse<Data>,
 ): Promise<void> {
-  const pollId = req.query.pollId;
   try {
+    const pollId = req.query.pollId;
     if (typeof pollId !== 'string') {
       return res.status(400).json({
         poll: null,

src/pages/api/getPollResults/[pollId].ts

@@ -28,8 +28,8 @@ export default async function getPollResults(
   req: NextApiRequest,
   res: NextApiResponse<Data>,
 ): Promise<void> {
-  const pollId = req.query.pollId;
   try {
+    const pollId = req.query.pollId;
     if (typeof pollId !== 'string') {
       return res.status(400).json({
         votes: null,

src/pages/api/getPollVote/[...params].ts

@@ -18,22 +18,22 @@ export default async function getPollVoteCount(
   req: NextApiRequest,
   res: NextApiResponse<Data>,
 ): Promise<void> {
-  const { params } = req.query;
+  try {
+    const { params } = req.query;
 
-  // Ensures params are an array of strings
-  if (Array.isArray(params)) {
-    params.forEach((param) => {
-      if (typeof param !== 'string') {
-        return res.status(400).json({ vote: '', message: 'Invalid params' });
-      }
-    });
-  } else {
-    return res.status(400).json({ vote: '', message: 'Invalid params' });
-  }
-  const userId = params[0];
-  const pollId = params[1];
+    // Ensures params are an array of strings
+    if (Array.isArray(params)) {
+      params.forEach((param) => {
+        if (typeof param !== 'string') {
+          return res.status(400).json({ vote: '', message: 'Invalid params' });
+        }
+      });
+    } else {
+      return res.status(400).json({ vote: '', message: 'Invalid params' });
+    }
+    const userId = params[0];
+    const pollId = params[1];
 
-  try {
     const vote = await prisma.poll_vote.findFirst({
       where: {
         poll_id: BigInt(pollId),

src/pages/api/getPollVoteCount/[pollId].ts

@@ -18,8 +18,8 @@ export default async function getPollVoteCount(
   req: NextApiRequest,
   res: NextApiResponse<Data>,
 ): Promise<void> {
-  const pollId = req.query.pollId;
   try {
+    const pollId = req.query.pollId;
     if (typeof pollId !== 'string') {
       return res.status(400).json({
         count: 0,

src/pages/api/newPoll.ts

@@ -19,9 +19,9 @@ export default async function newPoll(
   req: NextApiRequest,
   res: NextApiResponse<Data>,
 ): Promise<void> {
-  const { name, description } = req.body;
-  // TODO: Add session check to verify it is coordinator. Also additional security step of verifying coordinator's signature before creating poll?
   try {
+    const { name, description } = req.body;
+    // TODO: Add session check to verify it is coordinator. Also additional security step of verifying coordinator's signature before creating poll?
     // TODO: Add data sanitization check. If fails sanitization return a message to the user.
     // validate name
     if (!name) {

src/pages/api/newPollVote.ts

@@ -22,10 +22,10 @@ export default async function newPollVote(
   req: NextApiRequest,
   res: NextApiResponse<Data>,
 ): Promise<void> {
-  const { pollId, vote } = req.body;
-  // TODO: Add session check to verify it is delegator/alternate. Also additional security step of verifying delegator/alternate's signature before casting vote
-  // TODO: Add check that the delegate/alternate is the active voter for the convention location
   try {
+    const { pollId, vote } = req.body;
+    // TODO: Add session check to verify it is delegator/alternate. Also additional security step of verifying delegator/alternate's signature before casting vote
+    // TODO: Add check that the delegate/alternate is the active voter for the convention location
     // TODO: Add data sanitization check. If fails sanitization return a message to the user.
     // validate poll id
     if (!pollId) {

src/pages/api/startVoting.ts

@@ -19,9 +19,9 @@ export default async function startVoting(
   req: NextApiRequest,
   res: NextApiResponse<Data>,
 ): Promise<void> {
-  const { pollId } = req.body;
-  // TODO: Add session check to verify it is coordinator. Also additional security step of verifying coordinator's signature before updating poll?
   try {
+    const { pollId } = req.body;
+    // TODO: Add session check to verify it is coordinator. Also additional security step of verifying coordinator's signature before updating poll?
     const findPoll = await prisma.poll.findFirst({
       where: {
         id: BigInt(pollId),