Extracted text to translation files

Also aligned mfa method delete route to align with others.

diff --git a/app/Http/Controllers/Auth/MfaBackupCodesController.php b/app/Http/Controllers/Auth/MfaBackupCodesController.php
index 41c161d7c2145ebb5e28446b3e24f6bd336f37bc..65c809196c47c2206a085ee73560888cb11f1f70 100644 (file)
--- 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) {
         $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();
         }
 
         return redirect()->intended();

diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index 2159cfb3bbecfe8aea2e0f3879236f4d33b6d2be..a24ededd75db9b6a447f2163e0e9c07e9ce2d2f6 100644 (file)
--- 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
     '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
 ];
\ No newline at end of file

diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index 1861869e3ff7ac7d8ed69becf0e3f9aa2aef9a39..f93fb034bf7e4093ef54ff1878af7bfda3bbb0cd 100644 (file)
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -39,6 +39,7 @@ return [
     'reset' => 'Reset',
     'remove' => 'Remove',
     'add' => 'Add',
     'reset' => 'Reset',
     'remove' => 'Remove',
     'add' => 'Add',

+    'configure' => 'Configure',

     'fullscreen' => 'Fullscreen',
     'favourite' => 'Favourite',
     'unfavourite' => 'Unfavourite',
     'fullscreen' => 'Fullscreen',
     'favourite' => 'Favourite',
     'unfavourite' => 'Unfavourite',

diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index d9b4854fe5a35ed1b9da794b909a9e8fb549ee10..87f672e4d41937793dc71a4dd1be5ef56317e83e 100755 (executable)
--- 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_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',
 
     // 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 6a491fc07f68d40ca6209c6e28e66ccdec8df799..279ca68a0e32e962f0e6ed9324480cd8a7d72384 100644 (file)
--- a/resources/views/mfa/backup-codes-generate.blade.php
+++ b/resources/views/mfa/backup-codes-generate.blade.php
@@ -4,12 +4,8 @@
 
     <div class="container very-small py-xl">
         <div class="card content-wrap auto-height">
 
     <div class="container very-small py-xl">
         <div class="card content-wrap auto-height">

-            <h1 class="list-heading">Backup Codes</h1>
-            <p>
-                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.
-            </p>
+            <h1 class="list-heading">{{ trans('auth.mfa_gen_backup_codes_title') }}</h1>
+            <p>{{ trans('auth.mfa_gen_backup_codes_desc') }}</p>

 
             <div class="text-center mb-xs">
                 <div class="text-bigger code-base p-m" style="column-count: 2">
 
             <div class="text-center mb-xs">
                 <div class="text-bigger code-base p-m" style="column-count: 2">


@@ -20,18 +16,18 @@
             </div>
 
             <p class="text-right">
             </div>
 
             <p class="text-right">

-                <a href="{{ $downloadUrl }}" download="backup-codes.txt" class="button outline small">Download Codes</a>
+                <a href="{{ $downloadUrl }}" download="backup-codes.txt" class="button outline small">{{ trans('auth.mfa_gen_backup_codes_download') }}</a>

             </p>
 
             <p class="callout warning">
             </p>
 
             <p class="callout warning">

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

             </p>
 
             <form action="{{ url('/mfa/backup_codes/confirm') }}" method="POST">
                 {{ csrf_field() }}
                 <div class="mt-s text-right">
                     <a href="{{ url('/mfa/setup') }}" class="button outline">{{ trans('common.cancel') }}</a>
             </p>
 
             <form action="{{ url('/mfa/backup_codes/confirm') }}" method="POST">
                 {{ csrf_field() }}
                 <div class="mt-s text-right">
                     <a href="{{ url('/mfa/setup') }}" class="button outline">{{ trans('common.cancel') }}</a>

-                    <button class="button">Confirm and Enable</button>
+                    <button class="button">{{ trans('auth.mfa_gen_confirm_and_enable') }}</button>

                 </div>
             </form>
         </div>
                 </div>
             </form>
         </div>

diff --git a/resources/views/mfa/setup-method-row.blade.php b/resources/views/mfa/setup-method-row.blade.php
new file mode 100644 (file)
index 0000000..e195174
--- /dev/null
+++ b/resources/views/mfa/setup-method-row.blade.php
@@ -0,0 +1,30 @@
+<div class="grid half gap-xl">
+    <div>
+        <div class="setting-list-label">{{ trans('auth.mfa_option_' . $method . '_title') }}</div>
+        <p class="small">
+            {{ trans('auth.mfa_option_' . $method . '_desc') }}
+        </p>
+    </div>
+    <div class="pt-m">
+        @if($userMethods->has($method))
+            <div class="text-pos">
+                @icon('check-circle')
+                {{ trans('auth.mfa_setup_configured') }}
+            </div>
+            <a href="{{ url('/mfa/' . $method . '/generate') }}" class="button outline small">{{ trans('auth.mfa_setup_reconfigure') }}</a>
+            <div component="dropdown" class="inline relative">
+                <button type="button" refs="dropdown@toggle" class="button outline small">{{ trans('common.remove') }}</button>
+                <div refs="dropdown@menu" class="dropdown-menu">
+                    <p class="text-neg small px-m mb-xs">{{ trans('auth.mfa_setup_remove_confirmation') }}</p>
+                    <form action="{{ url('/mfa/' . $method . '/remove') }}" method="post">
+                        {{ csrf_field() }}
+                        {{ method_field('delete') }}
+                        <button class="text-primary small delete">{{ trans('common.confirm') }}</button>
+                    </form>
+                </div>
+            </div>
+        @else
+            <a href="{{ url('/mfa/' . $method . '/generate') }}" class="button outline">{{ trans('auth.mfa_setup_action') }}</a>
+        @endif
+    </div>
+</div>
\ No newline at end of file

diff --git a/resources/views/mfa/setup.blade.php b/resources/views/mfa/setup.blade.php
index f670541bfe61b41fade254eb9bfdc6c3459c2db5..f3f290d4bb2478423da9de22cf180d5174f3f466 100644 (file)
--- a/resources/views/mfa/setup.blade.php
+++ b/resources/views/mfa/setup.blade.php
@@ -4,76 +4,13 @@
     <div class="container small py-xl">
 
         <div class="card content-wrap auto-height">
     <div class="container small py-xl">
 
         <div class="card content-wrap auto-height">

-            <h1 class="list-heading">Setup Multi-Factor Authentication</h1>
-            <p class="mb-none">
-                Setup multi-factor authentication as an extra layer of security
-                for your user account.
-            </p>
+            <h1 class="list-heading">{{ trans('auth.mfa_setup') }}</h1>
+            <p class="mb-none"> {{ trans('auth.mfa_setup_desc') }}</p>

 
             <div class="setting-list">
 
             <div class="setting-list">

-                <div class="grid half gap-xl">
-                    <div>
-                        <div class="setting-list-label">Mobile App</div>
-                        <p class="small">
-                            To use multi-factor authentication you'll need a mobile application
-                            that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.
-                        </p>
-                    </div>
-                    <div class="pt-m">
-                        @if($userMethods->has('totp'))
-                            <div class="text-pos">
-                                @icon('check-circle')
-                                Already configured
-                            </div>
-                            <a href="{{ url('/mfa/totp/generate') }}" class="button outline small">Reconfigure</a>
-                            <div component="dropdown" class="inline relative">
-                                <button type="button" refs="dropdown@toggle" class="button outline small">Remove</button>
-                                <div refs="dropdown@menu" class="dropdown-menu">
-                                    <p class="text-neg small px-m mb-xs">Are you sure you want to remove this multi-factor authentication method?</p>
-                                    <form action="{{ url('/mfa/remove/totp') }}" method="post">
-                                        {{ csrf_field() }}
-                                        {{ method_field('delete') }}
-                                        <button class="text-primary small delete">{{ trans('common.confirm') }}</button>
-                                    </form>
-                                </div>
-                            </div>
-                        @else
-                            <a href="{{ url('/mfa/totp/generate') }}" class="button outline">Setup</a>
-                        @endif
-                    </div>
-                </div>
-
-                <div class="grid half gap-xl">
-                    <div>
-                        <div class="setting-list-label">Backup Codes</div>
-                        <p class="small">
-                            Securely store a set of one-time-use backup codes
-                            which you can enter to verify your identity.
-                        </p>
-                    </div>
-                    <div class="pt-m">
-                        @if($userMethods->has('backup_codes'))
-                            <div class="text-pos">
-                                @icon('check-circle')
-                                Already configured
-                            </div>
-                            <a href="{{ url('/mfa/backup_codes/generate') }}" class="button outline small">Reconfigure</a>
-                            <div component="dropdown" class="inline relative">
-                                <button type="button" refs="dropdown@toggle" class="button outline small">Remove</button>
-                                <div refs="dropdown@menu" class="dropdown-menu">
-                                    <p class="text-neg small px-m mb-xs">Are you sure you want to remove this multi-factor authentication method?</p>
-                                    <form action="{{ url('/mfa/remove/backup_codes') }}" method="post">
-                                        {{ csrf_field() }}
-                                        {{ method_field('delete') }}
-                                        <button class="text-primary small delete">{{ trans('common.confirm') }}</button>
-                                    </form>
-                                </div>
-                            </div>
-                        @else
-                            <a href="{{ url('/mfa/backup_codes/generate') }}" class="button outline">Setup</a>
-                        @endif
-                    </div>
-                </div>
+                @foreach(['totp', 'backup_codes'] as $method)
+                    @include('mfa.setup-method-row', ['method' => $method])
+                @endforeach

             </div>
 
         </div>
             </div>
 
         </div>

diff --git a/resources/views/mfa/totp-generate.blade.php b/resources/views/mfa/totp-generate.blade.php
index 2ed2677d1b48508c380e3fb35c806507276e8d4d..8c470516fc56830980ff39639d3b1c8c4ae5329c 100644 (file)
--- a/resources/views/mfa/totp-generate.blade.php
+++ b/resources/views/mfa/totp-generate.blade.php
@@ -4,14 +4,9 @@
 
     <div class="container very-small py-xl">
         <div class="card content-wrap auto-height">
 
     <div class="container very-small py-xl">
         <div class="card content-wrap auto-height">

-            <h1 class="list-heading">Mobile App Setup</h1>
-            <p>
-                To use multi-factor authentication you'll need a mobile application
-                that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.
-            </p>
-            <p>
-                Scan the QR code below using your preferred authentication app to get started.
-            </p>
+            <h1 class="list-heading">{{ trans('auth.mfa_gen_totp_title') }}</h1>
+            <p>{{ trans('auth.mfa_gen_totp_desc') }}</p>
+            <p>{{ trans('auth.mfa_gen_totp_scan') }}</p>

 
             <div class="text-center">
                 <div class="block inline">
 
             <div class="text-center">
                 <div class="block inline">


@@ -19,24 +14,21 @@
                 </div>
             </div>
 
                 </div>
             </div>
 

-            <h2 class="list-heading">Verify Setup</h2>
-            <p id="totp-verify-input-details" class="mb-s">
-                Verify that all is working by entering a code, generated within your
-                authentication app, in the input box below:
-            </p>
+            <h2 class="list-heading">{{ trans('auth.mfa_gen_totp_verify_setup') }}</h2>
+            <p id="totp-verify-input-details" class="mb-s">{{ trans('auth.mfa_gen_totp_verify_setup_desc') }}</p>

             <form action="{{ url('/mfa/totp/confirm') }}" method="POST">
                 {{ csrf_field() }}
                 <input type="text"
                        name="code"
                        aria-labelledby="totp-verify-input-details"
             <form action="{{ url('/mfa/totp/confirm') }}" method="POST">
                 {{ csrf_field() }}
                 <input type="text"
                        name="code"
                        aria-labelledby="totp-verify-input-details"

-                       placeholder="Provide your app generated code here"
+                       placeholder="{{ trans('auth.mfa_gen_totp_provide_code_here') }}"

                        class="input-fill-width {{ $errors->has('code') ? 'neg' : '' }}">
                 @if($errors->has('code'))
                     <div class="text-neg text-small px-xs">{{ $errors->first('code') }}</div>
                 @endif
                 <div class="mt-s text-right">
                     <a href="{{ url('/mfa/setup') }}" class="button outline">{{ trans('common.cancel') }}</a>
                        class="input-fill-width {{ $errors->has('code') ? 'neg' : '' }}">
                 @if($errors->has('code'))
                     <div class="text-neg text-small px-xs">{{ $errors->first('code') }}</div>
                 @endif
                 <div class="mt-s text-right">
                     <a href="{{ url('/mfa/setup') }}" class="button outline">{{ trans('common.cancel') }}</a>

-                    <button class="button">Confirm and Enable</button>
+                    <button class="button">{{ trans('auth.mfa_gen_confirm_and_enable') }}</button>

                 </div>
             </form>
         </div>
                 </div>
             </form>
         </div>

diff --git a/resources/views/mfa/verify.blade.php b/resources/views/mfa/verify.blade.php
index 7cab2edc4a99947efe65a8393098b1bfa9f62683..3a1905e970dd7cd2a8b728788103ae88f37bf965 100644 (file)
--- a/resources/views/mfa/verify.blade.php
+++ b/resources/views/mfa/verify.blade.php
@@ -4,26 +4,18 @@
     <div class="container very-small py-xl">
 
         <div class="card content-wrap auto-height">
     <div class="container very-small py-xl">
 
         <div class="card content-wrap auto-height">

-            <h1 class="list-heading">Verify Access</h1>
-            <p class="mb-none">
-                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.
-            </p>
+            <h1 class="list-heading">{{ trans('auth.mfa_verify_access') }}</h1>
+            <p class="mb-none">{{ trans('auth.mfa_verify_access_desc') }}</p>

 
             @if(!$method)
                 <hr class="my-l">
 
             @if(!$method)
                 <hr class="my-l">

-                <h5>No Methods Configured</h5>
-                <p class="small">
-                    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.
-                </p>
+                <h5>{{ trans('auth.mfa_verify_no_methods') }}</h5>
+                <p class="small">{{ trans('auth.mfa_verify_no_methods_desc') }}</p>

                 <div>
                 <div>

-                    <a href="{{ url('/mfa/setup') }}" class="button outline">Configure</a>
+                    <a href="{{ url('/mfa/setup') }}" class="button outline">{{ trans('common.configure') }}</a>

                 </div>
             @endif
 
                 </div>
             @endif
 

-

             @if($method)
                 <hr class="my-l">
                 @include('mfa.verify.' . $method)
             @if($method)
                 <hr class="my-l">
                 @include('mfa.verify.' . $method)


@@ -33,7 +25,7 @@
                 <hr class="my-l">
                 @foreach($otherMethods as $otherMethod)
                     <div class="text-center">
                 <hr class="my-l">
                 @foreach($otherMethods as $otherMethod)
                     <div class="text-center">

-                        <a href="{{ url("/mfa/verify?method={$otherMethod}") }}">{{ trans('auth.mfa_use_' . $otherMethod) }}</a>
+                        <a href="{{ url("/mfa/verify?method={$otherMethod}") }}">{{ trans('auth.mfa_verify_use_' . $otherMethod) }}</a>

                     </div>
                 @endforeach
             @endif
                     </div>
                 @endforeach
             @endif

diff --git a/resources/views/mfa/verify/backup_codes.blade.php b/resources/views/mfa/verify/backup_codes.blade.php
index 7179696cb3e95e2f153017cca6b456ae4770b085..0e5b8208642a87116633e073a6886b06b4b3b73b 100644 (file)
--- a/resources/views/mfa/verify/backup_codes.blade.php
+++ b/resources/views/mfa/verify/backup_codes.blade.php
@@ -1,14 +1,12 @@
-<div class="setting-list-label">Backup Code</div>
+<div class="setting-list-label">{{ trans('auth.mfa_verify_backup_code') }}</div>

 
 

-<p class="small mb-m">
-    Enter one of your remaining backup codes below:
-</p>
+<p class="small mb-m">{{ trans('auth.mfa_verify_backup_code_desc') }}</p>

 
 <form action="{{ url('/mfa/backup_codes/verify') }}" method="post">
     {{ csrf_field() }}
     <input type="text"
            name="code"
 
 <form action="{{ url('/mfa/backup_codes/verify') }}" method="post">
     {{ csrf_field() }}
     <input type="text"
            name="code"

-           placeholder="Enter backup code here"
+           placeholder="{{ trans('auth.mfa_verify_backup_code_enter_here') }}"

            class="input-fill-width {{ $errors->has('code') ? 'neg' : '' }}">
     @if($errors->has('code'))
         <div class="text-neg text-small px-xs">{{ $errors->first('code') }}</div>
            class="input-fill-width {{ $errors->has('code') ? 'neg' : '' }}">
     @if($errors->has('code'))
         <div class="text-neg text-small px-xs">{{ $errors->first('code') }}</div>

diff --git a/resources/views/mfa/verify/totp.blade.php b/resources/views/mfa/verify/totp.blade.php
index fffd3035229a1a935673aa102d796f24927377ac..9a861fc6caf0059cd6db042f3c91b3f449467b21 100644 (file)
--- a/resources/views/mfa/verify/totp.blade.php
+++ b/resources/views/mfa/verify/totp.blade.php
@@ -1,14 +1,12 @@
-<div class="setting-list-label">Mobile App</div>
+<div class="setting-list-label">{{ trans('auth.mfa_option_totp_title') }}</div>

 
 

-<p class="small mb-m">
-    Enter the code, generated using your mobile app, below:
-</p>
+<p class="small mb-m">{{ trans('auth.mfa_verify_totp_desc') }}</p>

 
 <form action="{{ url('/mfa/totp/verify') }}" method="post">
     {{ csrf_field() }}
     <input type="text"
            name="code"
 
 <form action="{{ url('/mfa/totp/verify') }}" method="post">
     {{ csrf_field() }}
     <input type="text"
            name="code"

-           placeholder="Provide your app generated code here"
+           placeholder="{{ trans('auth.mfa_gen_totp_provide_code_here') }}"

            class="input-fill-width {{ $errors->has('code') ? 'neg' : '' }}">
     @if($errors->has('code'))
         <div class="text-neg text-small px-xs">{{ $errors->first('code') }}</div>
            class="input-fill-width {{ $errors->has('code') ? 'neg' : '' }}">
     @if($errors->has('code'))
         <div class="text-neg text-small px-xs">{{ $errors->first('code') }}</div>

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 2d719668f65b3c65821d260df0f549a180f82811..4c733e6f684f907338036492b717e2e8394297ba 100644 (file)
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -64,11 +64,8 @@
         </section>
 
         <section class="card content-wrap auto-height">
         </section>
 
         <section class="card content-wrap auto-height">

-            <h2 class="list-heading">Multi-Factor Authentication</h2>
-            <p>
-                Setup multi-factor authentication as an extra layer of security
-                for your user account.
-            </p>
+            <h2 class="list-heading">{{ trans('settings.users_mfa') }}</h2>
+            <p>{{ trans('settings.users_mfa_desc') }}</p>

             <div class="grid half gap-xl v-center pb-s">
                 <div>
                     @if ($mfaMethods->count() > 0)
             <div class="grid half gap-xl v-center pb-s">
                 <div>
                     @if ($mfaMethods->count() > 0)


@@ -76,11 +73,12 @@
                     @else
                         <span class="text-neg">@icon('cancel')</span>
                     @endif
                     @else
                         <span class="text-neg">@icon('cancel')</span>
                     @endif

+                    {{ trans_choice('settings.users_mfa_x_methods', $mfaMethods->count()) }}

                     {{ $mfaMethods->count() }} {{ $mfaMethods->count() === 1 ? 'method' : 'methods' }} configured
                 </div>
                 <div class="text-m-right">
                     @if($user->id === user()->id)
                     {{ $mfaMethods->count() }} {{ $mfaMethods->count() === 1 ? 'method' : 'methods' }} configured
                 </div>
                 <div class="text-m-right">
                     @if($user->id === user()->id)

-                        <a href="{{ url('/mfa/setup')  }}" class="button outline">Configure Methods</a>
+                        <a href="{{ url('/mfa/setup')  }}" class="button outline">{{ trans('settings.users_mfa_configure') }}</a>

                     @endif
                 </div>
             </div>
                     @endif
                 </div>
             </div>

diff --git a/routes/web.php b/routes/web.php
index b6590429c3002c6bb088f7e5c962e195f34655bf..a70d0d818abbd21b466580654f5d05d1623758c3 100644 (file)
--- 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::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');
 
 // Social auth routes
 Route::get('/login/service/{socialDriver}', 'Auth\SocialController@login');

diff --git a/tests/Auth/MfaConfigurationTest.php b/tests/Auth/MfaConfigurationTest.php
index 63a5fa4ddcdaace437216d12b976d0a5bad75db6..bdf26fb206557dc55c01c5ebcb6299ef74225c76 100644 (file)
--- 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');
         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');
         $resp->assertRedirect("/mfa/setup");
         $resp = $this->followRedirects($resp);
         $resp->assertSee('Multi-factor method successfully removed');