{"action":"created","comment":{"url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/comments/73328865","id":73328865,"diff_hunk":"@@ -250,25 +278,30 @@ module.exports = function (log) {\n         'X-Verify-Code': message.code\n       },\n       subject: gettext('Confirm new sign-in to Firefox'),\n-      template: 'verifyLoginEmail',\n+      template: templateName,\n       templateValues: {\n+        alternativeLink: alternativeLink,\n         device: this._formatUserAgentInfo(message),\n         email: message.email,\n         ip: message.ip,\n         link: link,\n         location: this._constructLocationString(message),\n         oneClickLink: oneClickLink,\n-        passwordChangeLink: this.createPasswordChangeLink(message.email),\n-        passwordChangeLinkAttributes: this._passwordChangeLinkAttributes(message.email),\n-        supportLinkAttributes: linkAttributes(this.supportUrl),\n-        supportUrl: this.supportUrl,\n+        passwordChangeLink: this.createPasswordChangeLink(message.email, templateName),\n+        passwordChangeLinkAttributes: this._passwordChangeLinkAttributes(message.email, templateName),\n+        privacyUrl: this.createPrivacyLink(templateName),\n+        supportLinkAttributes: this._supportLinkAttributes(templateName),\n+        supportUrl: this.createSupportLink(templateName),\n         timestamp: this._constructLocalTimeString(message.timeZone, message.acceptLanguage)\n       },\n       uid: message.uid\n     })\n   }\n \n   Mailer.prototype.recoveryEmail = function (message) {\n+    // TODO: There seems to be some discrepancy in email template names, some places","path":"mailer.js","position":166,"original_position":166,"commit_id":"8ec8d82a8b88556c4379fa038e8c06db65a4a953","original_commit_id":"8ec8d82a8b88556c4379fa038e8c06db65a4a953","user":{"login":"shane-tomlinson","id":848085,"avatar_url":"https://avatars.githubusercontent.com/u/848085?v=3","gravatar_id":"","url":"https://api.github.com/users/shane-tomlinson","html_url":"https://github.com/shane-tomlinson","followers_url":"https://api.github.com/users/shane-tomlinson/followers","following_url":"https://api.github.com/users/shane-tomlinson/following{/other_user}","gists_url":"https://api.github.com/users/shane-tomlinson/gists{/gist_id}","starred_url":"https://api.github.com/users/shane-tomlinson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shane-tomlinson/subscriptions","organizations_url":"https://api.github.com/users/shane-tomlinson/orgs","repos_url":"https://api.github.com/users/shane-tomlinson/repos","events_url":"https://api.github.com/users/shane-tomlinson/events{/privacy}","received_events_url":"https://api.github.com/users/shane-tomlinson/received_events","type":"User","site_admin":false},"body":"Ahha, that's the answer to [this question above](https://github.com/mozilla/fxa-auth-mailer/pull/190/files/8ec8d82a8b88556c4379fa038e8c06db65a4a953#r73328105). Time to unify nomenclature?","created_at":"2016-08-03T12:22:46Z","updated_at":"2016-08-03T12:22:46Z","html_url":"https://github.com/mozilla/fxa-auth-mailer/pull/190#discussion_r73328865","pull_request_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/190","_links":{"self":{"href":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/comments/73328865"},"html":{"href":"https://github.com/mozilla/fxa-auth-mailer/pull/190#discussion_r73328865"},"pull_request":{"href":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/190"}}},"pull_request":{"url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/190","id":78919283,"html_url":"https://github.com/mozilla/fxa-auth-mailer/pull/190","diff_url":"https://github.com/mozilla/fxa-auth-mailer/pull/190.diff","patch_url":"https://github.com/mozilla/fxa-auth-mailer/pull/190.patch","issue_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/issues/190","number":190,"state":"open","locked":false,"title":"feat(metrics): Add utm_* metrics","user":{"login":"vbudhram","id":1295288,"avatar_url":"https://avatars.githubusercontent.com/u/1295288?v=3","gravatar_id":"","url":"https://api.github.com/users/vbudhram","html_url":"https://github.com/vbudhram","followers_url":"https://api.github.com/users/vbudhram/followers","following_url":"https://api.github.com/users/vbudhram/following{/other_user}","gists_url":"https://api.github.com/users/vbudhram/gists{/gist_id}","starred_url":"https://api.github.com/users/vbudhram/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vbudhram/subscriptions","organizations_url":"https://api.github.com/users/vbudhram/orgs","repos_url":"https://api.github.com/users/vbudhram/repos","events_url":"https://api.github.com/users/vbudhram/events{/privacy}","received_events_url":"https://api.github.com/users/vbudhram/received_events","type":"User","site_admin":false},"body":"This PR adds a bunch of UTM params to all our email links. [Here is a list](https://github.com/mozilla/fxa-auth-mailer/issues/182#issuecomment-234312264) of the params and the links on each email. \r\n\r\nFixes #182 \r\nFIxes #188 ","created_at":"2016-07-26T20:25:51Z","updated_at":"2016-08-03T12:22:46Z","closed_at":null,"merged_at":null,"merge_commit_sha":"16a69518f1596f493aae9c1095eb77a9d9754771","assignee":{"login":"shane-tomlinson","id":848085,"avatar_url":"https://avatars.githubusercontent.com/u/848085?v=3","gravatar_id":"","url":"https://api.github.com/users/shane-tomlinson","html_url":"https://github.com/shane-tomlinson","followers_url":"https://api.github.com/users/shane-tomlinson/followers","following_url":"https://api.github.com/users/shane-tomlinson/following{/other_user}","gists_url":"https://api.github.com/users/shane-tomlinson/gists{/gist_id}","starred_url":"https://api.github.com/users/shane-tomlinson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shane-tomlinson/subscriptions","organizations_url":"https://api.github.com/users/shane-tomlinson/orgs","repos_url":"https://api.github.com/users/shane-tomlinson/repos","events_url":"https://api.github.com/users/shane-tomlinson/events{/privacy}","received_events_url":"https://api.github.com/users/shane-tomlinson/received_events","type":"User","site_admin":false},"assignees":[{"login":"shane-tomlinson","id":848085,"avatar_url":"https://avatars.githubusercontent.com/u/848085?v=3","gravatar_id":"","url":"https://api.github.com/users/shane-tomlinson","html_url":"https://github.com/shane-tomlinson","followers_url":"https://api.github.com/users/shane-tomlinson/followers","following_url":"https://api.github.com/users/shane-tomlinson/following{/other_user}","gists_url":"https://api.github.com/users/shane-tomlinson/gists{/gist_id}","starred_url":"https://api.github.com/users/shane-tomlinson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shane-tomlinson/subscriptions","organizations_url":"https://api.github.com/users/shane-tomlinson/orgs","repos_url":"https://api.github.com/users/shane-tomlinson/repos","events_url":"https://api.github.com/users/shane-tomlinson/events{/privacy}","received_events_url":"https://api.github.com/users/shane-tomlinson/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/190/commits","review_comments_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/190/comments","review_comment_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/comments{/number}","comments_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/issues/190/comments","statuses_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/statuses/8ec8d82a8b88556c4379fa038e8c06db65a4a953","head":{"label":"mozilla:issue-182-add-utm-params","ref":"issue-182-add-utm-params","sha":"8ec8d82a8b88556c4379fa038e8c06db65a4a953","user":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"repo":{"id":20310822,"name":"fxa-auth-mailer","full_name":"mozilla/fxa-auth-mailer","owner":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mozilla/fxa-auth-mailer","description":"Helper server for fxa-auth-server to send email","fork":false,"url":"https://api.github.com/repos/mozilla/fxa-auth-mailer","forks_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/forks","keys_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/teams","hooks_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/hooks","issue_events_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/issues/events{/number}","events_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/events","assignees_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/assignees{/user}","branches_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/branches{/branch}","tags_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/tags","blobs_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/git/refs{/sha}","trees_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/statuses/{sha}","languages_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/languages","stargazers_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/stargazers","contributors_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/contributors","subscribers_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/subscribers","subscription_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/subscription","commits_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/commits{/sha}","git_commits_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/git/commits{/sha}","comments_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/comments{/number}","issue_comment_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/issues/comments{/number}","contents_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/contents/{+path}","compare_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/merges","archive_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/downloads","issues_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/issues{/number}","pulls_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls{/number}","milestones_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/milestones{/number}","notifications_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/labels{/name}","releases_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/releases{/id}","deployments_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/deployments","created_at":"2014-05-29T22:53:57Z","updated_at":"2016-06-08T22:55:12Z","pushed_at":"2016-08-02T13:31:41Z","git_url":"git://github.com/mozilla/fxa-auth-mailer.git","ssh_url":"git@github.com:mozilla/fxa-auth-mailer.git","clone_url":"https://github.com/mozilla/fxa-auth-mailer.git","svn_url":"https://github.com/mozilla/fxa-auth-mailer","homepage":"","size":345,"stargazers_count":1,"watchers_count":1,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":15,"mirror_url":null,"open_issues_count":15,"forks":15,"open_issues":15,"watchers":1,"default_branch":"master"}},"base":{"label":"mozilla:master","ref":"master","sha":"5c9f6718fd59467b2172cd0167d7b0be541a638b","user":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"repo":{"id":20310822,"name":"fxa-auth-mailer","full_name":"mozilla/fxa-auth-mailer","owner":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mozilla/fxa-auth-mailer","description":"Helper server for fxa-auth-server to send email","fork":false,"url":"https://api.github.com/repos/mozilla/fxa-auth-mailer","forks_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/forks","keys_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/teams","hooks_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/hooks","issue_events_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/issues/events{/number}","events_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/events","assignees_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/assignees{/user}","branches_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/branches{/branch}","tags_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/tags","blobs_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/git/refs{/sha}","trees_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/statuses/{sha}","languages_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/languages","stargazers_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/stargazers","contributors_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/contributors","subscribers_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/subscribers","subscription_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/subscription","commits_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/commits{/sha}","git_commits_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/git/commits{/sha}","comments_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/comments{/number}","issue_comment_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/issues/comments{/number}","contents_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/contents/{+path}","compare_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/merges","archive_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/downloads","issues_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/issues{/number}","pulls_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls{/number}","milestones_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/milestones{/number}","notifications_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/labels{/name}","releases_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/releases{/id}","deployments_url":"https://api.github.com/repos/mozilla/fxa-auth-mailer/deployments","created_at":"2014-05-29T22:53:57Z","updated_at":"2016-06-08T22:55:12Z","pushed_at":"2016-08-02T13:31:41Z","git_url":"git://github.com/mozilla/fxa-auth-mailer.git","ssh_url":"git@github.com:mozilla/fxa-auth-mailer.git","clone_url":"https://github.com/mozilla/fxa-auth-mailer.git","svn_url":"https://github.com/mozilla/fxa-auth-mailer","homepage":"","size":345,"stargazers_count":1,"watchers_count":1,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":15,"mirror_url":null,"open_issues_count":15,"forks":15,"open_issues":15,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/190"},"html":{"href":"https://github.com/mozilla/fxa-auth-mailer/pull/190"},"issue":{"href":"https://api.github.com/repos/mozilla/fxa-auth-mailer/issues/190"},"comments":{"href":"https://api.github.com/repos/mozilla/fxa-auth-mailer/issues/190/comments"},"review_comments":{"href":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/190/comments"},"review_comment":{"href":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/mozilla/fxa-auth-mailer/pulls/190/commits"},"statuses":{"href":"https://api.github.com/repos/mozilla/fxa-auth-mailer/statuses/8ec8d82a8b88556c4379fa038e8c06db65a4a953"}}}}
{"actor":{"display_login":"shane-tomlinson"}}