feat: fix emails while sending with external credentials (#743)

un · Aug 26, 2024 · 352434d · 352434d
1 parent 120a09c
commit 352434d
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 23 deletions.
diff --git a/apps/mail-bridge/trpc/routers/sendMailRouter.ts b/apps/mail-bridge/trpc/routers/sendMailRouter.ts
@@ -537,6 +537,9 @@ export const sendMailRouter = router({
         postalServerUrl = `https://${config.MAILBRIDGE_POSTAL_SERVER_PERSONAL_CREDENTIALS.apiUrl}/api/v1/send/raw`;
         postalServerAPIKey =
           config.MAILBRIDGE_POSTAL_SERVER_PERSONAL_CREDENTIALS.apiKey;
+      } else if (sendAsEmailIdentity.externalCredentials) {
+        postalServerUrl = '';
+        postalServerAPIKey = '';
       } else {
         const orgPostalServerResponse = await db.query.postalServers.findFirst({
           where: and(
@@ -726,24 +729,27 @@ export const sendMailRouter = router({
             to: [`${convoToAddress}`, ...convoCcAddressesFiltered],
             from: `${sendAsEmailIdentity.sendName} <${convoSenderEmailAddress}>`,
             headers: emailHeaders,
-            raw: Buffer.from(rawEmail.asRaw()).toString('base64')
+            raw: rawEmail.asRaw()
           }
-        }).catch((e) => {
-          console.error('🚨 error sending email as external identity', e);
-          return {
-            success: false
-          };
-        });
+        })
+          .then((res) => ({ success: true, ...res }))
+          .catch((e) => {
+            console.error('🚨 error sending email as external identity', e);
+            return {
+              success: false,
+              messageId: null
+            };
+          });
 
-        if ('success' in sentEmail && sentEmail.success === false) {
+        if (sentEmail.success === false) {
           console.error(
             '🚨 error sending email as external identity',
             `send convoEntryId: ${entryId} from convoId: ${convoId}`
           );
           return {
             success: false
           };
-        } else if (!('success' in sentEmail) && sentEmail.messageId) {
+        } else if (sentEmail.messageId) {
           const entryMetadata: ConvoEntryMetadata = {
             email: {
               to: [convoMetadataToAddress],
@@ -767,7 +773,7 @@ export const sendMailRouter = router({
           };
         } else {
           console.error(
-            '🚨 error sending email as external identity, no idea what went wrong. didnt get success or fail',
+            "🚨 error sending email as external identity, no idea what went wrong. didn't get success or fail",
             `send convoEntryId: ${entryId} from convoId: ${convoId}`
           );
           return {

diff --git a/apps/platform/trpc/routers/orgRouter/mail/emailIdentityRouter.ts b/apps/platform/trpc/routers/orgRouter/mail/emailIdentityRouter.ts
@@ -543,17 +543,29 @@ export const emailIdentityRouter = router({
       const authorizedSpaceIds: number[] = [];
 
       if (input.spaceShortcode) {
-        const spaceQueryResponse = await db.query.spaces.findFirst({
-          where: and(
-            eq(spaces.orgId, orgId),
-            eq(spaces.shortcode, input.spaceShortcode)
-          ),
-          columns: {
-            id: true
+        if (input.spaceShortcode === 'personal') {
+          const personalSpace = await db.query.orgMembers.findFirst({
+            where: eq(orgMembers.id, orgMemberId),
+            columns: {
+              personalSpaceId: true
+            }
+          });
+          if (personalSpace?.personalSpaceId) {
+            authorizedSpaceIds.push(personalSpace.personalSpaceId);
+          }
+        } else {
+          const spaceQueryResponse = await db.query.spaces.findFirst({
+            where: and(
+              eq(spaces.orgId, orgId),
+              eq(spaces.shortcode, input.spaceShortcode)
+            ),
+            columns: {
+              id: true
+            }
+          });
+          if (spaceQueryResponse?.id) {
+            authorizedSpaceIds.push(spaceQueryResponse.id);
           }
-        });
-        if (spaceQueryResponse?.id) {
-          authorizedSpaceIds.push(spaceQueryResponse.id);
         }
       }
 

diff --git a/apps/web/src/app/[orgShortcode]/convo/_components/create-convo-form.tsx b/apps/web/src/app/[orgShortcode]/convo/_components/create-convo-form.tsx
@@ -218,7 +218,7 @@ export default function CreateConvoForm({
     });
 
   const [selectedSpace, setSelectedSpace] = useState<string | null>(
-    ['all', 'personal', null].includes(spaceShortcode) ? null : spaceShortcode
+    ['all', null].includes(spaceShortcode) ? null : spaceShortcode
   );
   const { data: userEmailIdentities, isLoading: emailIdentitiesLoading } =
     platform.org.mail.emailIdentities.getUserEmailIdentities.useQuery(
@@ -491,6 +491,19 @@ export default function CreateConvoForm({
       throw new Error('Please select a space for the conversation.');
     }
 
+    const resolvedSpaceShortcode =
+      selectedSpace === 'personal'
+        ? spaces?.find(
+            (space) => space.publicId === spacesResponse?.personalSpaceId
+          )?.shortcode
+        : selectedSpace;
+
+    if (!resolvedSpaceShortcode) {
+      throw new Error(
+        'Failed to resolve space shortcode. Contact support if this persists.'
+      );
+    }
+
     return createConvoFn({
       firstMessageType: type,
       topic,
@@ -503,7 +516,7 @@ export default function CreateConvoForm({
       message: editorText,
       attachments: getTrpcUploadFormat(),
       orgShortcode,
-      spaceShortcode: selectedSpace
+      spaceShortcode: resolvedSpaceShortcode
     });
   }
 
@@ -692,7 +705,11 @@ export default function CreateConvoForm({
             {spaces?.map((space) => (
               <SelectItem
                 key={space.shortcode}
-                value={space.shortcode}>
+                value={
+                  space.publicId === spacesResponse?.personalSpaceId
+                    ? 'personal'
+                    : space.shortcode
+                }>
                 {space.name}
               </SelectItem>
             ))}