diff --git a/src/calendarIntegration/addMeetingLink.ts b/src/calendarIntegration/addMeetingLink.ts index f8bef16..11468a0 100644 --- a/src/calendarIntegration/addMeetingLink.ts +++ b/src/calendarIntegration/addMeetingLink.ts @@ -8,6 +8,7 @@ import { isOutlookCalIntegrationEnabled } from "./isOutlookCalIntegrationEnabled import { createEvent } from "./createEvent"; import { mailboxItem } from "../commands/commands"; import { EventResult } from "../types/EventResult"; +import { getUserDetails } from "../utils/userDetailsStore"; const defaultSubjectValue = "New Appointment"; let createdMeeting: EventResult; @@ -82,11 +83,18 @@ async function createNewMeeting(): Promise { * @return {Promise} A promise that resolves when the meeting details are updated. */ async function updateMeetingDetails(eventResult: EventResult): Promise { - getOrganizer(mailboxItem, async (organizer) => { - await setLocation(mailboxItem, eventResult.link, () => {}); - const meetingSummary = createMeetingSummary(eventResult.link, organizer); - await appendToBody(mailboxItem, meetingSummary); - }); + + await setLocation(mailboxItem, eventResult.link, () => {}); + // const organizer = await getOrganizer(mailboxItem); + const user = getUserDetails(); + const meetingSummary = createMeetingSummary(eventResult.link, user.name); + await appendToBody(mailboxItem, user.name); + // getOrganizer(mailboxItem, async (organizer) => { + // const meetingSummary = createMeetingSummary(eventResult.link, organizer); + // await appendToBody(mailboxItem, meetingSummary); + // }); + + } /** @@ -104,15 +112,15 @@ async function handleExistingMeeting(): Promise { const normalizedCurrentBody = currentBody.replace(/&/g, "&"); const normalizedMeetingLink = createdMeeting.link?.replace(/&/g, "&"); - getOrganizer(mailboxItem, async (organizer) => { - if (!currentLocation) { - await setLocation(mailboxItem, createdMeeting.link, () => {}); - } - const meetingSummary = createMeetingSummary(createdMeeting.link, organizer); - if (!normalizedCurrentBody.includes(normalizedMeetingLink)) { - await appendToBody(mailboxItem, meetingSummary); - } - }); + // getOrganizer(mailboxItem, async (organizer) => { + // if (!currentLocation) { + // await setLocation(mailboxItem, createdMeeting.link, () => {}); + // } + // const meetingSummary = createMeetingSummary(createdMeeting.link, organizer); + // if (!normalizedCurrentBody.includes(normalizedMeetingLink)) { + // await appendToBody(mailboxItem, meetingSummary); + // } + // }); await setCustomPropertyAsync(mailboxItem, "wireId", createdMeeting.id); await setCustomPropertyAsync(mailboxItem, "wireLink", createdMeeting.link); @@ -126,9 +134,11 @@ async function handleExistingMeeting(): Promise { */ async function addMeetingLink(event: Office.AddinCommands.Event): Promise { try { + const isEnabled = await isFeatureEnabled(); if (!isEnabled) return; + await fetchCustomProperties(); if (!createdMeeting) { await createNewMeeting(); diff --git a/src/utils/mailbox.ts b/src/utils/mailbox.ts index e3a0ac3..31ce2c9 100644 --- a/src/utils/mailbox.ts +++ b/src/utils/mailbox.ts @@ -8,15 +8,18 @@ export async function getMailboxItemSubject(item): Promise { }); } -export async function getOrganizer(item, callback) { - const { organizer } = item; +export async function getOrganizer(item): Promise { + return new Promise((resolve, reject) => { + const { organizer } = item; - await organizer.getAsync(function (asyncResult) { - if (asyncResult.status === Office.AsyncResultStatus.Failed) { - console.error("Failed to get organizer."); - } else { - callback(asyncResult.value.displayName); - } + organizer.getAsync(function(asyncResult) { + if (asyncResult.status === Office.AsyncResultStatus.Succeeded) { + resolve(asyncResult.value.displayName); + } else { + console.error(asyncResult.error); + reject(new Error("Failed to get organizer")); + } + }); }); }