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

Open
duncanmcclean wants to merge 2 commits into
base: 6.x
Choose a base branch
from
+13 −8
Open

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

Changes from all commits
Commits
Show all changes
2 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
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
21 changes: 13 additions & 8 deletions resources/js/components/two-factor/Setup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<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']);

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

watch(setupModalOpen, (open) => {
if (!open) 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