Rename and move some Controllers

Re-enable Google Captcha for the remaining pages where it's needed

flexiapi/app/Http/Controllers/Account/AuthenticateController.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Account;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
@@ -14,7 +15,7 @@ use App\Helpers\Utils;
 use App\Libraries\OvhSMS;
 use App\Mail\PasswordAuthentication;
 
-class AccountAuthenticateController extends Controller
+class AuthenticateController extends Controller
 {
     private $emailCodeSize = 14;
 

flexiapi/app/Http/Controllers/Account/EmailController.php

@@ -1,13 +1,14 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Account;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
 
 use App\Mail\ChangedEmail;
 
-class AccountEmailController extends Controller
+class EmailController extends Controller
 {
     public function show(Request $request)
     {

flexiapi/app/Http/Controllers/Account/PasswordController.php

@@ -1,14 +1,15 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Account;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 use App\Account;
 use App\Password;
 use App\Helpers\Utils;
 
-class AccountPasswordController extends Controller
+class PasswordController extends Controller
 {
     public function show(Request $request)
     {

flexiapi/app/Http/Controllers/Account/RegisterController.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Account;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Mail;
@@ -15,7 +16,7 @@ use App\Libraries\OvhSMS;
 use App\Mail\RegisterConfirmation;
 use App\Mail\NewsletterRegistration;
 
-class AccountRegisterController extends Controller
+class RegisterController extends Controller
 {
     private $emailCodeSize = 14;
 
@@ -47,7 +48,7 @@ class AccountRegisterController extends Controller
         $request->validate([
             'terms' => 'accepted',
             'username' => 'required|unique:external.accounts,username|min:6',
-            //'g-recaptcha-response'  => 'required|captcha',
+            'g-recaptcha-response'  => 'required|captcha',
             'email' => 'required|email|confirmed'
         ]);
 

flexiapi/routes/web.php

@@ -22,38 +22,38 @@
 Route::get('/', 'AccountController@home')->name('account.home');
 Route::get('terms', 'AccountController@terms')->name('account.terms');
 
-Route::get('login', 'AccountAuthenticateController@login')->name('account.login');
-Route::post('authenticate', 'AccountAuthenticateController@authenticate')->name('account.authenticate');
+Route::get('login', 'Account\AuthenticateController@login')->name('account.login');
+Route::post('authenticate', 'Account\AuthenticateController@authenticate')->name('account.authenticate');
 
-Route::get('login/email', 'AccountAuthenticateController@loginEmail')->name('account.login_email');
-Route::post('authenticate/email', 'AccountAuthenticateController@authenticateEmail')->name('account.authenticate.email');
-Route::get('authenticate/email/{code}', 'AccountAuthenticateController@authenticateEmailConfirm')->name('account.authenticate.email_confirm');
+Route::get('login/email', 'Account\AuthenticateController@loginEmail')->name('account.login_email');
+Route::post('authenticate/email', 'Account\AuthenticateController@authenticateEmail')->name('account.authenticate.email');
+Route::get('authenticate/email/{code}', 'Account\AuthenticateController@authenticateEmailConfirm')->name('account.authenticate.email_confirm');
 
-Route::get('login/phone', 'AccountAuthenticateController@loginPhone')->name('account.login_phone');
-Route::post('authenticate/phone', 'AccountAuthenticateController@authenticatePhone')->name('account.authenticate.phone');
-Route::post('authenticate/phone/confirm', 'AccountAuthenticateController@authenticatePhoneConfirm')->name('account.authenticate.phone_confirm');
+Route::get('login/phone', 'Account\AuthenticateController@loginPhone')->name('account.login_phone');
+Route::post('authenticate/phone', 'Account\AuthenticateController@authenticatePhone')->name('account.authenticate.phone');
+Route::post('authenticate/phone/confirm', 'Account\AuthenticateController@authenticatePhoneConfirm')->name('account.authenticate.phone_confirm');
 
-Route::get('register', 'AccountRegisterController@register')->name('account.register');
+Route::get('register', 'Account\RegisterController@register')->name('account.register');
 
 if (config('app.phone_authentication')) {
-    Route::get('register/phone', 'AccountRegisterController@registerPhone')->name('account.register.phone');
-    Route::post('register/phone', 'AccountRegisterController@storePhone')->name('account.store.phone');
+    Route::get('register/phone', 'Account\RegisterController@registerPhone')->name('account.register.phone');
+    Route::post('register/phone', 'Account\RegisterController@storePhone')->name('account.store.phone');
 }
 
-Route::get('register/email', 'AccountRegisterController@registerEmail')->name('account.register.email');
-Route::post('register/email', 'AccountRegisterController@storeEmail')->name('account.store.email');
+Route::get('register/email', 'Account\RegisterController@registerEmail')->name('account.register.email');
+Route::post('register/email', 'Account\RegisterController@storeEmail')->name('account.store.email');
 
 Route::group(['middleware' => 'auth'], function () {
     Route::get('panel', 'AccountController@panel')->name('account.panel');
-    Route::get('logout', 'AccountAuthenticateController@logout')->name('account.logout');
+    Route::get('logout', 'Account\AuthenticateController@logout')->name('account.logout');
 
     Route::get('delete', 'AccountController@delete')->name('account.delete');
     Route::delete('delete', 'AccountController@destroy')->name('account.destroy');
 
-    Route::get('email', 'AccountEmailController@show')->name('account.email');
-    Route::post('email', 'AccountEmailController@update')->name('account.email.update');
-    Route::get('password', 'AccountPasswordController@show')->name('account.password');
-    Route::post('password', 'AccountPasswordController@update')->name('account.password.update');
+    Route::get('email', 'Account\EmailController@show')->name('account.email');
+    Route::post('email', 'Account\EmailController@update')->name('account.email.update');
+    Route::get('password', 'Account\PasswordController@show')->name('account.password');
+    Route::post('password', 'Account\PasswordController@update')->name('account.password.update');
 
     Route::get('devices', 'Account\DeviceController@index')->name('account.device.index');
     Route::get('devices/delete/{id}', 'Account\DeviceController@delete')->name('account.device.delete');