Skip to content

Commit

Permalink
Merge branch 'dev' into chore/decorators
Browse files Browse the repository at this point in the history
  • Loading branch information
cherylli authored Mar 8, 2024
2 parents d798954 + 2ac7681 commit 5708c39
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Another example [here](https://co-pilot.dev/changelog)
- Update test.yml to run e2e tests on pull requests to the main branch [#105](https://github.com/chingu-x/chingu-dashboard-be/pull/105)
- Add role and permission guard to some existing routes
[#112](https://github.com/chingu-x/chingu-dashboard-be/pull/112)
- Update email templates to use domain in environment variables [#110](https://github.com/chingu-x/chingu-dashboard-be/pull/110)

### Fixed
- Fix failed tests in app and ideation due to the change from jwt token response to http cookies ([#98](https://github.com/chingu-x/chingu-dashboard-be/pull/98))
Expand Down
5 changes: 2 additions & 3 deletions src/utils/emails/sendEmail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ export const sendAttemptedRegistrationEmail = async (email: string) => {
TemplateLanguage: true,
Variables: {
userEmail: email,
passwordResetPage:
"https://chingu-dashboard.vercel.app/users/reset-password",
passwordResetPage: `${process.env.FRONTEND_URL}/users/reset-password`,
},
},
],
Expand All @@ -64,7 +63,7 @@ export const sendPasswordResetEmail = async (email: string, token: string) => {
TemplateID: templateIds.passwordResetEmail,
TemplateLanguage: true,
Variables: {
passwordResetLink: `https://chingu-dashboard.vercel.app/users/reset-password?token=${token}`,
passwordResetLink: `${process.env.FRONTEND_URL}/users/reset-password?token=${token}`,
},
},
],
Expand Down

0 comments on commit 5708c39

Please sign in to comment.