This repository has been archived by the owner on Apr 3, 2019. It is now read-only.
fix(mail_helper): remove '<' from to headers in email service requests #2595
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
assigned 
vladikoff
reviewed
Aug 23, 2018
test/mail_helper.js
Outdated
| @@ -53,7 +53,15 @@ module.exports = (printLogs) => { | |||
| smsLink = smsUrlMatch && smsUrlMatch[1] | |||
| } | |||
|
|
|||
| var name = emailName(mail.headers.to) | |||
| var name | |||
| if (mail.headers['x-email-service'] === 'fxa-email-service' && mail.headers.to.charAt(0) === '<') { | |||
There was a problem hiding this comment.
@brizental I think we can just do something like:
'<emailservice.wat@restmail.net>'.replace(/\<(.*?)\>/g, '$1');on the mail.headers.to
There was a problem hiding this comment.
Yeah, so, that's what I did at first, but then I thought, what if we wanted the < or >, now I realize that's unlikely and also the way I do it doesn't prevent for this case... lol
Anyways, I'll change it.
brizental
force-pushed
the
brizental/mail-helper-fix
branch
from
ad45ecf
to
738a89c
Compare
vladikoff
suggested changes
Aug 23, 2018
test/mail_helper.js
Outdated
| // Workaround because the email service wraps this header in `< >`. | ||
| // See: https://github.com/mozilla/fxa-content-server/pull/6470#issuecomment-415224438 | ||
| var name = emailName(mail.headers.to.replace(/\<(.*?)\>/g, '$1')) | ||
| if (mail.headers['x-email-service'] === 'fxa-email-service' && mail.headers.to.charAt(0) === '<') { |
There was a problem hiding this comment.
WOW, that was careless of me to live it there, sorry. It's fixed.
brizental
force-pushed
the
brizental/mail-helper-fix
branch
2 times, most recently
from
b911262
to
a0cc416
Compare
vladikoff
approved these changes
Aug 23, 2018
vladikoff
force-pushed
the
brizental/mail-helper-fix
branch
from
a0cc416
to
a17ddf0
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is kind of a hack, unfortunately. It was necessary because of the way email-service dependencies do things.
See discussion: mozilla/fxa-content-server#6470
r? @vladikoff