Simplify checkVariable (#181)

* Fix JSON could be a string Co-authored-by: Val <[email protected]>
ambrosus · Feb 14, 2022 · ce7506c · ce7506c
1 parent 2de5a1e
commit ce7506c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/src/controller/bundle.controller.ts b/src/controller/bundle.controller.ts
@@ -97,7 +97,8 @@ export class BundleController extends BaseController {
     });
 
     await streamFinished(bundleStream);
-    res.status(200).json(result).end();
+
+    res.status(200).send(result).end();
   }
 
   @httpGet('/:bundleId/info')

diff --git a/src/model/admin/email-settings.model.ts b/src/model/admin/email-settings.model.ts
@@ -30,11 +30,9 @@ export interface IEmailSettings {
 export class EmailSettings implements IEmailSettings {
 
   private static checkVariable(variable) {
-    if (variable === undefined) {
-      return false;
-    }
-    return true;
+    return variable !== undefined;
   }
+
   public from: string;
   public orgRegTo: string;
   public apiKey: string;

diff --git a/src/service/email.service.ts b/src/service/email.service.ts
@@ -107,8 +107,8 @@ export class EmailService {
       config.email.templateIdOrgReqApprove = mailInfo.templateIds.orgReqApprove;
       config.email.templateIdOrgReqRefuse = mailInfo.templateIds.orgReqRefuse;
       sgMail.setApiKey(config.email.api);
-    } catch (e) {
-      this.logger.error('unable to get mailInfo from state.json');
+    } catch (err) {
+      this.logger.error(`unable to get mailInfo from state.json: ${err}`);
     }
     this.checkVariable('config.dashboardUrl', config.dashboardUrl);
     this.checkVariable('config.email.api', config.email.api);

diff --git a/src/util/file.ts b/src/util/file.ts
@@ -46,7 +46,7 @@ export const readFile = async (filepath: string) =>
 export const readFileSync = (filepath: string): string => {
     try {
         return fs.readFileSync(filepath).toString();
-    } catch (error) {
+    } catch {
         return '';
     }
 };