Skip to content

Revert "CM-1485-do not call setSecret (#333)" #43

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

Merged
alexander2001i merged 1 commit into from
Feb 8, 2021
Merged

Revert "CM-1485-do not call setSecret (#333)" #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion packages/firebase/env/dev/env_secrets.dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"apiKey": "notrealapikey"
},
"mail": {
"SENDGRID_API_KEY": ""
"SENDGRID_API_KEY": "SG.Gxxxxx"
}
}
5 changes: 2 additions & 3 deletions packages/firebase/functions/src/notification/email/mailer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ const SENDGRID_APIKEY = 'SENDGRID_APIKEY';
const setApiKey = async () => {
const apiKey = await getSecret(SENDGRID_APIKEY);
sendgrid.setApiKey(apiKey);
env.mail.SENDGRID_API_KEY = apiKey;
}

export const sendMail = async (dest: string, subject: string, message: string, from = env.mail.sender, bcc = null): Promise<void> => {
// if env.mail.SENDGRID_API_KEY has no value, set it with apiKey
!env.mail.SENDGRID_API_KEY && await setApiKey();
// @question Moore, why are we awaiting this on every single mail we send?
await setApiKey();

await sendgrid.send({
to: dest,
Expand Down