refactor: service address

Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>

src/components/AddAccountDialog.vue

@@ -4,7 +4,7 @@ import { useIntegrationStore } from '@KTXC/stores/integrationStore'
 import { useServicesStore } from '@MailManager/stores/servicesStore'
 import { useProvidersStore } from '@MailManager/stores/providersStore'
 import { ServiceObject, type ProviderObject } from '@MailManager/models'
-import type { ProviderDiscoveryStatus, ServiceInterface, ServiceLocation } from '@MailManager/types'
+import type { ProviderDiscoveryStatus, ServiceAddressInterface, ServiceInterface, ServiceLocation } from '@MailManager/types'
 import DiscoveryEntryPanel from '@MailManager/components/steps/DiscoveryEntryPanel.vue'
 import DiscoveryStatusPanel from '@MailManager/components/steps/DiscoveryStatusPanel.vue'
 import ProviderSelectionPanel from '@MailManager/components/steps/ProviderSelectionPanel.vue'
@@ -57,6 +57,11 @@ const discoverAddress = ref<string>('')
 const discoverSecret = ref<string | null>(null)
 const discoverHostname = ref<string | null>(null)
 
+// Address entered during discovery, as a service address object
+const discoverServiceAddress = computed<ServiceAddressInterface | null>(() =>
+  discoverAddress.value ? { address: discoverAddress.value } : null
+)
+
 // Step 2: Discovery Status / Provider Selection
 const selectedProvider = shallowRef<ProviderObject | null>(null)
 const selectedService = shallowRef<ServiceObject | null>(null)
@@ -154,7 +159,7 @@ function createServiceObject(
     identifier: null,
     label: data.label ?? null,
     enabled: data.enabled ?? true,
-    primaryAddress: data.primaryAddress ?? (discoverAddress.value || null),
+    primaryAddress: data.primaryAddress ?? discoverServiceAddress.value,
     secondaryAddresses: data.secondaryAddresses ?? null,
     location: data.location ?? null,
     identity: data.identity ?? null,
@@ -300,7 +305,7 @@ async function handleProviderSelect(identifier: string) {
     ...discoveredJson,
     label: discoveredJson.label || discoverAddress.value,
     enabled: discoveredJson.enabled ?? true,
-    primaryAddress: discoveredJson.primaryAddress || discoverAddress.value,
+    primaryAddress: discoveredJson.primaryAddress ?? discoverServiceAddress.value,
     location: discoveredJson.location
   })
   setSelectedProviderAndService(identifier, service)
@@ -317,7 +322,7 @@ function handleProviderAdvanced(identifier: string) {
     ...discoveredJson,
     label: discoveredJson?.label || discoverAddress.value,
     enabled: discoveredJson?.enabled ?? true,
-    primaryAddress: discoveredJson?.primaryAddress || discoverAddress.value,
+    primaryAddress: discoveredJson?.primaryAddress ?? discoverServiceAddress.value,
     location: discoveredJson?.location ?? null
   })
 
@@ -341,7 +346,7 @@ function handleProviderManualSelect(identifier: string) {
   const service = createServiceObject(identifier, {
     label: discoverAddress.value,
     enabled: true,
-    primaryAddress: discoverAddress.value,
+    primaryAddress: discoverServiceAddress.value,
     location: null,
     identity: null
   })
@@ -396,7 +401,7 @@ async function saveAccount() {
   try {
     const accountData = {
       label: serviceData.label || discoverAddress.value,
-      primaryAddress: serviceData.primaryAddress || discoverAddress.value,
+      primaryAddress: serviceData.primaryAddress ?? discoverServiceAddress.value,
       enabled: serviceData.enabled,
       location: serviceData.location,
       identity: serviceData.identity,

src/components/steps/TestAndSavePanel.vue

@@ -134,7 +134,7 @@ watch(
               <v-icon>mdi-label</v-icon>
             </template>
             <v-list-item-title>Account Name</v-list-item-title>
-            <v-list-item-subtitle>{{ localService.label || localService.primaryAddress || 'New Account' }}</v-list-item-subtitle>
+            <v-list-item-subtitle>{{ localService.label || localService.primaryAddress?.address || 'New Account' }}</v-list-item-subtitle>
           </v-list-item>
 
           <!-- Email Address -->
@@ -143,7 +143,7 @@ watch(
               <v-icon>mdi-email</v-icon>
             </template>
             <v-list-item-title>Email Address</v-list-item-title>
-            <v-list-item-subtitle>{{ localService.primaryAddress }}</v-list-item-subtitle>
+            <v-list-item-subtitle>{{ localService.primaryAddress?.address }}</v-list-item-subtitle>
           </v-list-item>
 
           <!-- Provider -->