Merge pull request #644 from hhaccessibility/profile-route-changes

joshi1983 · web-flow · commit 4faec3b4bd42 · 2018-07-20T20:03:55.000-04:00
Profile route changes
diff --git a/app/app/Http/Controllers/ChangePasswordController.php b/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();
diff --git a/app/app/Http/Controllers/PasswordRecoveryController.php b/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();
 
diff --git a/app/hhaccessibility.github.io b/app/hhaccessibility.github.io
diff --git a/app/resources/views/mails/password_recovery.blade.php b/app/resources/views/mails/password_recovery.blade.php
@@ -146,7 +146,7 @@
                                 <td bgcolor="#ffffff" align="center" style="padding: 20px 30px 60px 30px;">
                                     <table border="0" cellspacing="0" cellpadding="0">
                                         <tr>
-                                            <td align="center" style="border-radius: 3px;" bgcolor="#7c72dc"><a href="{{$recoveryLink}}" target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #7c72dc; display: inline-block;">Reset Password</a></td>
+                                            <td align="center" style="border-radius: 3px;" bgcolor="#2e1d66"><a href="{{$recoveryLink}}" target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px;display: inline-block;">Reset Password</a></td>
                                         </tr>
                                     </table>
                                 </td>
@@ -188,7 +188,7 @@
             <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;" >
                 <!-- HEADLINE -->
                 <tr>
-                    <td bgcolor="#C6C2ED" align="center" style="padding: 30px 30px 30px 30px; border-radius: 4px 4px 4px 4px; color: #666666; font-family: 'Lato', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
+                    <td bgcolor="#C6C2ED" align="center" style="padding: 30px 30px 30px 30px; border-radius: 4px 4px 4px 4px; color: #949ea7; font-family: 'Lato', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
                         <h2 style="font-size: 20px; font-weight: 400; color: #111111; margin: 0;">Need more help?</h2>
                         <p style="margin: 0;"><a href="https://app.accesslocator.com/contact" target="_blank" style="color: #7c72dc;">Contact Us</a></p>
                     </td>
diff --git a/app/resources/views/pages/password_recovery/form.blade.php b/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">
diff --git a/app/resources/views/pages/password_recovery/reset_password.blade.php b/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() !!}
diff --git a/app/resources/views/pages/profile/change_password.blade.php b/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">
diff --git a/app/resources/views/pages/profile/profile.blade.php b/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>
diff --git a/app/resources/views/pages/signin.blade.php b/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>
                                                 
diff --git a/app/routes/password_recovery.php b/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');
 });
diff --git a/app/tests/PasswordChangeTest.php b/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());
     }
 }
diff --git a/app/tests/PasswordRecoveryTest.php b/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());
+    }
 }
diff --git a/app/tests/SigninTest.php b/app/tests/SigninTest.php
@@ -48,7 +48,7 @@ private function checkLocationsAddedByMe()
 
     private function checkChangePasswordFeature()
     {
-        $response = $this->get('/change-password');
+        $response = $this->get('/user/change-password');
         $this->assertEquals(200, $response->getStatusCode());
         $content = $response->getContent();
         $this->assertTrue(strpos($content, 'Change Password') !== false);

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function post(Request $request)`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`if ($failing) {`
`46`		`- return Redirect::to('change-password')->withErrors($validator)->withInput();`
	`46`	`+ return Redirect::to('/user/change-password')->withErrors($validator)->withInput();`
`47`	`47`	`} else {`
`48`	`48`	`$user->password_hash = User::generateSaltedHash($request->input('new_password'));`
`49`	`49`	`$user->save();`