diff --git a/app/Http/Controllers/Auth/MfaBackupCodesController.php b/app/Http/Controllers/Auth/MfaBackupCodesController.php index 41c161d7c..65c809196 100644 --- a/app/Http/Controllers/Auth/MfaBackupCodesController.php +++ b/app/Http/Controllers/Auth/MfaBackupCodesController.php @@ -81,7 +81,7 @@ class MfaBackupCodesController extends Controller $loginService->reattemptLoginFor($user); if ($codeService->countCodesInSet($updatedCodes) < 5) { - $this->showWarningNotification('You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.'); + $this->showWarningNotification(trans('auth.mfa_backup_codes_usage_limit_warning')); } return redirect()->intended(); diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php index 2159cfb3b..a24ededd7 100644 --- a/resources/lang/en/auth.php +++ b/resources/lang/en/auth.php @@ -76,6 +76,36 @@ return [ 'user_invite_success' => 'Password set, you now have access to :appName!', // Multi-factor Authentication - 'mfa_use_totp' => 'Verify using a mobile app', - 'mfa_use_backup_codes' => 'Verify using a backup code', + 'mfa_setup' => 'Setup Multi-Factor Authentication', + 'mfa_setup_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.', + 'mfa_setup_configured' => 'Already Configured', + 'mfa_setup_reconfigure' => 'Reconfigure', + 'mfa_setup_remove_confirmation' => 'Are you sure you want to remove this multi-factor authentication method?', + 'mfa_setup_action' => 'Setup', + 'mfa_backup_codes_usage_limit_warning' => 'You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.', + 'mfa_option_totp_title' => 'Mobile App', + 'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.', + 'mfa_option_backup_codes_title' => 'Backup Codes', + 'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.', + 'mfa_gen_confirm_and_enable' => 'Confirm and Enable', + 'mfa_gen_backup_codes_title' => 'Backup Codes Setup', + 'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.', + 'mfa_gen_backup_codes_download' => 'Download Codes', + 'mfa_gen_backup_codes_usage_warning' => 'Each code can only be used once', + 'mfa_gen_totp_title' => 'Mobile App Setup', + 'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.', + 'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.', + 'mfa_gen_totp_verify_setup' => 'Verify Setup', + 'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:', + 'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here', + 'mfa_verify_access' => 'Verify Access', + 'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.', + 'mfa_verify_no_methods' => 'No Methods Configured', + 'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.', + 'mfa_verify_use_totp' => 'Verify using a mobile app', + 'mfa_verify_use_backup_codes' => 'Verify using a backup code', + 'mfa_verify_backup_code' => 'Backup Code', + 'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:', + 'mfa_verify_backup_code_enter_here' => 'Enter backup code here', + 'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:', ]; \ No newline at end of file diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 1861869e3..f93fb034b 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -39,6 +39,7 @@ return [ 'reset' => 'Reset', 'remove' => 'Remove', 'add' => 'Add', + 'configure' => 'Configure', 'fullscreen' => 'Fullscreen', 'favourite' => 'Favourite', 'unfavourite' => 'Unfavourite', diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php index d9b4854fe..87f672e4d 100755 --- a/resources/lang/en/settings.php +++ b/resources/lang/en/settings.php @@ -205,6 +205,10 @@ return [ 'users_api_tokens_create' => 'Create Token', 'users_api_tokens_expires' => 'Expires', 'users_api_tokens_docs' => 'API Documentation', + 'users_mfa' => 'Multi-Factor Authentication', + 'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.', + 'users_mfa_x_methods' => ':count method configured|:count methods configured', + 'users_mfa_configure' => 'Configure Methods', // API Tokens 'user_api_token_create' => 'Create API Token', diff --git a/resources/views/mfa/backup-codes-generate.blade.php b/resources/views/mfa/backup-codes-generate.blade.php index 6a491fc07..279ca68a0 100644 --- a/resources/views/mfa/backup-codes-generate.blade.php +++ b/resources/views/mfa/backup-codes-generate.blade.php @@ -4,12 +4,8 @@
-

Backup Codes

-

- Store the below list of codes in a safe place. - When accessing the system you'll be able to use one of the codes - as a second authentication mechanism. -

+

{{ trans('auth.mfa_gen_backup_codes_title') }}

+

{{ trans('auth.mfa_gen_backup_codes_desc') }}

@@ -20,18 +16,18 @@

- Download Codes + {{ trans('auth.mfa_gen_backup_codes_download') }}

- Each code can only be used once + {{ trans('auth.mfa_gen_backup_codes_usage_warning') }}

{{ csrf_field() }}
{{ trans('common.cancel') }} - +
diff --git a/resources/views/mfa/setup-method-row.blade.php b/resources/views/mfa/setup-method-row.blade.php new file mode 100644 index 000000000..e195174c1 --- /dev/null +++ b/resources/views/mfa/setup-method-row.blade.php @@ -0,0 +1,30 @@ +
+
+
{{ trans('auth.mfa_option_' . $method . '_title') }}
+

+ {{ trans('auth.mfa_option_' . $method . '_desc') }} +

+
+
+ @if($userMethods->has($method)) +
+ @icon('check-circle') + {{ trans('auth.mfa_setup_configured') }} +
+ {{ trans('auth.mfa_setup_reconfigure') }} +
+ +
+

{{ trans('auth.mfa_setup_remove_confirmation') }}

+
+ {{ csrf_field() }} + {{ method_field('delete') }} + +
+
+
+ @else + {{ trans('auth.mfa_setup_action') }} + @endif +
+
\ No newline at end of file diff --git a/resources/views/mfa/setup.blade.php b/resources/views/mfa/setup.blade.php index f670541bf..f3f290d4b 100644 --- a/resources/views/mfa/setup.blade.php +++ b/resources/views/mfa/setup.blade.php @@ -4,76 +4,13 @@
-

Setup Multi-Factor Authentication

-

- Setup multi-factor authentication as an extra layer of security - for your user account. -

+

{{ trans('auth.mfa_setup') }}

+

{{ trans('auth.mfa_setup_desc') }}

-
-
-
Mobile App
-

- To use multi-factor authentication you'll need a mobile application - that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator. -

-
-
- @if($userMethods->has('totp')) -
- @icon('check-circle') - Already configured -
- Reconfigure -
- -
-

Are you sure you want to remove this multi-factor authentication method?

-
- {{ csrf_field() }} - {{ method_field('delete') }} - -
-
-
- @else - Setup - @endif -
-
- -
-
-
Backup Codes
-

- Securely store a set of one-time-use backup codes - which you can enter to verify your identity. -

-
-
- @if($userMethods->has('backup_codes')) -
- @icon('check-circle') - Already configured -
- Reconfigure -
- -
-

Are you sure you want to remove this multi-factor authentication method?

-
- {{ csrf_field() }} - {{ method_field('delete') }} - -
-
-
- @else - Setup - @endif -
-
+ @foreach(['totp', 'backup_codes'] as $method) + @include('mfa.setup-method-row', ['method' => $method]) + @endforeach
diff --git a/resources/views/mfa/totp-generate.blade.php b/resources/views/mfa/totp-generate.blade.php index 2ed2677d1..8c470516f 100644 --- a/resources/views/mfa/totp-generate.blade.php +++ b/resources/views/mfa/totp-generate.blade.php @@ -4,14 +4,9 @@
-

Mobile App Setup

-

- To use multi-factor authentication you'll need a mobile application - that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator. -

-

- Scan the QR code below using your preferred authentication app to get started. -

+

{{ trans('auth.mfa_gen_totp_title') }}

+

{{ trans('auth.mfa_gen_totp_desc') }}

+

{{ trans('auth.mfa_gen_totp_scan') }}

@@ -19,24 +14,21 @@
-

Verify Setup

-

- Verify that all is working by entering a code, generated within your - authentication app, in the input box below: -

+

{{ trans('auth.mfa_gen_totp_verify_setup') }}

+

{{ trans('auth.mfa_gen_totp_verify_setup_desc') }}

{{ csrf_field() }} @if($errors->has('code'))
{{ $errors->first('code') }}
@endif
{{ trans('common.cancel') }} - +
diff --git a/resources/views/mfa/verify.blade.php b/resources/views/mfa/verify.blade.php index 7cab2edc4..3a1905e97 100644 --- a/resources/views/mfa/verify.blade.php +++ b/resources/views/mfa/verify.blade.php @@ -4,26 +4,18 @@
-

Verify Access

-

- Your user account requires you to confirm your identity via an additional level - of verification before you're granted access. - Verify using one of your configured methods to continue. -

+

{{ trans('auth.mfa_verify_access') }}

+

{{ trans('auth.mfa_verify_access_desc') }}

@if(!$method)
-
No Methods Configured
-

- No multi-factor authentication methods could be found for your account. - You'll need to set up at least one method before you gain access. -

+
{{ trans('auth.mfa_verify_no_methods') }}
+

{{ trans('auth.mfa_verify_no_methods_desc') }}

@endif - @if($method)
@include('mfa.verify.' . $method) @@ -33,7 +25,7 @@
@foreach($otherMethods as $otherMethod)
- {{ trans('auth.mfa_use_' . $otherMethod) }} + {{ trans('auth.mfa_verify_use_' . $otherMethod) }}
@endforeach @endif diff --git a/resources/views/mfa/verify/backup_codes.blade.php b/resources/views/mfa/verify/backup_codes.blade.php index 7179696cb..0e5b82086 100644 --- a/resources/views/mfa/verify/backup_codes.blade.php +++ b/resources/views/mfa/verify/backup_codes.blade.php @@ -1,14 +1,12 @@ -
Backup Code
+
{{ trans('auth.mfa_verify_backup_code') }}
-

- Enter one of your remaining backup codes below: -

+

{{ trans('auth.mfa_verify_backup_code_desc') }}

{{ csrf_field() }} @if($errors->has('code'))
{{ $errors->first('code') }}
diff --git a/resources/views/mfa/verify/totp.blade.php b/resources/views/mfa/verify/totp.blade.php index fffd30352..9a861fc6c 100644 --- a/resources/views/mfa/verify/totp.blade.php +++ b/resources/views/mfa/verify/totp.blade.php @@ -1,14 +1,12 @@ -
Mobile App
+
{{ trans('auth.mfa_option_totp_title') }}
-

- Enter the code, generated using your mobile app, below: -

+

{{ trans('auth.mfa_verify_totp_desc') }}

{{ csrf_field() }} @if($errors->has('code'))
{{ $errors->first('code') }}
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 2d719668f..4c733e6f6 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -64,11 +64,8 @@
-

Multi-Factor Authentication

-

- Setup multi-factor authentication as an extra layer of security - for your user account. -

+

{{ trans('settings.users_mfa') }}

+

{{ trans('settings.users_mfa_desc') }}

@if ($mfaMethods->count() > 0) @@ -76,11 +73,12 @@ @else @icon('cancel') @endif + {{ trans_choice('settings.users_mfa_x_methods', $mfaMethods->count()) }} {{ $mfaMethods->count() }} {{ $mfaMethods->count() === 1 ? 'method' : 'methods' }} configured
@if($user->id === user()->id) - Configure Methods + {{ trans('settings.users_mfa_configure') }} @endif
diff --git a/routes/web.php b/routes/web.php index b6590429c..a70d0d818 100644 --- a/routes/web.php +++ b/routes/web.php @@ -239,7 +239,7 @@ Route::group(['middleware' => 'guest'], function() { Route::post('/mfa/totp/verify', 'Auth\MfaTotpController@verify'); Route::post('/mfa/backup_codes/verify', 'Auth\MfaBackupCodesController@verify'); }); -Route::delete('/mfa/remove/{method}', 'Auth\MfaController@remove')->middleware('auth'); +Route::delete('/mfa/{method}/remove', 'Auth\MfaController@remove')->middleware('auth'); // Social auth routes Route::get('/login/service/{socialDriver}', 'Auth\SocialController@login'); diff --git a/tests/Auth/MfaConfigurationTest.php b/tests/Auth/MfaConfigurationTest.php index 63a5fa4dd..bdf26fb20 100644 --- a/tests/Auth/MfaConfigurationTest.php +++ b/tests/Auth/MfaConfigurationTest.php @@ -153,9 +153,9 @@ class MfaConfigurationTest extends TestCase MfaValue::upsertWithValue($admin, MfaValue::METHOD_TOTP, 'test'); $this->assertEquals(1, $admin->mfaValues()->count()); $resp = $this->actingAs($admin)->get('/mfa/setup'); - $resp->assertElementExists('form[action$="/mfa/remove/totp"]'); + $resp->assertElementExists('form[action$="/mfa/totp/remove"]'); - $resp = $this->delete("/mfa/remove/totp"); + $resp = $this->delete("/mfa/totp/remove"); $resp->assertRedirect("/mfa/setup"); $resp = $this->followRedirects($resp); $resp->assertSee('Multi-factor method successfully removed');