Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.x] Fix error handling during 2FA confirmation #1030

Merged
merged 2 commits into from
Apr 6, 2022
Merged

[2.x] Fix error handling during 2FA confirmation #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
692a7ab
Prevent user reset when not yet finished confirming
ManuelLeiner Apr 5, 2022
cdfa12c
Show correct message and error
ManuelLeiner Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Http/Controllers/Inertia/Concerns/ConfirmsTwoFactorAuthentication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ protected function hasJustBegunConfirmingTwoFactorAuthentication(Request $reques
*/
protected function neverFinishedConfirmingTwoFactorAuthentication(Request $request, $currentTime)
{
return is_null($request->user()->two_factor_confirmed_at) &&
return ! array_key_exists('code', $request->session()->getOldInput()) &&
is_null($request->user()->two_factor_confirmed_at) &&
$request->session()->get('two_factor_confirming_at', 0) != $currentTime;
taylorotwell marked this conversation as resolved.
Show resolved Hide resolved
}
}
12 changes: 10 additions & 2 deletions stubs/inertia/resources/js/Pages/Profile/Partials/TwoFactorAuthenticationForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup>
import { ref, computed } from 'vue';
import { ref, computed, watch } from 'vue';
import { Inertia } from '@inertiajs/inertia';
import { useForm, usePage } from '@inertiajs/inertia-vue3';
import JetActionSection from '@/Jetstream/ActionSection.vue';
Expand Down Expand Up @@ -30,6 +30,13 @@ const twoFactorEnabled = computed(
() => ! enabling.value && usePage().props.value.user.two_factor_enabled,
);

watch(twoFactorEnabled, () => {
if (! twoFactorEnabled.value) {
confirmationForm.reset();
confirmationForm.clearErrors();
}
});

const enableTwoFactorAuthentication = () => {
enabling.value = true;

Expand Down Expand Up @@ -67,6 +74,7 @@ const showRecoveryCodes = () => {

const confirmTwoFactorAuthentication = () => {
confirmationForm.post('/user/confirmed-two-factor-authentication', {
errorBag: "confirmTwoFactorAuthentication",
preserveScroll: true,
preserveState: true,
onSuccess: () => {
Expand Down Expand Up @@ -111,7 +119,7 @@ const disableTwoFactorAuthentication = () => {
You have enabled two factor authentication.
</h3>

<h3 v-else-if="confirming" class="text-lg font-medium text-gray-900">
<h3 v-else-if="twoFactorEnabled && confirming" class="text-lg font-medium text-gray-900">
Finish enabling two factor authentication.
</h3>

Expand Down