error -> err in catch blocks for consistency

boxyhq · Dec 23, 2024 · 454d52a · 454d52a
1 parent 758ca0d
commit 454d52a
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 49 deletions.
diff --git a/ee/branding/api/index.ts b/ee/branding/api/index.ts
@@ -15,8 +15,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         res.setHeader('Allow', 'GET');
         res.status(405).json({ error: { message: `Method ${method} Not Allowed` } });
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
 
     res.status(statusCode).json({ error: { message } });
   }

diff --git a/ee/identity-federation/api/metadata.ts b/ee/identity-federation/api/metadata.ts
@@ -32,8 +32,8 @@ const handleGET = async (req: NextApiRequest, res: NextApiResponse) => {
     }
 
     res.status(200).send(metadata.xml);
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
 
     return res.status(statusCode).json({
       error: { message },

diff --git a/ee/product/api/[productId].ts b/ee/product/api/[productId].ts
@@ -15,8 +15,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         res.setHeader('Allow', 'GET,DELETE');
         res.status(405).json({ error: { message: `Method ${req.method} Not Allowed` } });
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
     res.status(statusCode).json({ error: { message } });
   }
 };

diff --git a/ee/product/api/index.ts b/ee/product/api/index.ts
@@ -12,8 +12,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         res.setHeader('Allow', 'POST');
         res.status(405).json({ error: { message: `Method ${req.method} Not Allowed` } });
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
     res.status(statusCode).json({ error: { message } });
   }
 };

diff --git a/internal-ui/src/identity-federation/EditIdentityFederationApp.tsx b/internal-ui/src/identity-federation/EditIdentityFederationApp.tsx
@@ -55,8 +55,8 @@ export const EditIdentityFederationApp = ({
       await fetch(urls.deleteApp, { method: 'DELETE', headers: defaultHeaders });
       setDelModalVisible(false);
       onDelete?.();
-    } catch (error: any) {
-      onError?.(error);
+    } catch (err: any) {
+      onError?.(err);
     }
   };
 

diff --git a/lib/api/default.ts b/lib/api/default.ts
@@ -21,9 +21,9 @@ export const defaultHandler = async (req: NextApiRequest, res: NextApiResponse,
     // Call the handler
     await handler(req, res);
     return;
-  } catch (error: any) {
-    const message = error.message || 'Internal Server Error';
-    const status = error.statusCode || 500;
+  } catch (err: any) {
+    const message = err.message || 'Internal Server Error';
+    const status = err.statusCode || 500;
 
     console.error(`${req.method} ${req.url} - ${status} - ${message}`);
 

diff --git a/npm/src/db/dynamoDb.ts b/npm/src/db/dynamoDb.ts
@@ -73,12 +73,12 @@ class DynamoDB implements DatabaseDriver {
           },
         })
       );
-    } catch (error: any) {
+    } catch (err: any) {
       if (
-        !error?.message?.includes('Cannot create preexisting table') &&
-        !error?.message?.toLowerCase().includes('table already exists')
+        !err?.message?.includes('Cannot create preexisting table') &&
+        !err?.message?.toLowerCase().includes('table already exists')
       ) {
-        throw error;
+        throw err;
       }
     }
     try {
@@ -145,12 +145,12 @@ class DynamoDB implements DatabaseDriver {
           TableName: indexTableName,
         })
       );
-    } catch (error: any) {
+    } catch (err: any) {
       if (
-        !error?.message?.includes('Cannot create preexisting table') &&
-        !error?.message?.toLowerCase().includes('table already exists')
+        !err?.message?.includes('Cannot create preexisting table') &&
+        !err?.message?.toLowerCase().includes('table already exists')
       ) {
-        throw error;
+        throw err;
       }
     }
     return this;

diff --git a/npm/src/directory-sync/batch-events/queue.ts b/npm/src/directory-sync/batch-events/queue.ts
@@ -153,11 +153,11 @@ export class EventProcessor {
           }
 
           await this.logWebhookEvent(directory, events, status);
-        } catch (error: any) {
-          const message = `Error sending payload to webhook ${directory.webhook.endpoint}. Marking the events as failed. ${error.message}`;
-          const status = error.response?.status || 500;
+        } catch (err: any) {
+          const message = `Error sending payload to webhook ${directory.webhook.endpoint}. Marking the events as failed. ${err.message}`;
+          const status = err.response?.status || 500;
 
-          console.error(message, error);
+          console.error(message, err);
 
           await this.markAsFailed(events);
           await this.logWebhookEvent(directory, events, status);

diff --git a/npm/src/directory-sync/non-scim/google/oauth.ts b/npm/src/directory-sync/non-scim/google/oauth.ts
@@ -71,8 +71,8 @@ export class GoogleAuth {
       };
 
       return { data, error: null };
-    } catch (error: any) {
-      return apiError(error);
+    } catch (err: any) {
+      return apiError(err);
     }
   }
 
