mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-18 16:22:14 +00:00
added "I have already 2FA app" into recovery 2fa page
This commit is contained in:
@@ -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',
|
'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...',
|
'select_search_placeholder' => 'Search in list...',
|
||||||
'2fa.settings.title' => 'Two Factor Authentication',
|
'2fa.settings.title' => 'Two Factor Authentication',
|
||||||
|
'2fa.i_have_2fa_app' => 'I have already 2FA app',
|
||||||
'popup_2fa.title' => 'Confirm Your Password',
|
'popup_2fa.title' => 'Confirm Your Password',
|
||||||
'popup_2fa.input_label' => 'Password',
|
'popup_2fa.input_label' => 'Password',
|
||||||
'popup_2fa.placeholder' => 'Type your password',
|
'popup_2fa.placeholder' => 'Type your password',
|
||||||
|
|||||||
@@ -85,13 +85,10 @@ export default {
|
|||||||
let copyText = this.$refs.codes
|
let copyText = this.$refs.codes
|
||||||
|
|
||||||
copyText.select()
|
copyText.select()
|
||||||
|
copyText.setSelectionRange(0, 99999)
|
||||||
|
|
||||||
document.execCommand('copy')
|
document.execCommand('copy')
|
||||||
|
|
||||||
copyText.setAttribute('type', 'hidden')
|
|
||||||
|
|
||||||
window.getSelection().removeAllRanges()
|
|
||||||
|
|
||||||
events.$emit('toaster', {
|
events.$emit('toaster', {
|
||||||
type: 'success',
|
type: 'success',
|
||||||
message: this.$t('popup_2fa.toaster_codes_copied'),
|
message: this.$t('popup_2fa.toaster_codes_copied'),
|
||||||
@@ -146,11 +143,6 @@ export default {
|
|||||||
if ('two-factor-recovery-codes' === name)
|
if ('two-factor-recovery-codes' === name)
|
||||||
this.getRecoveryCodes()
|
this.getRecoveryCodes()
|
||||||
})
|
})
|
||||||
|
|
||||||
axios.get('/api/user/secret')
|
|
||||||
.then(response => {
|
|
||||||
console.log(response.data);
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
destroyed() {
|
destroyed() {
|
||||||
events.off('popup:open')
|
events.off('popup:open')
|
||||||
|
|||||||
@@ -122,8 +122,14 @@
|
|||||||
|
|
||||||
</ValidationObserver>
|
</ValidationObserver>
|
||||||
|
|
||||||
<div class="spinner-wrapper">
|
<span class="additional-link">
|
||||||
<Spinner v-if="isLoading" class="spinner"/>
|
<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>
|
</div>
|
||||||
|
|
||||||
</AuthContent>
|
</AuthContent>
|
||||||
@@ -249,15 +255,15 @@
|
|||||||
// End loading
|
// End loading
|
||||||
this.isLoading = false
|
this.isLoading = false
|
||||||
|
|
||||||
// If is enabled two factor authentication
|
// If is enabled two factor authentication
|
||||||
if(response.data.two_factor && ! this.validSignIn) {
|
if(response.data.two_factor && ! this.validSignIn) {
|
||||||
|
|
||||||
this.validSignIn = true
|
this.validSignIn = true
|
||||||
|
|
||||||
this.goToAuthPage('two-factor-authentication')
|
this.goToAuthPage('two-factor-authentication')
|
||||||
}
|
}
|
||||||
|
|
||||||
// If is disabled two factor authentication
|
// If is disabled two factor authentication
|
||||||
if(! response.data.two_factor ) {
|
if(! response.data.two_factor ) {
|
||||||
|
|
||||||
// Set login state
|
// Set login state
|
||||||
|
|||||||
12
webpack.mix.js
vendored
12
webpack.mix.js
vendored
@@ -34,12 +34,12 @@ mix.js('resources/js/main.js', 'public/js')
|
|||||||
clientLogLevel: 'none'
|
clientLogLevel: 'none'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
// .options({
|
/*.options({
|
||||||
// hmrOptions: {
|
hmrOptions: {
|
||||||
// host: '192.168.1.198',
|
host: '192.168.1.198',
|
||||||
// port: '8080'
|
port: '8080'
|
||||||
// },
|
},
|
||||||
// })
|
})*/
|
||||||
.disableNotifications();
|
.disableNotifications();
|
||||||
|
|
||||||
if (mix.inProduction()) {
|
if (mix.inProduction()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user