Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/views/OAuth2CallbackView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ onMounted(async () => {
}

notifyParent()

if (status.value === 'success' && window.opener) {
setTimeout(() => window.close(), 1500)
}
})

function handleClose() {
Expand Down
20 changes: 18 additions & 2 deletions src/views/administration/ProviderEditView.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { ref, onMounted, computed, watch, nextTick } from 'vue'
import { ref, onMounted, onUnmounted, computed, watch, nextTick } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { useProvidersStore, useProviderCatalogStore } from '@/stores'
import { ArrowLeft, Save, Check } from 'lucide-vue-next'
Expand Down Expand Up @@ -185,12 +185,28 @@ onMounted(async () => {
console.error('Failed to load provider catalog:', err)
}
}

if (isEditMode.value) {
await loadProvider()
}
})

const handleOAuth2Message = async (event: MessageEvent) => {
if (event.origin !== window.location.origin) return
if (event.data?.source !== 'oauth2-callback') return
if (event.data.success && isEditMode.value) {
await loadProvider()
}
}

onMounted(() => {
window.addEventListener('message', handleOAuth2Message)
})

onUnmounted(() => {
window.removeEventListener('message', handleOAuth2Message)
})

// Methods
async function loadProvider() {
if (!providerId.value) return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const tokenExpiryRelative = computed(() => {

function getRedirectUrl(): string {
const baseUrl = (import.meta.env.VITE_API_BASE_URL || window.location.origin).replace(/\/+$/, '')
return `${baseUrl}/api/email/smtp-imap/oauth2/callback`
return `${baseUrl}/oauth2/callback`
}

async function handleOAuth2Authorize() {
Expand Down
Loading