{"action":"created","comment":{"url":"https://api.github.com/repos/zotonic/zotonic/pulls/comments/191317880","pull_request_review_id":123864214,"id":191317880,"diff_hunk":"@@ -3,19 +3,30 @@\n {% block title %}{_ How to reset your password _}{% endblock %}\n \n {% block body %}\n-<p>{_ Hello _} {{ m.rsc[id].name_first|default:m.rsc[id].title }},</p>\n+{% if not id %}\n+    <p>{_ Hello _},</p>\n \n-<p>{_ You've requested a new password for _} <a href=\"{{ m.site.protocol }}://{{ m.site.hostname }}/\">{{ m.site.hostname }}</a>. {_ Below are your account details and a link to set a new password. _}</p>\n+    <p>{_ You've requested a new password for _} <a href=\"{{ m.site.protocol }}://{{ m.site.hostname }}/\">{{ m.site.hostname }}</a>.</p>\n \n-<p>{_ Your account name is _} “<strong>{{ m.identity[id].username|escape }}</strong>”.{% if m.identity[id].username != email|default:(m.rsc[id].email_raw) %} {_ The email address associated with your account is _} “<strong>{{ email|default:(m.rsc[id].email_raw)|escape }}</strong>”.{% endif %}</p>\n+    <p>{_ However this email address is not on our database of registered users and therefore the attempted password change has failed. _}</p>\n \n-{% all include \"_logon_extra_email_reset.tpl\" identity_types=m.identity[id].all_types %}\n+    <p>{_ If you think you have an account and were expecting this email, please try again using the email address you gave when signing up. _}</p>\n+{% else %}\n+    <p>{_ Hello _} {{ m.rsc[id].name_first|default:m.rsc[id].title }},</p>\n \n-<p>{_ Click on the link below to enter a new password, when clicking doesn't work then you can copy and paste the complete address to your browser. _}</p>","path":"modules/mod_authentication/templates/email_password_reset.tpl","position":19,"original_position":19,"commit_id":"ea5ecf9bf5bc387e06cec63dacaa388379f4384e","original_commit_id":"ae41eb03461db2f349910506050f6e31a8d9bcb6","user":{"login":"mworrell","id":38268,"avatar_url":"https://avatars3.githubusercontent.com/u/38268?v=4","gravatar_id":"","url":"https://api.github.com/users/mworrell","html_url":"https://github.com/mworrell","followers_url":"https://api.github.com/users/mworrell/followers","following_url":"https://api.github.com/users/mworrell/following{/other_user}","gists_url":"https://api.github.com/users/mworrell/gists{/gist_id}","starred_url":"https://api.github.com/users/mworrell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mworrell/subscriptions","organizations_url":"https://api.github.com/users/mworrell/orgs","repos_url":"https://api.github.com/users/mworrell/repos","events_url":"https://api.github.com/users/mworrell/events{/privacy}","received_events_url":"https://api.github.com/users/mworrell/received_events","type":"User","site_admin":false},"body":"Thanks, changed the text.","created_at":"2018-05-29T06:47:30Z","updated_at":"2018-05-29T06:47:31Z","html_url":"https://github.com/zotonic/zotonic/pull/1910#discussion_r191317880","pull_request_url":"https://api.github.com/repos/zotonic/zotonic/pulls/1910","author_association":"MEMBER","_links":{"self":{"href":"https://api.github.com/repos/zotonic/zotonic/pulls/comments/191317880"},"html":{"href":"https://github.com/zotonic/zotonic/pull/1910#discussion_r191317880"},"pull_request":{"href":"https://api.github.com/repos/zotonic/zotonic/pulls/1910"}},"in_reply_to_id":190831141},"pull_request":{"url":"https://api.github.com/repos/zotonic/zotonic/pulls/1910","id":190324755,"html_url":"https://github.com/zotonic/zotonic/pull/1910","diff_url":"https://github.com/zotonic/zotonic/pull/1910.diff","patch_url":"https://github.com/zotonic/zotonic/pull/1910.patch","issue_url":"https://api.github.com/repos/zotonic/zotonic/issues/1910","number":1910,"state":"open","locked":false,"title":"mod_authentication: don't tell if an email address is registered.","user":{"login":"mworrell","id":38268,"avatar_url":"https://avatars3.githubusercontent.com/u/38268?v=4","gravatar_id":"","url":"https://api.github.com/users/mworrell","html_url":"https://github.com/mworrell","followers_url":"https://api.github.com/users/mworrell/followers","following_url":"https://api.github.com/users/mworrell/following{/other_user}","gists_url":"https://api.github.com/users/mworrell/gists{/gist_id}","starred_url":"https://api.github.com/users/mworrell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mworrell/subscriptions","organizations_url":"https://api.github.com/users/mworrell/orgs","repos_url":"https://api.github.com/users/mworrell/repos","events_url":"https://api.github.com/users/mworrell/events{/privacy}","received_events_url":"https://api.github.com/users/mworrell/received_events","type":"User","site_admin":false},"body":"### Description\r\n\r\nFix #1802 \r\n\r\nIf a password reset is requested, then always send the email to the account(s) associated with the email address. If there is no associated account, then send an email telling there is no account.\r\n\r\n**Discussion**\r\n\r\nCurrently we send the email to both the primary email address and the entered email address.\r\n\r\nThis allows for the use case where the user lost control of one of the email addresses and forgot the other email address.\r\n\r\nIs this wanted behavior?\r\n\r\n**Todo**\r\n\r\n - [ ] Check wording of email and form\r\n - [ ] Translation strings\r\n\r\n### Checklist\r\n\r\n- [ ] documentation updated\r\n- [ ] tests added\r\n- [x] no BC breaks","created_at":"2018-05-24T15:10:41Z","updated_at":"2018-05-29T06:47:31Z","closed_at":null,"merged_at":null,"merge_commit_sha":"f3495778eec0f12ec577f285aa52a8a0e4094e6a","assignee":{"login":"mworrell","id":38268,"avatar_url":"https://avatars3.githubusercontent.com/u/38268?v=4","gravatar_id":"","url":"https://api.github.com/users/mworrell","html_url":"https://github.com/mworrell","followers_url":"https://api.github.com/users/mworrell/followers","following_url":"https://api.github.com/users/mworrell/following{/other_user}","gists_url":"https://api.github.com/users/mworrell/gists{/gist_id}","starred_url":"https://api.github.com/users/mworrell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mworrell/subscriptions","organizations_url":"https://api.github.com/users/mworrell/orgs","repos_url":"https://api.github.com/users/mworrell/repos","events_url":"https://api.github.com/users/mworrell/events{/privacy}","received_events_url":"https://api.github.com/users/mworrell/received_events","type":"User","site_admin":false},"assignees":[{"login":"mworrell","id":38268,"avatar_url":"https://avatars3.githubusercontent.com/u/38268?v=4","gravatar_id":"","url":"https://api.github.com/users/mworrell","html_url":"https://github.com/mworrell","followers_url":"https://api.github.com/users/mworrell/followers","following_url":"https://api.github.com/users/mworrell/following{/other_user}","gists_url":"https://api.github.com/users/mworrell/gists{/gist_id}","starred_url":"https://api.github.com/users/mworrell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mworrell/subscriptions","organizations_url":"https://api.github.com/users/mworrell/orgs","repos_url":"https://api.github.com/users/mworrell/repos","events_url":"https://api.github.com/users/mworrell/events{/privacy}","received_events_url":"https://api.github.com/users/mworrell/received_events","type":"User","site_admin":false}],"requested_reviewers":[{"login":"ddeboer","id":89267,"avatar_url":"https://avatars1.githubusercontent.com/u/89267?v=4","gravatar_id":"","url":"https://api.github.com/users/ddeboer","html_url":"https://github.com/ddeboer","followers_url":"https://api.github.com/users/ddeboer/followers","following_url":"https://api.github.com/users/ddeboer/following{/other_user}","gists_url":"https://api.github.com/users/ddeboer/gists{/gist_id}","starred_url":"https://api.github.com/users/ddeboer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ddeboer/subscriptions","organizations_url":"https://api.github.com/users/ddeboer/orgs","repos_url":"https://api.github.com/users/ddeboer/repos","events_url":"https://api.github.com/users/ddeboer/events{/privacy}","received_events_url":"https://api.github.com/users/ddeboer/received_events","type":"User","site_admin":false},{"login":"mmzeeman","id":1024972,"avatar_url":"https://avatars0.githubusercontent.com/u/1024972?v=4","gravatar_id":"","url":"https://api.github.com/users/mmzeeman","html_url":"https://github.com/mmzeeman","followers_url":"https://api.github.com/users/mmzeeman/followers","following_url":"https://api.github.com/users/mmzeeman/following{/other_user}","gists_url":"https://api.github.com/users/mmzeeman/gists{/gist_id}","starred_url":"https://api.github.com/users/mmzeeman/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mmzeeman/subscriptions","organizations_url":"https://api.github.com/users/mmzeeman/orgs","repos_url":"https://api.github.com/users/mmzeeman/repos","events_url":"https://api.github.com/users/mmzeeman/events{/privacy}","received_events_url":"https://api.github.com/users/mmzeeman/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/zotonic/zotonic/pulls/1910/commits","review_comments_url":"https://api.github.com/repos/zotonic/zotonic/pulls/1910/comments","review_comment_url":"https://api.github.com/repos/zotonic/zotonic/pulls/comments{/number}","comments_url":"https://api.github.com/repos/zotonic/zotonic/issues/1910/comments","statuses_url":"https://api.github.com/repos/zotonic/zotonic/statuses/ea5ecf9bf5bc387e06cec63dacaa388379f4384e","head":{"label":"zotonic:1802-password-reset","ref":"1802-password-reset","sha":"ea5ecf9bf5bc387e06cec63dacaa388379f4384e","user":{"login":"zotonic","id":829753,"avatar_url":"https://avatars3.githubusercontent.com/u/829753?v=4","gravatar_id":"","url":"https://api.github.com/users/zotonic","html_url":"https://github.com/zotonic","followers_url":"https://api.github.com/users/zotonic/followers","following_url":"https://api.github.com/users/zotonic/following{/other_user}","gists_url":"https://api.github.com/users/zotonic/gists{/gist_id}","starred_url":"https://api.github.com/users/zotonic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zotonic/subscriptions","organizations_url":"https://api.github.com/users/zotonic/orgs","repos_url":"https://api.github.com/users/zotonic/repos","events_url":"https://api.github.com/users/zotonic/events{/privacy}","received_events_url":"https://api.github.com/users/zotonic/received_events","type":"Organization","site_admin":false},"repo":{"id":1847706,"name":"zotonic","full_name":"zotonic/zotonic","owner":{"login":"zotonic","id":829753,"avatar_url":"https://avatars3.githubusercontent.com/u/829753?v=4","gravatar_id":"","url":"https://api.github.com/users/zotonic","html_url":"https://github.com/zotonic","followers_url":"https://api.github.com/users/zotonic/followers","following_url":"https://api.github.com/users/zotonic/following{/other_user}","gists_url":"https://api.github.com/users/zotonic/gists{/gist_id}","starred_url":"https://api.github.com/users/zotonic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zotonic/subscriptions","organizations_url":"https://api.github.com/users/zotonic/orgs","repos_url":"https://api.github.com/users/zotonic/repos","events_url":"https://api.github.com/users/zotonic/events{/privacy}","received_events_url":"https://api.github.com/users/zotonic/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/zotonic/zotonic","description":"Zotonic - The Erlang Web Framework & CMS","fork":false,"url":"https://api.github.com/repos/zotonic/zotonic","forks_url":"https://api.github.com/repos/zotonic/zotonic/forks","keys_url":"https://api.github.com/repos/zotonic/zotonic/keys{/key_id}","collaborators_url":"https://api.github.com/repos/zotonic/zotonic/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/zotonic/zotonic/teams","hooks_url":"https://api.github.com/repos/zotonic/zotonic/hooks","issue_events_url":"https://api.github.com/repos/zotonic/zotonic/issues/events{/number}","events_url":"https://api.github.com/repos/zotonic/zotonic/events","assignees_url":"https://api.github.com/repos/zotonic/zotonic/assignees{/user}","branches_url":"https://api.github.com/repos/zotonic/zotonic/branches{/branch}","tags_url":"https://api.github.com/repos/zotonic/zotonic/tags","blobs_url":"https://api.github.com/repos/zotonic/zotonic/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/zotonic/zotonic/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/zotonic/zotonic/git/refs{/sha}","trees_url":"https://api.github.com/repos/zotonic/zotonic/git/trees{/sha}","statuses_url":"https://api.github.com/repos/zotonic/zotonic/statuses/{sha}","languages_url":"https://api.github.com/repos/zotonic/zotonic/languages","stargazers_url":"https://api.github.com/repos/zotonic/zotonic/stargazers","contributors_url":"https://api.github.com/repos/zotonic/zotonic/contributors","subscribers_url":"https://api.github.com/repos/zotonic/zotonic/subscribers","subscription_url":"https://api.github.com/repos/zotonic/zotonic/subscription","commits_url":"https://api.github.com/repos/zotonic/zotonic/commits{/sha}","git_commits_url":"https://api.github.com/repos/zotonic/zotonic/git/commits{/sha}","comments_url":"https://api.github.com/repos/zotonic/zotonic/comments{/number}","issue_comment_url":"https://api.github.com/repos/zotonic/zotonic/issues/comments{/number}","contents_url":"https://api.github.com/repos/zotonic/zotonic/contents/{+path}","compare_url":"https://api.github.com/repos/zotonic/zotonic/compare/{base}...{head}","merges_url":"https://api.github.com/repos/zotonic/zotonic/merges","archive_url":"https://api.github.com/repos/zotonic/zotonic/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/zotonic/zotonic/downloads","issues_url":"https://api.github.com/repos/zotonic/zotonic/issues{/number}","pulls_url":"https://api.github.com/repos/zotonic/zotonic/pulls{/number}","milestones_url":"https://api.github.com/repos/zotonic/zotonic/milestones{/number}","notifications_url":"https://api.github.com/repos/zotonic/zotonic/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/zotonic/zotonic/labels{/name}","releases_url":"https://api.github.com/repos/zotonic/zotonic/releases{/id}","deployments_url":"https://api.github.com/repos/zotonic/zotonic/deployments","created_at":"2011-06-04T18:43:30Z","updated_at":"2018-05-27T03:38:51Z","pushed_at":"2018-05-29T06:46:04Z","git_url":"git://github.com/zotonic/zotonic.git","ssh_url":"git@github.com:zotonic/zotonic.git","clone_url":"https://github.com/zotonic/zotonic.git","svn_url":"https://github.com/zotonic/zotonic","homepage":"http://zotonic.com/","size":50489,"stargazers_count":557,"watchers_count":557,"language":"Erlang","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":166,"mirror_url":null,"archived":false,"open_issues_count":257,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0"},"forks":166,"open_issues":257,"watchers":557,"default_branch":"master"}},"base":{"label":"zotonic:0.x","ref":"0.x","sha":"3fcc16e5140a3ff6d5f256df02a7c4b9fe98aae3","user":{"login":"zotonic","id":829753,"avatar_url":"https://avatars3.githubusercontent.com/u/829753?v=4","gravatar_id":"","url":"https://api.github.com/users/zotonic","html_url":"https://github.com/zotonic","followers_url":"https://api.github.com/users/zotonic/followers","following_url":"https://api.github.com/users/zotonic/following{/other_user}","gists_url":"https://api.github.com/users/zotonic/gists{/gist_id}","starred_url":"https://api.github.com/users/zotonic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zotonic/subscriptions","organizations_url":"https://api.github.com/users/zotonic/orgs","repos_url":"https://api.github.com/users/zotonic/repos","events_url":"https://api.github.com/users/zotonic/events{/privacy}","received_events_url":"https://api.github.com/users/zotonic/received_events","type":"Organization","site_admin":false},"repo":{"id":1847706,"name":"zotonic","full_name":"zotonic/zotonic","owner":{"login":"zotonic","id":829753,"avatar_url":"https://avatars3.githubusercontent.com/u/829753?v=4","gravatar_id":"","url":"https://api.github.com/users/zotonic","html_url":"https://github.com/zotonic","followers_url":"https://api.github.com/users/zotonic/followers","following_url":"https://api.github.com/users/zotonic/following{/other_user}","gists_url":"https://api.github.com/users/zotonic/gists{/gist_id}","starred_url":"https://api.github.com/users/zotonic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zotonic/subscriptions","organizations_url":"https://api.github.com/users/zotonic/orgs","repos_url":"https://api.github.com/users/zotonic/repos","events_url":"https://api.github.com/users/zotonic/events{/privacy}","received_events_url":"https://api.github.com/users/zotonic/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/zotonic/zotonic","description":"Zotonic - The Erlang Web Framework & CMS","fork":false,"url":"https://api.github.com/repos/zotonic/zotonic","forks_url":"https://api.github.com/repos/zotonic/zotonic/forks","keys_url":"https://api.github.com/repos/zotonic/zotonic/keys{/key_id}","collaborators_url":"https://api.github.com/repos/zotonic/zotonic/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/zotonic/zotonic/teams","hooks_url":"https://api.github.com/repos/zotonic/zotonic/hooks","issue_events_url":"https://api.github.com/repos/zotonic/zotonic/issues/events{/number}","events_url":"https://api.github.com/repos/zotonic/zotonic/events","assignees_url":"https://api.github.com/repos/zotonic/zotonic/assignees{/user}","branches_url":"https://api.github.com/repos/zotonic/zotonic/branches{/branch}","tags_url":"https://api.github.com/repos/zotonic/zotonic/tags","blobs_url":"https://api.github.com/repos/zotonic/zotonic/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/zotonic/zotonic/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/zotonic/zotonic/git/refs{/sha}","trees_url":"https://api.github.com/repos/zotonic/zotonic/git/trees{/sha}","statuses_url":"https://api.github.com/repos/zotonic/zotonic/statuses/{sha}","languages_url":"https://api.github.com/repos/zotonic/zotonic/languages","stargazers_url":"https://api.github.com/repos/zotonic/zotonic/stargazers","contributors_url":"https://api.github.com/repos/zotonic/zotonic/contributors","subscribers_url":"https://api.github.com/repos/zotonic/zotonic/subscribers","subscription_url":"https://api.github.com/repos/zotonic/zotonic/subscription","commits_url":"https://api.github.com/repos/zotonic/zotonic/commits{/sha}","git_commits_url":"https://api.github.com/repos/zotonic/zotonic/git/commits{/sha}","comments_url":"https://api.github.com/repos/zotonic/zotonic/comments{/number}","issue_comment_url":"https://api.github.com/repos/zotonic/zotonic/issues/comments{/number}","contents_url":"https://api.github.com/repos/zotonic/zotonic/contents/{+path}","compare_url":"https://api.github.com/repos/zotonic/zotonic/compare/{base}...{head}","merges_url":"https://api.github.com/repos/zotonic/zotonic/merges","archive_url":"https://api.github.com/repos/zotonic/zotonic/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/zotonic/zotonic/downloads","issues_url":"https://api.github.com/repos/zotonic/zotonic/issues{/number}","pulls_url":"https://api.github.com/repos/zotonic/zotonic/pulls{/number}","milestones_url":"https://api.github.com/repos/zotonic/zotonic/milestones{/number}","notifications_url":"https://api.github.com/repos/zotonic/zotonic/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/zotonic/zotonic/labels{/name}","releases_url":"https://api.github.com/repos/zotonic/zotonic/releases{/id}","deployments_url":"https://api.github.com/repos/zotonic/zotonic/deployments","created_at":"2011-06-04T18:43:30Z","updated_at":"2018-05-27T03:38:51Z","pushed_at":"2018-05-29T06:46:04Z","git_url":"git://github.com/zotonic/zotonic.git","ssh_url":"git@github.com:zotonic/zotonic.git","clone_url":"https://github.com/zotonic/zotonic.git","svn_url":"https://github.com/zotonic/zotonic","homepage":"http://zotonic.com/","size":50489,"stargazers_count":557,"watchers_count":557,"language":"Erlang","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":166,"mirror_url":null,"archived":false,"open_issues_count":257,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0"},"forks":166,"open_issues":257,"watchers":557,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/zotonic/zotonic/pulls/1910"},"html":{"href":"https://github.com/zotonic/zotonic/pull/1910"},"issue":{"href":"https://api.github.com/repos/zotonic/zotonic/issues/1910"},"comments":{"href":"https://api.github.com/repos/zotonic/zotonic/issues/1910/comments"},"review_comments":{"href":"https://api.github.com/repos/zotonic/zotonic/pulls/1910/comments"},"review_comment":{"href":"https://api.github.com/repos/zotonic/zotonic/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/zotonic/zotonic/pulls/1910/commits"},"statuses":{"href":"https://api.github.com/repos/zotonic/zotonic/statuses/ea5ecf9bf5bc387e06cec63dacaa388379f4384e"}},"author_association":"MEMBER"}}
{"actor":{"display_login":"mworrell"}}