🥅 Catch errors in controller

Author: MalteSehmer

src/models/controller.model.ts

@@ -407,11 +407,11 @@ export class Controller {
   ): Promise<void> {
     const { providerConfig } = req;
 
-    if (!providerConfig) {
-      throw new ServerError(400, 'Missing parameters');
-    }
-
     try {
+      if (!providerConfig) {
+        throw new ServerError(400, 'Missing parameters');
+      }
+
       infoLogger('getContactsDelta', 'START', providerConfig.apiKey);
 
       const fetchContactsDelta = async (): Promise<ContactDelta> => {
@@ -461,7 +461,7 @@ export class Controller {
       errorLogger(
         'getContacts',
         'Could not get contacts:',
-        providerConfig.apiKey,
+        providerConfig?.apiKey,
         error,
       );
       next(error);
@@ -474,26 +474,25 @@ export class Controller {
     next: NextFunction,
   ): Promise<void> {
     const { providerConfig } = req;
+    try {
+      if (!providerConfig) {
+        throw new ServerError(400, 'Missing parameters');
+      }
 
-    if (!providerConfig) {
-      throw new ServerError(400, 'Missing parameters');
-    }
-
-    if (!this.adapter.getContact) {
-      throw new ServerError(501, 'Getting single contact is not implemented');
-    }
+      if (!this.adapter.getContact) {
+        throw new ServerError(501, 'Getting single contact is not implemented');
+      }
 
-    infoLogger('getContact', 'START', providerConfig.apiKey);
+      infoLogger('getContact', 'START', providerConfig.apiKey);
 
-    const contactType: IntegrationEntityType | undefined = Object.values(
-      IntegrationEntityType,
-    ).find((value) => value === req.query.type?.toString());
+      const contactType: IntegrationEntityType | undefined = Object.values(
+        IntegrationEntityType,
+      ).find((value) => value === req.query.type?.toString());
 
-    if (!contactType) {
-      throw new ServerError(400, 'Missing contact type query parameter');
-    }
+      if (!contactType) {
+        throw new ServerError(400, 'Missing contact type query parameter');
+      }
 
-    try {
       const contactId = req.params.id;
       infoLogger(
         'getContact',
@@ -522,7 +521,7 @@ export class Controller {
       errorLogger(
         'getContact',
         'Could not get contact:',
-        providerConfig.apiKey,
+        providerConfig?.apiKey,
         error,
       );
       next(error);
@@ -1364,17 +1363,18 @@ export class Controller {
     next: NextFunction,
   ): Promise<void> {
     const { providerConfig } = req;
-    if (!providerConfig) {
-      throw new ServerError(400, 'Missing parameters');
-    }
 
-    if (!this.adapter.getAccountId) {
-      throw new ServerError(501, 'Fetching account id is not implemented');
-    }
+    try {
+      if (!providerConfig) {
+        throw new ServerError(400, 'Missing parameters');
+      }
 
-    infoLogger('getAccountId', 'START', providerConfig.apiKey);
+      if (!this.adapter.getAccountId) {
+        throw new ServerError(501, 'Fetching account id is not implemented');
+      }
+
+      infoLogger('getAccountId', 'START', providerConfig.apiKey);
 
-    try {
       const accountId = await this.adapter.getAccountId(providerConfig);
 
       if (!accountId) {
@@ -1399,36 +1399,24 @@ export class Controller {
     res: Response,
     next: NextFunction,
   ): Promise<void> {
-    if (!this.adapter.handleWebhook) {
-      throw new ServerError(501, 'Webhook handling not implemented');
-    }
-
-    if (!this.adapter.verifyWebhookRequest) {
-      throw new ServerError(501, 'Webhook verification not implemented');
-    }
+    try {
+      if (!this.adapter.handleWebhook) {
+        throw new ServerError(501, 'Webhook handling not implemented');
+      }
 
-    let verified: boolean;
+      if (!this.adapter.verifyWebhookRequest) {
+        throw new ServerError(501, 'Webhook verification not implemented');
+      }
 
-    try {
-      verified = await this.adapter.verifyWebhookRequest(req);
-    } catch (error) {
-      errorLogger(
-        'handleWebhook',
-        'Error while verifying webhook request:',
-        '',
-        error || 'Unknown',
-      );
-      throw new ServerError(403, 'Webhook verification failed');
-    }
+      const verified = await this.adapter.verifyWebhookRequest(req);
 
-    if (!verified) {
-      errorLogger('handleWebhook', 'Webhook verification failed', '');
-      throw new ServerError(403, 'Webhook verification failed');
-    }
+      if (!verified) {
+        errorLogger('handleWebhook', 'Webhook verification failed', '');
+        throw new ServerError(403, 'Webhook verification failed');
+      }
 
-    infoLogger('handleWebhook', 'START', '');
+      infoLogger('handleWebhook', 'START', '');
 
-    try {
       const changeEvents: ContactChangeEvent[] =
         await this.adapter.handleWebhook(req);