extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-08-09 05:54:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move token generation from dedicated class to TwoFAccount model class

Browse Source
This commit is contained in:
Bubka
2020-11-14 18:55:10 +01:00
parent acd1b2deca
commit 02798a05f3
5 changed files with 81 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/js/components/TokenDisplayer.vue
View File

@ -22,8 +22,6 @@
data() {
return {
id: null,
next_uri: '',
nextHotpCounter: null,
token : '',
timerID: null,
position: null,
@ -127,7 +125,7 @@
let spacePosition = Math.ceil(response.data.token.length / 2);
this.token = response.data.token.substr(0, spacePosition) + " " + response.data.token.substr(spacePosition);
this.position = response.data.position;
this.position = response.data.totpPosition;
let dots = this.$el.querySelector('.dots');
@ -172,11 +170,9 @@
let spacePosition = Math.ceil(response.data.token.length / 2);
this.token = response.data.token.substr(0, spacePosition) + " " + response.data.token.substr(spacePosition)
this.internal_hotpCounter = response.data.hotpCounter
this.nextHotpCounter = response.data.nextHotpCounter
this.next_uri = response.data.nextUri
this.$emit('update-hotp-counter', { nextHotpCounter: this.nextHotpCounter })
// returned counter & uri are incremented
this.$emit('increment-hotp', { nextHotpCounter: response.data.hotpCounter, nextUri: response.data.uri })
})
.catch(error => {

24
resources/js/views/twofaccounts/Create.vue
View File

@ -9,7 +9,7 @@
<font-awesome-icon :icon="['fas', 'image']" size="2x" />
</label>
<button class="delete delete-icon-button is-medium" v-if="tempIcon" @click.prevent="deleteIcon"></button>
<token-displayer ref="QuickFormTokenDisplayer" v-bind="form.data()">
<token-displayer ref="QuickFormTokenDisplayer" v-bind="form.data()" @increment-hotp="incrementHotp">
</token-displayer>
</div>
</div>
@ -128,7 +128,7 @@
</form>
<!-- modal -->
<modal v-model="ShowTwofaccountInModal">
<token-displayer ref="AdvancedFormTokenDisplayer" v-bind="form.data()" @update-hotp-counter="updateHotpCounter">
<token-displayer ref="AdvancedFormTokenDisplayer" v-bind="form.data()" @increment-hotp="incrementHotp">
</token-displayer>
</modal>
</form-wrapper>
@ -205,17 +205,6 @@
// set current temp icon as account icon
this.form.icon = this.tempIcon
// The quick form or the preview feature has incremented the HOTP counter so the next_uri property
// must be used as the uri to store.
// This could desynchronized the HOTP verification server and our local counter if the user never verified the HOTP but this
// is acceptable (and HOTP counter can be edited by the way)
if( this.isQuickForm && this.$refs.QuickFormTokenDisplayer.next_uri ) {
this.form.uri = this.$refs.QuickFormTokenDisplayer.next_uri
}
else if( this.$refs.AdvancedFormTokenDisplayer && this.$refs.AdvancedFormTokenDisplayer.next_uri ) {
this.form.uri = this.$refs.AdvancedFormTokenDisplayer.next_uri
}
await this.form.post('/api/twofaccounts')
if( this.form.errors.any() === false ) {
@ -253,7 +242,7 @@
this.form.fill(data)
this.form.otpType = this.form.otpType.toUpperCase()
this.form.secretIsBase32Encoded = 1
this.form.uri = '' // we don't want an uri now because the user can change any otp parameter in the form
this.form.uri = '' // we don't want the uri because the user can change any otp parameter in the form
},
@ -278,8 +267,13 @@
}
},
updateHotpCounter(payload) {
incrementHotp(payload) {
// The quick form or the preview feature has incremented the HOTP counter so we get the new value from
// the component.
// This could desynchronized the HOTP verification server and our local counter if the user never verified the HOTP but this
// is acceptable (and HOTP counter can be edited by the way)
this.form.hotpCounter = payload.nextHotpCounter
this.form.uri = payload.nextUri
},
},