extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-06-19 03:16:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Complete the Import view with Aegis and 2FAS migrations support

Browse Source 
Close #128
This commit is contained in:
Bubka 2022-10-11 12:09:46 +02:00
parent ed19b482cd
commit e99c684018
4 changed files with 130 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/js/packages/fontawesome.js vendored
View File

@ -37,6 +37,7 @@ import {
faEye, faEye,
faEyeSlash, faEyeSlash,
faExternalLinkAlt, faExternalLinkAlt,
faCamera
} from '@fortawesome/free-solid-svg-icons' } from '@fortawesome/free-solid-svg-icons'
import { import {
@ -78,6 +79,7 @@ library.add(
faEye, faEye,
faEyeSlash, faEyeSlash,
faExternalLinkAlt, faExternalLinkAlt,
faCamera
); );
Vue.component('font-awesome-icon', FontAwesomeIcon) Vue.component('font-awesome-icon', FontAwesomeIcon)

226
resources/js/views/twofaccounts/Import.vue
View File

@ -5,124 +5,130 @@
<h1 class="title has-text-grey-dark"> <h1 class="title has-text-grey-dark">
{{ $t('twofaccounts.import.import') }} {{ $t('twofaccounts.import.import') }}
</h1> </h1>
<div> <div v-if="exportedAccounts.length == 0">
<div v-if="exportedAccounts.length == 0"> <div class="block is-size-7-mobile" v-html="$t('twofaccounts.import.import_legend')"></div>
<div class="block is-size-7-mobile" v-html="$t('twofaccounts.import.import_legend')"></div> <h5 class="title is-5 mb-3 has-text-grey">{{ $t('twofaccounts.import.qr_code') }}</h5>
<!-- scan button that launch camera stream --> <!-- scan button that launch camera stream -->
<div class="block"> <div class="block">
<button tabindex="0" class="button is-link is-rounded" @click="capture()"> <div class="buttons mb-0">
{{ $t('twofaccounts.forms.scan_qrcode') }} <button tabindex="0" class="button is-link is-rounded mr-0" @click="capture()">
<span class="icon">
<font-awesome-icon :icon="['fas', 'camera']" />
</span>
<span>{{ $t('twofaccounts.import.scan') }}</span>
</button> </button>
</div> <span class="p-2 mb-2">{{ $t('commons.or') }}</span>
<!-- upload a qr code (with basic file field and backend decoding) --> <!-- </div> -->
<div class="block"> <!-- upload a qr code (with basic file field and backend decoding) -->
<!-- <div class="block"> -->
<label role="button" tabindex="0" class="button is-link is-rounded is-outlined" ref="qrcodeInputLabel" @keyup.enter="$refs.qrcodeInputLabel.click()"> <label role="button" tabindex="0" class="button is-link is-rounded is-outlined" ref="qrcodeInputLabel" @keyup.enter="$refs.qrcodeInputLabel.click()">
{{ $t('twofaccounts.import.upload') }}
<input aria-hidden="true" tabindex="-1" class="file-input" type="file" accept="image/*" v-on:change="submitQrCode" ref="qrcodeInput"> <input aria-hidden="true" tabindex="-1" class="file-input" type="file" accept="image/*" v-on:change="submitQrCode" ref="qrcodeInput">
{{ $t('twofaccounts.forms.upload_qrcode') }}
</label> </label>
<field-error :form="form" field="qrcode" />
<p class="help">{{ $t('twofaccounts.import.supported_formats_for_qrcode_upload') }}</p>
</div> </div>
<!-- upload a file --> <field-error :form="uploadForm" field="qrcode" />
<div class="block"> <p class="help">{{ $t('twofaccounts.import.supported_formats_for_qrcode_upload') }}</p>
<label role="button" tabindex="0" class="button is-link is-rounded is-outlined" ref="fileInputLabel" @keyup.enter="$refs.fileInputLabel.click()"> </div>
<input aria-hidden="true" tabindex="-1" class="file-input" type="file" accept="text/plain,application/json,text/csv,.2fas" v-on:change="submitFile" ref="fileInput"> <h5 class="title is-5 mb-3 has-text-grey">{{ $t('commons.file') }}</h5>
{{ $t('twofaccounts.import.upload_a_file') }} <!-- upload a file -->
</label> <div class="block mb-6">
<field-error :form="uploadForm" field="file" /> <label role="button" tabindex="0" class="button is-link is-rounded is-outlined" ref="fileInputLabel" @keyup.enter="$refs.fileInputLabel.click()">
<p class="help">{{ $t('twofaccounts.import.supported_formats_for_file_upload') }}</p> <input aria-hidden="true" tabindex="-1" class="file-input" type="file" accept="text/plain,application/json,text/csv,.2fas" v-on:change="submitFile" ref="fileInput">
{{ $t('twofaccounts.import.upload') }}
</label>
<field-error :form="uploadForm" field="file" />
<p class="help">{{ $t('twofaccounts.import.supported_formats_for_file_upload') }}</p>
</div>
<!-- Supported migration resources -->
<h5 class="title is-5 mb-3 has-text-grey-dark">{{ $t('twofaccounts.import.supported_migration_formats') }}</h5>
<div class="field is-grouped is-grouped-multiline pt-0">
<div class="control">
<div class="tags has-addons">
<span class="tag is-dark">Google Auth</span>
<span class="tag is-black">{{ $t('twofaccounts.import.qr_code') }}</span>
</div>
</div> </div>
<div class="control">
<!-- Supported migration resources --> <div class="tags has-addons">
<h5 class="title is-5 mb-3">{{ $t('twofaccounts.import.supported_migration_formats') }}</h5> <span class="tag is-dark">Aegis Auth</span>
<div class="field is-grouped is-grouped-multiline pt-0"> <span class="tag is-black">JSON</span>
<div class="control">
<div class="tags has-addons">
<span class="tag is-dark">Google Auth</span>
<span class="tag is-black">{{ $t('twofaccounts.import.qr_code') }}</span>
</div>
</div> </div>
<div class="control"> </div>
<div class="tags has-addons"> <div class="control">
<span class="tag is-dark">Aegis Auth</span> <div class="tags has-addons">
<span class="tag is-black">JSON</span> <span class="tag is-dark">Aegis Auth</span>
</div> <span class="tag is-black">{{ $t('twofaccounts.import.plain_text') }}</span>
</div> </div>
<div class="control"> </div>
<div class="tags has-addons"> <div class="control">
<span class="tag is-dark">Aegis Auth</span> <div class="tags has-addons">
<span class="tag is-black">{{ $t('twofaccounts.import.plain_text') }}</span> <span class="tag is-dark">2FAS Auth</span>
</div> <span class="tag is-black">JSON</span>
</div>
<div class="control">
<div class="tags has-addons">
<span class="tag is-dark">2FAS Auth</span>
<span class="tag is-black">JSON</span>
</div>
</div> </div>
</div> </div>
</div> </div>
<div v-else> <span class="is-size-7" v-html="$t('twofaccounts.import.do_not_set_password_or_encryption')"></span>
<div v-for="(account, index) in exportedAccounts" :key="account.name" class="group-item has-text-light is-size-5 is-size-6-mobile"> </div>
<div class="is-flex is-justify-content-space-between"> <div v-else>
<!-- Account name --> <div v-for="(account, index) in exportedAccounts" :key="account.name" class="group-item has-text-light is-size-5 is-size-6-mobile">
<div v-if="account.id > -2 && account.imported !== 0" class="is-flex-grow-1 has-ellipsis is-clickable" @click="previewAccount(index)" :title="$t('twofaccounts.import.generate_a_test_password')"> <div class="is-flex is-justify-content-space-between">
<img v-if="account.icon && $root.appSettings.showAccountsIcons" class="import-icon" :src="'/storage/icons/' + account.icon" :alt="$t('twofaccounts.icon_for_account_x_at_service_y', {account: account.account, service: account.service})"> <!-- Account name -->
{{ account.account }} <div v-if="account.id > -2 && account.imported !== 0" class="is-flex-grow-1 has-ellipsis is-clickable" @click="previewAccount(index)" :title="$t('twofaccounts.import.generate_a_test_password')">
</div> <img v-if="account.icon && $root.appSettings.showAccountsIcons" class="import-icon" :src="'/storage/icons/' + account.icon" :alt="$t('twofaccounts.icon_for_account_x_at_service_y', {account: account.account, service: account.service})">
<div v-else class="is-flex-grow-1 has-ellipsis">{{ account.account }}</div> {{ account.account }}
<!-- buttons -->
<div v-if="account.imported === -1" class="tags is-flex-wrap-nowrap">
<!-- discard button -->
<button class="button tag is-dark has-text-grey-light" @click="discardAccount(index)" :title="$t('twofaccounts.import.discard_this_account')">
<font-awesome-icon :icon="['fas', 'trash']" />
</button>
<!-- import button -->
<button v-if="account.id > -2" class="button tag is-link" @click="createAccount(index)" :title="$t('twofaccounts.import.import_this_account')">
{{ $t('twofaccounts.import.to_import') }}
</button>
</div>
<!-- result label -->
<div v-else class="has-nowrap">
<span v-if="account.imported === 1" class="has-text-success">
{{ $t('twofaccounts.import.imported') }} <font-awesome-icon :icon="['fas', 'check']" />
</span>
<span v-else class="has-text-danger">
{{ $t('twofaccounts.import.failure') }} <font-awesome-icon :icon="['fas', 'times']" />
</span>
</div>
</div> </div>
<div class="is-size-6 is-size-7-mobile"> <div v-else class="is-flex-grow-1 has-ellipsis">{{ account.account }}</div>
<!-- service name --> <!-- buttons -->
<div class="is-family-primary has-text-grey">{{ $t('twofaccounts.import.issuer') }}: {{ account.service }}</div> <div v-if="account.imported === -1" class="tags is-flex-wrap-nowrap">
<!-- reasons to invalid G-Auth data --> <!-- discard button -->
<div v-if="account.id === -2" class="has-text-danger"> <button class="button tag is-dark has-text-grey-light" @click="discardAccount(index)" :title="$t('twofaccounts.import.discard_this_account')">
<font-awesome-icon class="mr-1" :icon="['fas', 'times-circle']" />{{ account.secret }} <font-awesome-icon :icon="['fas', 'trash']" />
</div> </button>
<!-- possible duplicates --> <!-- import button -->
<div v-if="account.id === -1 && account.imported !== 1 && !account.errors" class="has-text-warning"> <button v-if="account.id > -2" class="button tag is-link" @click="createAccount(index)" :title="$t('twofaccounts.import.import_this_account')">
<font-awesome-icon class="mr-1" :icon="['fas', 'exclamation-circle']" />{{ $t('twofaccounts.import.possible_duplicate') }} {{ $t('twofaccounts.import.to_import') }}
</div> </button>
<!-- errors during account creation --> </div>
<ul v-if="account.errors"> <!-- result label -->
<li v-for="(error) in account.errors" :key="error" class="has-text-danger">{{ error }}</li> <div v-else class="has-nowrap">
</ul> <span v-if="account.imported === 1" class="has-text-success">
{{ $t('twofaccounts.import.imported') }} <font-awesome-icon :icon="['fas', 'check']" />
</span>
<span v-else class="has-text-danger">
{{ $t('twofaccounts.import.failure') }} <font-awesome-icon :icon="['fas', 'times']" />
</span>
</div> </div>
</div> </div>
<!-- discard links --> <div class="is-size-6 is-size-7-mobile">
<div v-if="importableCount > 0" class="mt-2 is-size-7 is-pulled-right"> <!-- service name -->
<button v-if="duplicateCount" @click="discardDuplicates()" class="has-text-grey button is-small is-ghost">{{ $t('twofaccounts.import.discard_duplicates') }} ({{duplicateCount}})</button> <div class="is-family-primary has-text-grey">{{ $t('twofaccounts.import.issuer') }}: {{ account.service }}</div>
<button @click="discardAccounts()" class="has-text-grey button is-small is-ghost">{{ $t('twofaccounts.import.discard_all') }}</button> <!-- reasons to invalid G-Auth data -->
</div> <div v-if="account.id === -2" class="has-text-danger">
<div v-if="importedCount == exportedAccounts.length" class="mt-2 is-size-7 is-pulled-right"> <font-awesome-icon class="mr-1" :icon="['fas', 'times-circle']" />{{ account.secret }}
<button @click="exportedAccounts = []" class="has-text-grey button is-small is-ghost">{{ $t('commons.clear') }}</button> </div>
<!-- possible duplicates -->
<div v-if="account.id === -1 && account.imported !== 1 && !account.errors" class="has-text-warning">
<font-awesome-icon class="mr-1" :icon="['fas', 'exclamation-circle']" />{{ $t('twofaccounts.import.possible_duplicate') }}
</div>
<!-- errors during account creation -->
<ul v-if="account.errors">
<li v-for="(error) in account.errors" :key="error" class="has-text-danger">{{ error }}</li>
</ul>
</div> </div>
</div> </div>
<div v-if="isFetching && exportedAccounts.length === 0" class="has-text-centered"> <!-- discard links -->
<span class="is-size-4"> <div v-if="importableCount > 0" class="mt-2 is-size-7 is-pulled-right">
<font-awesome-icon :icon="['fas', 'spinner']" spin /> <button v-if="duplicateCount" @click="discardDuplicates()" class="has-text-grey button is-small is-ghost">{{ $t('twofaccounts.import.discard_duplicates') }} ({{duplicateCount}})</button>
</span> <button @click="discardAccounts()" class="has-text-grey button is-small is-ghost">{{ $t('twofaccounts.import.discard_all') }}</button>
</div> </div>
<div v-if="importedCount == exportedAccounts.length" class="mt-2 is-size-7 is-pulled-right">
<button @click="exportedAccounts = []" class="has-text-grey button is-small is-ghost">{{ $t('commons.clear') }}</button>
</div>
</div>
<div v-if="isFetching && exportedAccounts.length === 0" class="has-text-centered">
<span class="is-size-4">
<font-awesome-icon :icon="['fas', 'spinner']" spin />
</span>
</div> </div>
<!-- footer --> <!-- footer -->
<vue-footer :showButtons="true"> <vue-footer :showButtons="true">
@ -342,9 +348,12 @@
this.notifyValidAccountFound() this.notifyValidAccountFound()
}) })
.catch(error => { .catch(error => {
if( error.response.status !== 422 ) { if( error.response.status === 422 ) {
this.$notify({type: 'is-danger', text: this.$t(error.response.data.message) }) if (error.response.data.errors.file == undefined) {
this.$notify({type: 'is-danger', text: this.$t('errors.invalid_2fa_data') })
}
} }
else this.$notify({type: 'is-danger', text: error.response.data.message})
}); });
this.isFetching = false this.isFetching = false
@ -363,9 +372,16 @@
this.migrate(response.data.data) this.migrate(response.data.data)
}) })
.catch(error => { .catch(error => {
if( error.response.status !== 422 ) { if( error.response.status === 422 ) {
this.$notify({type: 'is-danger', text: this.$t(error.response.data.message) }) if (error.response.data.errors.qrcode == undefined) {
this.$notify({type: 'is-danger', text: this.$t('errors.invalid_2fa_data') })
}
} }
else this.$notify({type: 'is-danger', text: error.response.data.message})
// if( error.response.status !== 422 ) {
// this.$notify({type: 'is-danger', text: this.$t(error.response.data.message) })
// }
}); });
}, },