@@ -92,8 +92,8 @@ export class GoogleAuth {
       const { tokens } = await oauth2Client.getToken(code);
 
       return { data: tokens, error: null };
-    } catch (error: any) {
-      return apiError(error);
+    } catch (err: any) {
+      return apiError(err);
     }
   }
 
@@ -124,8 +124,8 @@ export class GoogleAuth {
       }
 
       return { data, error: null };
-    } catch (error: any) {
-      return apiError(error);
+    } catch (err: any) {
+      return apiError(err);
     }
   }
 }
diff --git a/pages/api/oauth/saml.ts b/pages/api/oauth/saml.ts
@@ -45,9 +45,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       res.send(response_form);
       return;
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
-    console.error('Error processing SAML IdP response:', message);
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
+    console.error('Error processing SAML IdP response:', err);
 
     setErrorCookie(res, { message, statusCode }, { path: '/error' });
 

diff --git a/pages/api/scim/oauth/authorize.ts b/pages/api/scim/oauth/authorize.ts
@@ -27,8 +27,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
 
     res.redirect(302, data.authorizationUrl).end();
     return;
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
 
     return res.status(statusCode).json({ error: { message } });
   }

diff --git a/pages/api/scim/oauth/callback.ts b/pages/api/scim/oauth/callback.ts
@@ -45,8 +45,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     }
 
     return res.send('Authorized done successfully. You may close this window.');
-  } catch (error: any) {
-    return res.status(500).send({ error });
+  } catch (err: any) {
+    return res.status(500).send({ err });
   }
 };
 

diff --git a/pages/api/setup/[token]/directory-sync/[directoryId]/index.ts b/pages/api/setup/[token]/directory-sync/[directoryId]/index.ts
@@ -21,8 +21,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         res.setHeader('Allow', 'PATCH, GET, DELETE');
         res.status(405).json({ error: { message: `Method ${method} Not Allowed` } });
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
 
     return res.status(statusCode).json({ error: { message } });
   }

diff --git a/pages/api/setup/[token]/directory-sync/index.ts b/pages/api/setup/[token]/directory-sync/index.ts
@@ -21,8 +21,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         res.setHeader('Allow', 'PUT');
         res.status(405).json({ error: { message: `Method ${method} Not Allowed` } });
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
 
     return res.status(statusCode).json({ error: { message } });
   }

diff --git a/pages/api/setup/[token]/index.ts b/pages/api/setup/[token]/index.ts
@@ -14,8 +14,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         res.setHeader('Allow', 'GET');
         res.status(405).json({ error: { message: `Method ${method} Not Allowed` } });
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
 
     return res.status(statusCode).json({ error: { message } });
   }

diff --git a/pages/api/setup/[token]/sso-connection/[id].ts b/pages/api/setup/[token]/sso-connection/[id].ts
@@ -17,8 +17,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         res.setHeader('Allow', 'GET');
         res.status(405).json({ error: { message: `Method ${method} Not Allowed` } });
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
 
     return res.status(statusCode).json({ error: { message } });
   }

diff --git a/pages/api/setup/[token]/sso-connection/idp-entityid.ts b/pages/api/setup/[token]/sso-connection/idp-entityid.ts
@@ -18,8 +18,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         res.setHeader('Allow', 'GET');
         res.status(405).json({ error: { message: `Method ${method} Not Allowed` } });
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
 
     return res.status(statusCode).json({ error: { message } });
   }

diff --git a/pages/setup/[token]/sso-connection/new.tsx b/pages/setup/[token]/sso-connection/new.tsx
@@ -164,7 +164,7 @@ export async function getServerSideProps({ locale, query }: GetServerSidePropsCo
       const source = fs.readFileSync(`${mdxDirectory}/${step}.mdx`, 'utf8');
       mdxSource = await serialize(source, { mdxOptions: { remarkPlugins: [remarkGfm] } });
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    } catch (error: any) {
+    } catch (err: any) {
       return {
         redirect: {
           destination: `/setup/${token}/sso-connection/new`,