{"action":"created","comment":{"url":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/comments/63567811","id":63567811,"diff_hunk":"@@ -1043,16 +1128,18 @@ module.exports = function (\n         log.begin('Account.RecoveryEmailResend', request)\n         var sessionToken = request.auth.credentials\n         var service = request.payload.service || request.query.service\n-        if (sessionToken.emailVerified ||\n-            Date.now() - sessionToken.verifierSetAt < config.smtp.resendBlackoutPeriod) {\n-          return reply({})\n-        }\n-        customs.check(\n-          request.app.clientAddress,\n-          sessionToken.email,\n-          'recoveryEmailResendCode')\n-          .then(\n-            mailer.sendVerifyCode.bind(\n+\n+        if (!sessionToken.emailVerified) {\n+          // Send email verification\n+          if (Date.now() - sessionToken.verifierSetAt < config.smtp.resendBlackoutPeriod) {\n+            return reply({})\n+          }\n+\n+          return customs.check(\n+            request.app.clientAddress,\n+            sessionToken.email,\n+            'recoveryEmailResendCode')\n+            .then(mailer.sendVerifyCode.bind(\n               mailer,\n               sessionToken,\n               sessionToken.emailCode,","path":"lib/routes/account.js","position":408,"original_position":408,"commit_id":"48a6fa6335a29dab371d68c31507408ebd655a0d","original_commit_id":"48a6fa6335a29dab371d68c31507408ebd655a0d","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":"@rfk I think the case you describe is accurate. However, I believe on the content-server side, when doing (3), an email is automatically sent when you login. @shane-tomlinson is that correct?\r\n\r\nAlso, when calling `/recovery_email/verify_code`, any valid `tokenVerificationId` will verify the account email associated [with it too.](https://github.com/mozilla/fxa-auth-server/blob/verify-token-full/lib/routes/account.js#L1253)\r\n\r\nWith this, I think we can simplify the logic of `/recovery_email/resend_code` to always send a `tokenVerificationId` associated with current session and have it validate sign-in and account?","created_at":"2016-05-17T17:35:04Z","updated_at":"2016-05-17T17:35:04Z","html_url":"https://github.com/mozilla/fxa-auth-server/pull/1232#discussion_r63567811","pull_request_url":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/1232","_links":{"self":{"href":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/comments/63567811"},"html":{"href":"https://github.com/mozilla/fxa-auth-server/pull/1232#discussion_r63567811"},"pull_request":{"href":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/1232"}}},"pull_request":{"url":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/1232","id":66620948,"html_url":"https://github.com/mozilla/fxa-auth-server/pull/1232","diff_url":"https://github.com/mozilla/fxa-auth-server/pull/1232.diff","patch_url":"https://github.com/mozilla/fxa-auth-server/pull/1232.patch","issue_url":"https://api.github.com/repos/mozilla/fxa-auth-server/issues/1232","number":1232,"state":"open","locked":false,"title":"WIP feat(mailer): Add Sign-in confirmation","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":"This is the aggregate branch, the plan is to develop in feature branches and cherry-pick into this branch.","created_at":"2016-04-15T10:23:48Z","updated_at":"2016-05-17T17:35:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e82ebda0af9d51ca9b5dcbbff557a122d5dc3d61","assignee":{"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},"milestone":{"url":"https://api.github.com/repos/mozilla/fxa-auth-server/milestones/61","html_url":"https://github.com/mozilla/fxa-auth-server/milestones/FxA-83:%20signin%20confirmation","labels_url":"https://api.github.com/repos/mozilla/fxa-auth-server/milestones/61/labels","id":1699495,"number":61,"title":"FxA-83: signin confirmation","description":"https://mozilla.aha.io/features/FXA-83","creator":{"login":"rfk","id":34695,"avatar_url":"https://avatars.githubusercontent.com/u/34695?v=3","gravatar_id":"","url":"https://api.github.com/users/rfk","html_url":"https://github.com/rfk","followers_url":"https://api.github.com/users/rfk/followers","following_url":"https://api.github.com/users/rfk/following{/other_user}","gists_url":"https://api.github.com/users/rfk/gists{/gist_id}","starred_url":"https://api.github.com/users/rfk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rfk/subscriptions","organizations_url":"https://api.github.com/users/rfk/orgs","repos_url":"https://api.github.com/users/rfk/repos","events_url":"https://api.github.com/users/rfk/events{/privacy}","received_events_url":"https://api.github.com/users/rfk/received_events","type":"User","site_admin":false},"open_issues":1,"closed_issues":2,"state":"open","created_at":"2016-04-12T04:41:47Z","updated_at":"2016-05-16T21:32:01Z","due_on":null,"closed_at":null},"commits_url":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/1232/commits","review_comments_url":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/1232/comments","review_comment_url":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/comments{/number}","comments_url":"https://api.github.com/repos/mozilla/fxa-auth-server/issues/1232/comments","statuses_url":"https://api.github.com/repos/mozilla/fxa-auth-server/statuses/48a6fa6335a29dab371d68c31507408ebd655a0d","head":{"label":"mozilla:verify-token-full","ref":"verify-token-full","sha":"48a6fa6335a29dab371d68c31507408ebd655a0d","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":10041891,"name":"fxa-auth-server","full_name":"mozilla/fxa-auth-server","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-server","description":"The Firefox Accounts authentication server.","fork":false,"url":"https://api.github.com/repos/mozilla/fxa-auth-server","forks_url":"https://api.github.com/repos/mozilla/fxa-auth-server/forks","keys_url":"https://api.github.com/repos/mozilla/fxa-auth-server/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mozilla/fxa-auth-server/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mozilla/fxa-auth-server/teams","hooks_url":"https://api.github.com/repos/mozilla/fxa-auth-server/hooks","issue_events_url":"https://api.github.com/repos/mozilla/fxa-auth-server/issues/events{/number}","events_url":"https://api.github.com/repos/mozilla/fxa-auth-server/events","assignees_url":"https://api.github.com/repos/mozilla/fxa-auth-server/assignees{/user}","branches_url":"https://api.github.com/repos/mozilla/fxa-auth-server/branches{/branch}","tags_url":"https://api.github.com/repos/mozilla/fxa-auth-server/tags","blobs_url":"https://api.github.com/repos/mozilla/fxa-auth-server/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mozilla/fxa-auth-server/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mozilla/fxa-auth-server/git/refs{/sha}","trees_url":"https://api.github.com/repos/mozilla/fxa-auth-server/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mozilla/fxa-auth-server/statuses/{sha}","languages_url":"https://api.github.com/repos/mozilla/fxa-auth-server/languages","stargazers_url":"https://api.github.com/repos/mozilla/fxa-auth-server/stargazers","contributors_url":"https://api.github.com/repos/mozilla/fxa-auth-server/contributors","subscribers_url":"https://api.github.com/repos/mozilla/fxa-auth-server/subscribers","subscription_url":"https://api.github.com/repos/mozilla/fxa-auth-server/subscription","commits_url":"https://api.github.com/repos/mozilla/fxa-auth-server/commits{/sha}","git_commits_url":"https://api.github.com/repos/mozilla/fxa-auth-server/git/commits{/sha}","comments_url":"https://api.github.com/repos/mozilla/fxa-auth-server/comments{/number}","issue_comment_url":"https://api.github.com/repos/mozilla/fxa-auth-server/issues/comments{/number}","contents_url":"https://api.github.com/repos/mozilla/fxa-auth-server/contents/{+path}","compare_url":"https://api.github.com/repos/mozilla/fxa-auth-server/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mozilla/fxa-auth-server/merges","archive_url":"https://api.github.com/repos/mozilla/fxa-auth-server/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mozilla/fxa-auth-server/downloads","issues_url":"https://api.github.com/repos/mozilla/fxa-auth-server/issues{/number}","pulls_url":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls{/number}","milestones_url":"https://api.github.com/repos/mozilla/fxa-auth-server/milestones{/number}","notifications_url":"https://api.github.com/repos/mozilla/fxa-auth-server/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mozilla/fxa-auth-server/labels{/name}","releases_url":"https://api.github.com/repos/mozilla/fxa-auth-server/releases{/id}","deployments_url":"https://api.github.com/repos/mozilla/fxa-auth-server/deployments","created_at":"2013-05-13T21:42:48Z","updated_at":"2016-05-12T12:46:27Z","pushed_at":"2016-05-17T17:27:36Z","git_url":"git://github.com/mozilla/fxa-auth-server.git","ssh_url":"git@github.com:mozilla/fxa-auth-server.git","clone_url":"https://github.com/mozilla/fxa-auth-server.git","svn_url":"https://github.com/mozilla/fxa-auth-server","homepage":"https://wiki.mozilla.org/Identity/Firefox_Accounts","size":5383,"stargazers_count":234,"watchers_count":234,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":60,"mirror_url":null,"open_issues_count":43,"forks":60,"open_issues":43,"watchers":234,"default_branch":"master"}},"base":{"label":"mozilla:master","ref":"master","sha":"236b19fbf8d9fba55d70295a888a62f3c18c279a","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":10041891,"name":"fxa-auth-server","full_name":"mozilla/fxa-auth-server","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-server","description":"The Firefox Accounts authentication server.","fork":false,"url":"https://api.github.com/repos/mozilla/fxa-auth-server","forks_url":"https://api.github.com/repos/mozilla/fxa-auth-server/forks","keys_url":"https://api.github.com/repos/mozilla/fxa-auth-server/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mozilla/fxa-auth-server/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mozilla/fxa-auth-server/teams","hooks_url":"https://api.github.com/repos/mozilla/fxa-auth-server/hooks","issue_events_url":"https://api.github.com/repos/mozilla/fxa-auth-server/issues/events{/number}","events_url":"https://api.github.com/repos/mozilla/fxa-auth-server/events","assignees_url":"https://api.github.com/repos/mozilla/fxa-auth-server/assignees{/user}","branches_url":"https://api.github.com/repos/mozilla/fxa-auth-server/branches{/branch}","tags_url":"https://api.github.com/repos/mozilla/fxa-auth-server/tags","blobs_url":"https://api.github.com/repos/mozilla/fxa-auth-server/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mozilla/fxa-auth-server/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mozilla/fxa-auth-server/git/refs{/sha}","trees_url":"https://api.github.com/repos/mozilla/fxa-auth-server/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mozilla/fxa-auth-server/statuses/{sha}","languages_url":"https://api.github.com/repos/mozilla/fxa-auth-server/languages","stargazers_url":"https://api.github.com/repos/mozilla/fxa-auth-server/stargazers","contributors_url":"https://api.github.com/repos/mozilla/fxa-auth-server/contributors","subscribers_url":"https://api.github.com/repos/mozilla/fxa-auth-server/subscribers","subscription_url":"https://api.github.com/repos/mozilla/fxa-auth-server/subscription","commits_url":"https://api.github.com/repos/mozilla/fxa-auth-server/commits{/sha}","git_commits_url":"https://api.github.com/repos/mozilla/fxa-auth-server/git/commits{/sha}","comments_url":"https://api.github.com/repos/mozilla/fxa-auth-server/comments{/number}","issue_comment_url":"https://api.github.com/repos/mozilla/fxa-auth-server/issues/comments{/number}","contents_url":"https://api.github.com/repos/mozilla/fxa-auth-server/contents/{+path}","compare_url":"https://api.github.com/repos/mozilla/fxa-auth-server/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mozilla/fxa-auth-server/merges","archive_url":"https://api.github.com/repos/mozilla/fxa-auth-server/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mozilla/fxa-auth-server/downloads","issues_url":"https://api.github.com/repos/mozilla/fxa-auth-server/issues{/number}","pulls_url":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls{/number}","milestones_url":"https://api.github.com/repos/mozilla/fxa-auth-server/milestones{/number}","notifications_url":"https://api.github.com/repos/mozilla/fxa-auth-server/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mozilla/fxa-auth-server/labels{/name}","releases_url":"https://api.github.com/repos/mozilla/fxa-auth-server/releases{/id}","deployments_url":"https://api.github.com/repos/mozilla/fxa-auth-server/deployments","created_at":"2013-05-13T21:42:48Z","updated_at":"2016-05-12T12:46:27Z","pushed_at":"2016-05-17T17:27:36Z","git_url":"git://github.com/mozilla/fxa-auth-server.git","ssh_url":"git@github.com:mozilla/fxa-auth-server.git","clone_url":"https://github.com/mozilla/fxa-auth-server.git","svn_url":"https://github.com/mozilla/fxa-auth-server","homepage":"https://wiki.mozilla.org/Identity/Firefox_Accounts","size":5383,"stargazers_count":234,"watchers_count":234,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":60,"mirror_url":null,"open_issues_count":43,"forks":60,"open_issues":43,"watchers":234,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/1232"},"html":{"href":"https://github.com/mozilla/fxa-auth-server/pull/1232"},"issue":{"href":"https://api.github.com/repos/mozilla/fxa-auth-server/issues/1232"},"comments":{"href":"https://api.github.com/repos/mozilla/fxa-auth-server/issues/1232/comments"},"review_comments":{"href":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/1232/comments"},"review_comment":{"href":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/mozilla/fxa-auth-server/pulls/1232/commits"},"statuses":{"href":"https://api.github.com/repos/mozilla/fxa-auth-server/statuses/48a6fa6335a29dab371d68c31507408ebd655a0d"}}}}