extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2024-11-26 10:15:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Always On OTPs & Dots display and looping

Browse Source
This commit is contained in:
Bubka 2023-11-17 19:49:39 +01:00
parent a75e3c13f7
commit e8a3c441be
3 changed files with 96 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/js_vue3/services/twofaccountService.js vendored
View File

@ -3,12 +3,12 @@ import { httpClientFactory } from '@/services/httpClientFactory'
const apiClient = httpClientFactory('api')
export default {
getAll(withOtp = false) {
return apiClient.get('/twofaccounts' + (withOtp ? '?withOtp=1' : ''))
getAll(withOtp = false, config = {}) {
return apiClient.get('/twofaccounts' + (withOtp ? '?withOtp=1' : ''), { ...config })
},
getByIds(ids, withOtp = false) {
return apiClient.get('/twofaccounts?ids=' + ids + (withOtp ? '&withOtp=1' : ''))
getByIds(ids, withOtp = false, config = {}) {
return apiClient.get('/twofaccounts?ids=' + ids + (withOtp ? '&withOtp=1' : ''), { ...config })
},
get(id, config = {}) {

32
resources/js_vue3/stores/twofaccounts.js vendored
View File

@ -79,31 +79,33 @@ export const useTwofaccounts = defineStore({
/**
* Refreshes the accounts collection using the backend
*/
async fetch() {
async fetch(force = false) {
// We do not want to fetch fresh data multiple times in the same 2s timespan
const age = Math.floor(Date.now() - this.fetchedOn)
const isNotFresh = age > 2000
const isOutOfAge = age > 2000
if (isNotFresh) {
if (isOutOfAge || force) {
this.fetchedOn = Date.now()
await twofaccountService.getAll(! useUserStore().preferences.getOtpOnRequest).then(response => {
// Defines if the store was up-to-date with the backend
this.backendWasNewer = response.data.length !== this.items.length
this.items.forEach((item) => {
let matchingBackendItem = response.data.find(e => e.id === item.id)
if (matchingBackendItem == undefined) {
this.backendWasNewer = true
return;
}
for (const field in item) {
if (field !== 'otp' && item[field] != matchingBackendItem[field]) {
if (force) {
this.backendWasNewer = response.data.length !== this.items.length
this.items.forEach((item) => {
let matchingBackendItem = response.data.find(e => e.id === item.id)
if (matchingBackendItem == undefined) {
this.backendWasNewer = true
return;
}
}
})
for (const field in item) {
if (field !== 'otp' && item[field] != matchingBackendItem[field]) {
this.backendWasNewer = true
return;
}
}
})
}
// Updates the state
this.items = response.data

131
resources/js_vue3/views/twofaccounts/Accounts.vue
View File

@ -32,9 +32,8 @@
const showGroupSwitch = ref(false)
const showDestinationGroupSelector = ref(false)
const isDragging = ref(false)
const stepIndexesCache = ref({})
const isRenewingOTPs = ref(false)
const renewedOTPs = ref(null)
const renewedPeriod = ref(null)
const otpDisplay = ref(null)
const otpDisplayProps = ref({
@ -85,12 +84,17 @@
// This SFC is reached only if the user has some twofaccounts (see the starter middleware).
// This allows to display accounts without latency.
//
// We sync the store with the backend again to
twofaccounts.fetch().then(() => {
if (twofaccounts.backendWasNewer) {
notify.info({ text: trans('commons.data_refreshed_to_reflect_server_changes'), duration: 10000 })
}
})
// We sync the store with the backend again to
if (! user.preferences.getOtpOnRequest) {
updateTotps()
}
else {
twofaccounts.fetch().then(() => {
if (twofaccounts.backendWasNewer) {
notify.info({ text: trans('commons.data_refreshed_to_reflect_server_changes'), duration: 10000 })
}
})
}
groups.fetch()
})
@ -207,59 +211,69 @@
twofaccounts.saveOrder()
}
/**
* Turns dots On at the current step and caches the state
*/
function setCurrentStep(period, stepIndex) {
stepIndexesCache.value[period] = stepIndex
turnDotsOn(period, stepIndex)
}
/**
* Turns dots On at the cached step index
*/
function turnDotsOnFromCache(period, stepIndex) {
if (stepIndexesCache.value[period] != undefined) {
turnDotsOn(period, stepIndexesCache.value[period])
}
}
/**
* Turns dots On for all dots components that match the provided period
*/
function turnDotsOn(period, stepIndex) {
dotsRefs.value
.filter((dots) => dots.props.period == period)
.filter((dots) => dots.props.period == period || period == undefined)
.forEach((dot) => {
dot.turnOn(stepIndex)
})
}
/**
* Updates "Always On" OTPs for all TOTP accounts with the given period and restarts loopers
* Turns dots Off for all dots components that match the provided period
*/
function turnDotsOff(period) {
dotsRefs.value
.filter((dots) => dots.props.period == period || period == undefined)
.forEach((dot) => {
dot.turnOff()
})
}
/**
* Updates "Always On" OTPs for all TOTP accounts and (re)starts loopers
*/
async function updateTotps(period) {
isRenewingOTPs.value = true
renewedOTPs.value = period
twofaccountService.getByIds(twofaccounts.accountIdsWithPeriod(period).join(','), true).then(response => {
turnDotsOff(period)
let fetchPromise
if (period == undefined) {
renewedPeriod.value = -1
fetchPromise = twofaccountService.getAll(true)
} else {
renewedPeriod.value = period
fetchPromise = twofaccountService.getByIds(twofaccounts.accountIdsWithPeriod(period).join(','), true)
}
fetchPromise.then(response => {
let generatedAt = 0
// twofaccounts OTP updates
response.data.forEach((account) => {
const index = twofaccounts.items.findIndex(acc => acc.id === account.id)
twofaccounts.items[index].otp = account.otp
looperRefs.value.forEach((looper) => {
if (looper.props.period == period) {
nextTick().then(() => {
looper.startLoop(account.otp.generated_at)
})
}
})
if (twofaccounts.items[index] == undefined) {
twofaccounts.items.push(account)
}
else twofaccounts.items[index].otp = account.otp
generatedAt = account.otp.generated_at
})
// Loopers restart at new timestamp
looperRefs.value.forEach((looper) => {
if (looper.props.period == period || period == undefined) {
nextTick().then(() => {
looper.startLoop(generatedAt)
})
}
})
})
.finally(() => {
isRenewingOTPs.value = false
renewedOTPs.value = null
renewedPeriod.value = null
})
}
@ -339,6 +353,20 @@
@please-close-me="showOtpInModal = false">
</OtpDisplay>
</Modal>
<!-- totp loopers -->
<span v-if="!user.preferences.getOtpOnRequest">
<TotpLooper
v-for="period in twofaccounts.periods"
:key="period.period"
:autostart="false"
:period="period.period"
:generated_at="period.generated_at"
v-on:loop-ended="updateTotps(period.period)"
v-on:loop-started="turnDotsOn(period.period, $event)"
v-on:stepped-up="turnDotsOn(period.period, $event)"
ref="looperRefs"
></TotpLooper>
</span>
<!-- show accounts list -->
<div class="container" v-if="showAccounts" :class="bus.inManagementMode ? 'is-edit-mode' : ''">
<!-- accounts -->
@ -366,13 +394,17 @@
<transition name="popLater">
<div v-show="user.preferences.getOtpOnRequest == false && !bus.inManagementMode" class="has-text-right">
<span v-if="account.otp != undefined">
<span v-if="isRenewingOTPs == true && renewedOTPs == account.period" class="has-nowrap has-text-grey has-text-centered is-size-5">
<span v-if="isRenewingOTPs == true && (renewedPeriod == -1 || renewedPeriod == account.period)" class="has-nowrap has-text-grey has-text-centered is-size-5">
<FontAwesomeIcon :icon="['fas', 'circle-notch']" spin />
</span>
<span v-else class="always-on-otp is-clickable has-nowrap has-text-grey is-size-5 ml-4" @click="copyToClipboard(account.otp.password)" @keyup.enter="copyToClipboard(account.otp.password)" :title="$t('commons.copy_to_clipboard')">
{{ useDisplayablePassword(account.otp.password) }}
</span>
<Dots v-if="account.otp_type.includes('totp')" @hook:mounted="turnDotsOnFromCache(account.period)" :class="'condensed'" ref="dotsRefs" :period="account.period" />
<Dots
v-if="account.otp_type.includes('totp')"
:class="'condensed'"
ref="dotsRefs"
:period="account.period" />
</span>
<span v-else>
<!-- get hotp button -->
@ -415,18 +447,5 @@
</ActionButtons>
</VueFooter>
</div>
<!-- totp loopers -->
<span v-if="!user.preferences.getOtpOnRequest">
<TotpLooper
v-for="period in twofaccounts.periods"
:key="period.period"
:period="period.period"
:generated_at="period.generated_at"
v-on:loop-ended="updateTotps(period.period)"
v-on:loop-started="setCurrentStep(period.period, $event)"
v-on:stepped-up="setCurrentStep(period.period, $event)"
ref="looperRefs"
></TotpLooper>
</span>
</div>
</template>