From 3c4040d31757fd19cff75da5c9a182bcf2b1f267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= Date: Mon, 31 Aug 2020 17:39:29 +0200 Subject: [PATCH] Rename and move some Controllers Re-enable Google Captcha for the remaining pages where it's needed --- .../AuthenticateController.php} | 5 ++- .../EmailController.php} | 5 ++- .../PasswordController.php} | 5 ++- .../RegisterController.php} | 7 ++-- flexiapi/routes/web.php | 36 +++++++++--------- flexiapi/storage/db.sqlite | Bin 0 -> 45056 bytes 6 files changed, 31 insertions(+), 27 deletions(-) rename flexiapi/app/Http/Controllers/{AccountAuthenticateController.php => Account/AuthenticateController.php} (97%) rename flexiapi/app/Http/Controllers/{AccountEmailController.php => Account/EmailController.php} (84%) rename flexiapi/app/Http/Controllers/{AccountPasswordController.php => Account/PasswordController.php} (94%) rename flexiapi/app/Http/Controllers/{AccountRegisterController.php => Account/RegisterController.php} (95%) create mode 100755 flexiapi/storage/db.sqlite diff --git a/flexiapi/app/Http/Controllers/AccountAuthenticateController.php b/flexiapi/app/Http/Controllers/Account/AuthenticateController.php similarity index 97% rename from flexiapi/app/Http/Controllers/AccountAuthenticateController.php rename to flexiapi/app/Http/Controllers/Account/AuthenticateController.php index 84b2cec..2676764 100644 --- a/flexiapi/app/Http/Controllers/AccountAuthenticateController.php +++ b/flexiapi/app/Http/Controllers/Account/AuthenticateController.php @@ -1,7 +1,8 @@ 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' ]); diff --git a/flexiapi/routes/web.php b/flexiapi/routes/web.php index b39c7bb..c163b9e 100644 --- a/flexiapi/routes/web.php +++ b/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'); diff --git a/flexiapi/storage/db.sqlite b/flexiapi/storage/db.sqlite new file mode 100755 index 0000000000000000000000000000000000000000..11b8e95e18bb9084d861f70290b194d381b9794b GIT binary patch literal 45056 zcmeI&Z%^As90%}o5-@}kZ`uQk?ZJ+85=1S?f5<32*(i%Nw3ZbLYCCDNOmZO}i5+aG zgGqY;>^TiL47t(Cj?YP6inE7RGs(pLCWKcsu?klMY_bKJVm zI?N4kixRqrzO&m3%k-)3*IPD^<1svk7vp=D&vu<4jB8S+Av=i66p_6k^g349;zjWs z$35f`vwCH4-3Dvgy>>`vv>9=}&+L#jESq1d!S_O^!;)+Dx*{bbuX40FE~`^h((zg( zV>ddE8^rI$v_+hFB?P-(_j+z6*uhZ=>c>$>(~u ze@E~(x%G@2G{vbuO!l3R4p z(ET3kiTg9Ua|g*?`>^fV{AszE!4B%In_X1DnyDK&AzR(v+^nr{SzBxOYY(?p?mswt z3@S%tR907SNk<<$Zi5|k?I8Hx^Berp3RoCetiy?{tSq^&w6^|5?J+ICB(O|9_tFW1 zGAg`WIr?x!R&Vht>_we&p`;6kqv_7MkUJ=KFklQ=LvN4qPBi zQkuuV+)b{$?#&(VNNiLrpOGN2|npTcy^0KO`(ob_y`=jjWt&nc( zSzOjg@X~SAwZ$ly(eAhhhUQpLneQ~6tg(+jrHOrJ$zlxe>@eTDh#rsML&15u!^hhP zxlwVWJc*ow{WhNyTLI&}AV#nBVLoMdA#+xM+~$#$qfaDRot~DCKZwfgIJ@y*lVGry zOO;d}WL#-9I1A5I+p)uX>+;xF5p#37^gB`hRDM-_Wmy?3o$^C$5P$##AOHafKmY;| zfB*y_0D*TTpce~-Nrq-6%upn#rm0TBX%+c3BX{5uX+cWPcE0TDnoy^`#`DzqlG$ z$znzjhXwQb0pgMlV*a03{vgUf%HRA08w4N#0SG_<0uX=z1Rwwb2tWV={{?~f^Z6Mm zwHPv5%;l$~c(Ef_lJe8i*}n<|MKS;9|MZUy0uX=z1Rwwb2tWV=5P$##AOL}DEKn3} z!~Fjm_b{3U0SG_<0uX=z1Rwwb2tWV=5FiBK|Kl!z00bZa0SG_<0uX=z1Rwwb2wZ;w zeE)y_`xq^R00bZa0SG_<0uX=z1Rwwb2;lpF+yfAR00bZa0SG_<0uX=z1Rwx`>o0)$ z|Ml-Z$C247HhXX=8K<@@)!RQd(59K zP8NeklfMRg^%kq|u|_