2
resources/lang/en/commons.php
View File

@ -64,4 +64,6 @@ return [
'check_for_update_help' => 'Automatically check (once a week) and warn when a new release of 2FAuth is published on Github', 'check_for_update_help' => 'Automatically check (once a week) and warn when a new release of 2FAuth is published on Github',
'2fauth_description' => 'A web app to manage your Two-Factor Authentication (2FA) accounts and generate their security codes', '2fauth_description' => 'A web app to manage your Two-Factor Authentication (2FA) accounts and generate their security codes',
'image_of_qrcode_to_scan' => 'Image of a QR code to scan', 'image_of_qrcode_to_scan' => 'Image of a QR code to scan',
'file' => 'File',
'or' => 'OR',
]; ];

8
resources/lang/en/twofaccounts.php
View File

@ -134,12 +134,13 @@ return [
'import' => [ 'import' => [
'import' => 'Import', 'import' => 'Import',
'to_import' => 'Import', 'to_import' => 'Import',
'import_legend' => '2FAuth can import data from various 2FA apps.<br />Use the Export feature of these apps to get a migration resource (a QR code or a file) and submit it using your preferred method below.', 'import_legend' => '2FAuth can import data from various 2FA apps.<br />Use the Export feature of these apps to get a migration resource (a QR code or a file) and load it using your preferred method below.',
'upload_a_file' => 'Upload a file', 'upload' => 'Upload',
'scan' => 'Scan',
'supported_formats_for_qrcode_upload' => 'Accepted: jpg, jpeg, png, bmp, gif, svg, or webp', 'supported_formats_for_qrcode_upload' => 'Accepted: jpg, jpeg, png, bmp, gif, svg, or webp',
'supported_formats_for_file_upload' => 'Accepted: Plain text, json, 2fas', 'supported_formats_for_file_upload' => 'Accepted: Plain text, json, 2fas',
'supported_migration_formats' => 'Supported migration formats', 'supported_migration_formats' => 'Supported migration formats',
'qr_code' => 'QR code', 'qr_code' => 'QR Code',
'plain_text' => 'Plain text', 'plain_text' => 'Plain text',
'issuer' => 'Issuer', 'issuer' => 'Issuer',
'imported' => 'Imported', 'imported' => 'Imported',
@ -154,6 +155,7 @@ return [
'possible_duplicate' => 'An account with the exact same data already exists', 'possible_duplicate' => 'An account with the exact same data already exists',
'invalid_account' => '- invalid account -', 'invalid_account' => '- invalid account -',
'invalid_service' => '- invalid service -', 'invalid_service' => '- invalid service -',
'do_not_set_password_or_encryption' => 'Do NOT set a password or encryption On when you export data from a 2FA app.',
], ],
]; ];