5 files changed, 14 insertions, 9 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index a47e74f19..71416622a 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1316,13 +1316,14 @@ sub user_add : Path('user_edit') : Args(0) {
     my $user = $c->model('DB::User')->find_or_create( {
         name => $c->get_param('name'),
         email => lc $c->get_param('email'),
+        email_verified => 1,
         phone => $c->get_param('phone') || undef,
         from_body => $c->get_param('body') || undef,
         flagged => $c->get_param('flagged') || 0,
         # Only superusers can create superusers
         is_superuser => ( $c->user->is_superuser && $c->get_param('is_superuser') ) || 0,
     }, {
-        key => 'users_email_key'
+        key => 'users_email_verified_key'
     } );
     $c->stash->{user} = $user;
     $c->forward('user_cobrand_extra_fields');
diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index 3e90fb7ca..3eb724ddd 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -76,7 +76,7 @@ sub sign_in : Private {
 
     if (   $email
         && $password
-        && $c->authenticate( { email => $email, password => $password } ) )
+        && $c->authenticate( { email => $email, email_verified => 1, password => $password } ) )
     {
 
         # unless user asked to be remembered limit the session to browser
@@ -233,7 +233,7 @@ sub token : Path('/M') : Args(1) {
     $user->facebook_id( $data->{facebook_id} ) if $data->{facebook_id};
     $user->twitter_id( $data->{twitter_id} ) if $data->{twitter_id};
     $user->update_or_insert;
-    $c->authenticate( { email => $user->email }, 'no_password' );
+    $c->authenticate( { email => $user->email, email_verified => 1 }, 'no_password' );
 
     # send the user to their page
     $c->detach( 'redirect_on_signin', [ $data->{r}, $data->{p} ] );
diff --git a/perllib/FixMyStreet/App/Controller/Auth/Social.pm b/perllib/FixMyStreet/App/Controller/Auth/Social.pm
index 17ace0205..097cac984 100644
--- a/perllib/FixMyStreet/App/Controller/Auth/Social.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth/Social.pm
@@ -185,7 +185,7 @@ sub oauth_success : Private {
 
     # If we've got here with a full user, log in
     if ($user) {
-        $c->authenticate( { email => $user->email }, 'no_password' );
+        $c->authenticate( { email => $user->email, email_verified => 1 }, 'no_password' );
         $c->stash->{login_success} = 1;
     }
 
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 562f9445a..3f940d838 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -354,8 +354,12 @@ sub report_import : Path('/import') {
     my $report_user = $c->model('DB::User')->find_or_create(
         {
             email => lc $input{email},
+            email_verified => 1,
             name  => $input{name},
             phone => $input{phone}
+        },
+        {
+            key => 'users_email_verified_key'
         }
     );
 
@@ -447,7 +451,7 @@ sub initialize_report : Private {
 
             if ($report) {
                 # log the problem creation user in to the site
-                $c->authenticate( { email => $report->user->email },
+                $c->authenticate( { email => $report->user->email, email_verified => 1 },
                     'no_password' );
 
                 # save the token to delete at the end
diff --git a/perllib/FixMyStreet/App/Controller/Tokens.pm b/perllib/FixMyStreet/App/Controller/Tokens.pm
index a1b0c57ba..1d4438828 100644
--- a/perllib/FixMyStreet/App/Controller/Tokens.pm
+++ b/perllib/FixMyStreet/App/Controller/Tokens.pm
@@ -109,7 +109,7 @@ sub confirm_problem : Path('/P') {
         $problem->user->twitter_id( $data->{twitter_id} ) if $data->{twitter_id};
         $problem->user->update;
     }
-    $c->authenticate( { email => $problem->user->email }, 'no_password' );
+    $c->authenticate( { email => $problem->user->email, email_verified => 1 }, 'no_password' );
     $c->set_session_cookie_expire(0);
 
     $c->stash->{created_report} = 'fromemail';
@@ -170,7 +170,7 @@ sub confirm_alert : Path('/A') {
     }
 
     if (!$alert->confirmed && $c->stash->{confirm_type} ne 'unsubscribe') {
-        $c->authenticate( { email => $alert->user->email }, 'no_password' );
+        $c->authenticate( { email => $alert->user->email, email_verified => 1 }, 'no_password' );
         $c->set_session_cookie_expire(0);
     }
 
@@ -237,7 +237,7 @@ sub confirm_update : Path('/C') {
         $comment->user->update;
     }
 
-    $c->authenticate( { email => $comment->user->email }, 'no_password' );
+    $c->authenticate( { email => $comment->user->email, email_verified => 1 }, 'no_password' );
     $c->set_session_cookie_expire(0);
 
     $c->forward('/report/update/confirm');
@@ -269,7 +269,7 @@ sub questionnaire : Path('/Q') : Args(1) {
 
     my $questionnaire = $c->stash->{questionnaire};
     if (!$questionnaire->whenanswered) {
-        $c->authenticate( { email => $questionnaire->problem->user->email }, 'no_password' );
+        $c->authenticate( { email => $questionnaire->problem->user->email, email_verified => 1 }, 'no_password' );
         $c->set_session_cookie_expire(0);
     }
     $c->forward( '/questionnaire/show' );