Remove a lot of stuff that deals with user activation.

This commit is contained in:
James Cole
2016-12-28 17:07:44 +01:00
parent 98d4bc48b6
commit f44336f7aa
18 changed files with 10 additions and 511 deletions

View File

@@ -49,6 +49,7 @@ Route::group(
/**
* For the two factor routes, the user must be logged in, but NOT 2FA. Account confirmation does not matter here.
* @deprecated
*/
Route::group(
['middleware' => 'user-logged-in-no-2fa', 'prefix' => 'two-factor', 'as' => 'two-factor.', 'namespace' => 'Auth'], function () {
@@ -59,18 +60,6 @@ Route::group(
}
);
/**
* For the confirmation routes, the user must be logged in, also 2FA, but his account must not be confirmed.
*/
Route::group(
['middleware' => 'user-logged-in-2fa-no-activation', 'namespace' => 'Auth'], function () {
Route::get('/confirm-your-account', ['uses' => 'ConfirmationController@confirmationError', 'as' => 'confirmation_error']);
Route::get('/resend-confirmation', ['uses' => 'ConfirmationController@resendConfirmation', 'as' => 'resend_confirmation']);
Route::get('/confirmation/{code}', ['uses' => 'ConfirmationController@doConfirmation', 'as' => 'do_confirm_account']);
}
);
/**
* For all other routes, the user must be fully authenticated and have an activated account.
*/