Skip to content

Unhardcode mail addresses #370

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

Open
matthijskooijman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Unhardcode mail addresses #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95d2323
Make support email addresses configurable
matthijskooijman Oct 19, 2024
99a1fb2
FIX configuration of e-mail from address
matthijskooijman Oct 19, 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
2 changes: 2 additions & 0 deletions config/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@
}
},
"from": "Citizen OS <no-reply@citizenos.com>",
"supportTo": "support@citizenos.com",
"feedbackTo": "support@citizenos.com",
"linkToPrivacyPolicy": "https://app.citizenos.com/en/topics/7abdd244-d45b-40d3-997c-a6290d4e972c",
"linkViewModerationGuidelines": "https://app.citizenos.com/en/topics/ac8b66a4-ca56-4d02-8406-5e19da73d7ce",
"trap": false,
Expand Down
8 changes: 2 additions & 6 deletions libs/email.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,8 @@ module.exports = function (app) {
_.cloneDeep(EMAIL_OPTIONS_DEFAULT), // Deep clone to guarantee no funky business messing with the class level defaults, cant use Object.assign({}.. as this is not a deep clone.
{
subject: 'Help request',
to: ['support@citizenos.com'],
to: [config.email.supportTo],
replyTo: debugData.email,
from: "no-reply@citizenos.com",
linkedData: {
translations: template.translations,
},
Expand All @@ -369,8 +368,7 @@ module.exports = function (app) {
_.cloneDeep(EMAIL_OPTIONS_DEFAULT), // Deep clone to guarantee no funky business messing with the class level defaults, cant use Object.assign({}.. as this is not a deep clone.
{
subject: 'Feedback',
to: ['support@citizenos.com'],
from: "no-reply@citizenos.com",
to: [config.email.feedbackTo],
linkedData: {
translations: template.translations,
},
Expand Down Expand Up @@ -410,7 +408,6 @@ module.exports = function (app) {
{
subject: template.translations.ACCOUNT_VERIFICATION.SUBJECT,
to: user.email,
from: "no-reply@citizenos.com",
//Placeholders
toUser: user,
linkVerify: linkVerify
Expand Down Expand Up @@ -450,7 +447,6 @@ module.exports = function (app) {
{
subject: template.translations.PASSWORD_RESET.SUBJECT,
to: user.email,
from: "no-reply@citizenos.com",
//Placeholders..
toUser: user,
linkReset: urlLib.getFe('/account/password/reset/:passwordResetCode', { passwordResetCode: passwordResetCode }, { email: user.email })
Expand Down