Allow verify/change/add email/phone in profile.

This expands the 'change email' functionality to work with phone
number also, allow addition of missing details, and verifying of
unverified details.

1 files changed, 5 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Auth/Phone.pm b/perllib/FixMyStreet/App/Controller/Auth/Phone.pm
index 4f9a72594..4e9f92596 100644
--- a/perllib/FixMyStreet/App/Controller/Auth/Phone.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth/Phone.pm
@@ -53,7 +53,6 @@ sub sign_in : Private {
     }
 
     unless ($phone->is_mobile) {
-        $c->stash->{username} = $c->get_param('username'); # What was entered
         $c->stash->{username_error} = 'nonmobile';
         return;
     }
@@ -62,6 +61,7 @@ sub sign_in : Private {
 
     if ( FixMyStreet->config('SIGNUPS_DISABLED')
          && !$c->model('DB::User')->find({ phone => $number })
+         && !$c->stash->{current_user} # don't break the change phone flow
     ) {
         $c->stash->{template} = 'auth/token.html';
         return;
@@ -78,6 +78,10 @@ sub sign_in : Private {
         name => $c->get_param('name'),
         password => $user->password,
     };
+    if ($c->stash->{current_user}) {
+        $token_data->{old_user_id} = $c->stash->{current_user}->id;
+        $token_data->{r} = 'auth/change_phone/success';
+    }
 
     $c->forward('send_token', [ $token_data, 'phone_sign_in', $number ]);
 }