Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: catch errors of wrong use of handlebars #5527

Merged
merged 4 commits into from
May 8, 2024
Merged

feat: catch errors of wrong use of handlebars #5527

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa774a2
feat: catch errors of wrong use of handlebars
ainouzgali May 8, 2024
2b12e70
Merge branch 'next' into nv-3772-missing-catch-for-email-compile
ainouzgali May 8, 2024
2b557d9
feat: use type guard for error
ainouzgali May 8, 2024
19c4757
Merge remote-tracking branch 'origin/nv-3772-missing-catch-for-email-…
ainouzgali May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions packages/application-generic/src/usecases/compile-template/compile-template.usecase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Injectable } from '@nestjs/common';
import * as Handlebars from 'handlebars';
import { format } from 'date-fns';
import { HandlebarHelpersEnum } from '@novu/shared';
import { checkIsResponseError, HandlebarHelpersEnum } from '@novu/shared';

import { CompileTemplateCommand } from './compile-template.command';
import * as i18next from 'i18next';
import { ApiException } from '../../utils/exceptions';

const assertResult = (condition: boolean, options) => {
const fn = condition ? options.fn : options.inverse;
Expand Down Expand Up @@ -208,10 +209,18 @@ Handlebars.registerHelper(
export class CompileTemplate {
async execute(command: CompileTemplateCommand): Promise<string> {
const templateContent = command.template;

const template = Handlebars.compile(templateContent);

const result = template(command.data, {});
let result = '';
try {
const template = Handlebars.compile(templateContent);

result = template(command.data, {});
} catch (e: unknown) {
let errorMessage = `Message content could not be generated`;
if (checkIsResponseError(e)) {
errorMessage = e.message;
}
throw new ApiException(errorMessage);
}

return result.replace(/&#x27;/g, "'");
}
Expand Down
Loading