app: added user prefix to password recovery and password change

Related to #615

Author: joshi1983

app/app/Http/Controllers/ChangePasswordController.php

@@ -43,7 +43,7 @@ public function post(Request $request)
                 }
             }
             if ($failing) {
-                return Redirect::to('change-password')->withErrors($validator)->withInput();
+                return Redirect::to('/user/change-password')->withErrors($validator)->withInput();
             } else {
                 $user->password_hash = User::generateSaltedHash($request->input('new_password'));
                 $user->save();

app/app/Http/Controllers/PasswordRecoveryController.php

@@ -26,7 +26,7 @@ public function sendEmail(Request $request)
         );
         $validator = Validator::make(Input::all(), $validation_rules);
         if ($validator->fails()) {
-            return Redirect::to('password-recovery')->withErrors($validator)->withInput();
+            return Redirect::to('/user/password-recovery')->withErrors($validator)->withInput();
             ;
         }
         $email = trim(Input::get('email'));
@@ -38,7 +38,7 @@ public function sendEmail(Request $request)
 
         //Generate Password Recovery Link
         $token = str_random(60);
-        $recoveryLink = config('app.url')."/password-recovery/".$matching_user->email."/".$token;
+        $recoveryLink = config('app.url')."/user/password-recovery/".$matching_user->email."/".$token;
         $matching_user->password_recovery_token = $token;
         $matching_user->save();
 

app/resources/views/pages/password_recovery/form.blade.php

@@ -6,7 +6,7 @@
 	<p>Under development</p>
 
 	<div class="form-box">
-		<form method="post" action="/password-recovery">
+		<form method="post" action="/user/password-recovery">
 			{!! csrf_field() !!}
 			@include('pages.validation_messages', array('errors'=>$errors))					
 			<input class="clean" type="email" name="email" placeholder="Your Email">

app/resources/views/pages/password_recovery/reset_password.blade.php

@@ -4,7 +4,7 @@
 	<h1>Change Password</h1>
 
 	<div class="password-change-form">
-		<form method="post" action="/password-recovery/reset-password">
+		<form method="post" action="/user/password-recovery/reset-password">
 			<input type="hidden" name="user_email" value="{{ $user_email }}">
 			<input type="hidden" name="password_recovery_token" value="{{ $password_recovery_token }}">
 			{!! csrf_field() !!}

app/resources/views/pages/profile/change_password.blade.php

@@ -4,7 +4,7 @@
 	<h1>Change Password</h1>
 
 	<div class="password-change-form">
-		<form method="post" action="/change-password">
+		<form method="post" action="/user/change-password">
 			{!! csrf_field() !!}
 			@include('pages.validation_messages', array('errors'=>$errors))					
 			<div class="row">

app/resources/views/pages/profile/profile.blade.php

@@ -84,7 +84,7 @@
 							<label>Password</label>
 						</div>
 						<div class="col-sm-8 col-xs-7">
-							<a class="btn btn-default" href="/change-password">Change password</a>
+							<a class="btn btn-default" href="/user/change-password">Change password</a>
 						</div>
 					</div>
 				</div>

app/resources/views/pages/signin.blade.php

@@ -33,7 +33,7 @@ class="clean" name="email"
 
                         <div class="col-xs-12">
 							<div class="remember-password">
-								<a class="pull-right" href="/password-recovery"> Forgot Password? </a>
+								<a class="pull-right" href="/user/password-recovery"> Forgot Password? </a>
 							</div>
                         </div>
 

app/routes/password_recovery.php

@@ -1,11 +1,11 @@
 <?php
-Route::group(['prefix' => 'password-recovery'], function () {
+Route::group(['prefix' => 'user/password-recovery'], function () {
     Route::get('/', 'PasswordRecoveryController@form');
     Route::post('/', 'PasswordRecoveryController@sendEmail');
     Route::get('/{user_email}/{password_recovery_token}', 'PasswordRecoveryController@passwordRecover');
     Route::post('/reset-password', 'PasswordRecoveryController@resetPassword');
 });
-Route::group(['prefix' => 'change-password'], function () {
+Route::group(['prefix' => 'user/change-password'], function () {
     Route::get('/', 'ChangePasswordController@index');
     Route::post('/', 'ChangePasswordController@post');
 });

app/tests/PasswordChangeTest.php

@@ -5,6 +5,6 @@ class PasswordChangeTest extends TestCase
     public function testGet()
     {
         // Not signed in so should be redirected.
-        $this->assertEquals(302, $this->get('/change-password')->getStatusCode());
+        $this->assertEquals(302, $this->get('/user/change-password')->getStatusCode());
     }
 }

app/tests/PasswordRecoveryTest.php

@@ -4,9 +4,19 @@ class PasswordRecoveryTest extends TestCase
 {
     public function testGetForm()
     {
-        $response = $this->get('/password-recovery');
+        $response = $this->get('/user/password-recovery');
         $this->assertEquals(200, $response->getStatusCode());
         $content = $response->getContent();
         $this->assertTrue(strpos($content, 'Password Recovery') !== false);
     }
+
+    public function testPostInvalidEmailAddress()
+    {
+        $data = [
+            'email' => '',
+            'g-recaptcha-response' => ''
+        ];
+        $response = $this->post('/user/password-recovery', $data);
+        $this->assertEquals(302, $response->getStatusCode());
+    }
 }