added "I have already 2FA app" into recovery 2fa page

This commit is contained in:
Peter Papp
2021-07-16 18:16:11 +02:00
parent 097a930245
commit a438f8fb99
4 changed files with 20 additions and 21 deletions

View File

@@ -685,6 +685,7 @@ return [
'app_touch_icon_description' => 'If user store bookmark on his phone screen, this icon appear in app thumbnail. Preferred size is 156x156',
'select_search_placeholder' => 'Search in list...',
'2fa.settings.title' => 'Two Factor Authentication',
'2fa.i_have_2fa_app' => 'I have already 2FA app',
'popup_2fa.title' => 'Confirm Your Password',
'popup_2fa.input_label' => 'Password',
'popup_2fa.placeholder' => 'Type your password',

View File

@@ -85,13 +85,10 @@ export default {
let copyText = this.$refs.codes
copyText.select()
copyText.setSelectionRange(0, 99999)
document.execCommand('copy')
copyText.setAttribute('type', 'hidden')
window.getSelection().removeAllRanges()
events.$emit('toaster', {
type: 'success',
message: this.$t('popup_2fa.toaster_codes_copied'),
@@ -146,11 +143,6 @@ export default {
if ('two-factor-recovery-codes' === name)
this.getRecoveryCodes()
})
axios.get('/api/user/secret')
.then(response => {
console.log(response.data);
})
},
destroyed() {
events.off('popup:open')

View File

@@ -122,8 +122,14 @@
</ValidationObserver>
<div class="spinner-wrapper">
<Spinner v-if="isLoading" class="spinner"/>
<span class="additional-link">
<a @click="goToAuthPage('two-factor-authentication')" class="text-theme">
{{ $t('2fa.i_have_2fa_app') }}
</a>
</span>
<div v-if="isLoading" class="spinner-wrapper">
<Spinner class="spinner"/>
</div>
</AuthContent>
@@ -249,15 +255,15 @@
// End loading
this.isLoading = false
// If is enabled two factor authentication
// If is enabled two factor authentication
if(response.data.two_factor && ! this.validSignIn) {
this.validSignIn = true
this.goToAuthPage('two-factor-authentication')
}
// If is disabled two factor authentication
}
// If is disabled two factor authentication
if(! response.data.two_factor ) {
// Set login state

12
webpack.mix.js vendored
View File

@@ -34,12 +34,12 @@ mix.js('resources/js/main.js', 'public/js')
clientLogLevel: 'none'
}
})
// .options({
// hmrOptions: {
// host: '192.168.1.198',
// port: '8080'
// },
// })
/*.options({
hmrOptions: {
host: '192.168.1.198',
port: '8080'
},
})*/
.disableNotifications();
if (mix.inProduction()) {