Skip to content

[6.x] Fix 2FA setup modal not re-opening #14309

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

Merged
jasonvarga merged 4 commits into from
Mar 24, 2026
+14 −9
Merged

[6.x] Fix 2FA setup modal not re-opening #14309

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
047add5
Fix 2FA setup modal not re-opening
duncanmcclean Mar 20, 2026
531c30c
You're absolutley right!
duncanmcclean Mar 20, 2026
ea71ae4
check for recovery codes state
duncanmcclean Mar 23, 2026
630fa8b
unused emit
jasonvarga Mar 24, 2026
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
23 changes: 14 additions & 9 deletions resources/js/components/two-factor/Setup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<script setup>
import { ref, onMounted } from 'vue';
import { ref, onMounted, watch } from 'vue';
import TwoFactorRecoveryCodesModal from '@/components/two-factor/RecoveryCodesModal.vue';
import axios from 'axios';
import { Modal, Input, Button, Icon } from '@/components/ui';
import { Modal, ModalClose, Input, Button, Icon } from '@/components/ui';

const emit = defineEmits(['setup-complete', 'cancel', 'close']);
const emit = defineEmits(['setup-complete', 'close']);

const props = defineProps({
enableUrl: String,
Expand Down Expand Up @@ -49,10 +49,14 @@ function complete() {
recoveryCodesModalOpen.value = false;
emit('setup-complete');
}

watch(setupModalOpen, (open) => {
if (!open && !recoveryCodesModalOpen.value) emit('close');
});
</script>

<template>
<Modal v-if="setupModalOpen" :title="__('Set up Two Factor Authentication')" blur open @update:model-value="$emit('cancel')">
<Modal v-model:open="setupModalOpen" :title="__('Set up Two Factor Authentication')" blur>
<div>
<div v-if="loading" class="flex items-center justify-center text-center">
<Icon name="loading" />
Expand Down Expand Up @@ -88,11 +92,12 @@ function complete() {

<template #footer>
<div class="flex items-center justify-end space-x-3 pt-3 pb-1">
<Button
variant="ghost"
@click="$emit('close')"
:text="__('Cancel')"
/>
<ModalClose>
<Button
variant="ghost"
:text="__('Cancel')"
/>
</ModalClose>
<Button
:disabled="!code"
variant="primary"
Expand Down
Loading