updates related to #1509

extension/chrome/elements/passphrase.ts

@@ -196,8 +196,7 @@ View.run(
     };
 
     private closeDialog = (entered = false, initiatorFrameId?: string) => {
-      BrowserMsg.send.closeDialog(this);
-      BrowserMsg.send.passphraseEntry({ entered, initiatorFrameId });
+      BrowserMsg.send.passphraseEntry({ entered, initiatorFrameId }, () => BrowserMsg.send.closeDialog(this));
     };
 
     private submitHandler = async () => {

extension/chrome/elements/pgp_block.ts

@@ -2,7 +2,7 @@
 
 'use strict';
 
-import { Url, Value } from '../../js/common/core/common.js';
+import { Url } from '../../js/common/core/common.js';
 import { Assert } from '../../js/common/assert.js';
 import { RenderMessage } from '../../js/common/render-message.js';
 import { Attachment } from '../../js/common/core/attachment.js';
@@ -14,7 +14,7 @@ import { PgpBlockViewQuoteModule } from './pgp_block_modules/pgp-block-quote-mod
 import { PgpBlockViewRenderModule } from './pgp_block_modules/pgp-block-render-module.js';
 import { CommonHandlers, Ui } from '../../js/common/browser/ui.js';
 import { View } from '../../js/common/view.js';
-import { Bm, BrowserMsg } from '../../js/common/browser/browser-msg.js';
+import { BrowserMsg } from '../../js/common/browser/browser-msg.js';
 
 export class PgpBlockView extends View {
   public readonly acctEmail: string; // needed for attachment decryption, probably should be refactored out
@@ -28,7 +28,6 @@ export class PgpBlockView extends View {
   public readonly renderModule: PgpBlockViewRenderModule;
   public readonly printModule = new PgpBlockViewPrintModule();
   private readonly tabId = BrowserMsg.generateTabId();
-
   private progressOperation?: {
     text: string;
     operationId: string; // to ignore possible stray notifications, we generate an id for each operation
@@ -65,25 +64,11 @@ export class PgpBlockView extends View {
     BrowserMsg.addListener('pgp_block_render', async (msg: RenderMessage) => {
       this.processMessage(msg);
     });
-    BrowserMsg.addListener('ajax_progress', async (progress: Bm.AjaxProgress) => {
-      this.handleAjaxProgress(progress);
-    });
     BrowserMsg.addListener('confirmation_result', CommonHandlers.createAsyncResultHandler());
-    BrowserMsg.listen([this.getDest(), this.frameId]); // we receive non-critical ajax_progress calls via frameId address
+    BrowserMsg.listen(this.getDest());
     BrowserMsg.send.pgpBlockReady(this, { frameId: this.frameId, messageSender: this.getDest() });
   };
 
-  private handleAjaxProgress = ({ operationId, percent, loaded, total, expectedTransferSize }: Bm.AjaxProgress) => {
-    if (this.progressOperation && this.progressOperation.operationId === operationId) {
-      const perc = Value.getPercentage(percent, loaded, total, expectedTransferSize);
-      if (typeof perc !== 'undefined') {
-        this.renderProgress({ ...this.progressOperation, perc });
-      }
-      return true;
-    }
-    return false;
-  };
-
   private renderProgress = ({ operationId, text, perc, init }: { operationId: string; text: string; perc?: number; init?: boolean }) => {
     if (init) {
       this.progressOperation = { operationId, text };

extension/chrome/settings/setup/setup-key-manager-autogen.ts

@@ -6,7 +6,7 @@ import { SetupOptions, SetupView } from '../setup.js';
 import { Ui } from '../../../js/common/browser/ui.js';
 import { Url } from '../../../js/common/core/common.js';
 import { AcctStore } from '../../../js/common/platform/store/acct-store.js';
-import { ApiErr } from '../../../js/common/api/shared/api-error.js';
+import { AjaxErr, ApiErr } from '../../../js/common/api/shared/api-error.js';
 import { Api } from '../../../js/common/api/shared/api.js';
 import { Settings } from '../../../js/common/settings.js';
 import { KeyUtil } from '../../../js/common/core/crypto/key.js';
@@ -81,9 +81,16 @@ export class SetupWithEmailKeyManagerModule {
     } catch (e) {
       if (ApiErr.isNetErr(e) && (await Api.isInternetAccessible())) {
         // frendly message when key manager is down, helpful during initial infrastructure setup
-        e.message =
-          `FlowCrypt Email Key Manager at ${this.view.clientConfiguration.getKeyManagerUrlForPrivateKeys()} cannot be reached. ` +
+        const url = this.view.clientConfiguration.getKeyManagerUrlForPrivateKeys();
+        const message =
+          `FlowCrypt Email Key Manager at ${url} cannot be reached. ` +
           'If your organization requires a VPN, please connect to it. Else, please inform your network admin.';
+        if (e instanceof AjaxErr) {
+          e.message = message; // we assume isNetErr wasn't identified by the message property
+        } else {
+          // convert to AjaxErr, identifiable as a net error, with a custom message
+          throw AjaxErr.fromNetErr(message, e.stack, url);
+        }
       }
       throw e;
     }

extension/css/cryptup.css

@@ -2833,7 +2833,10 @@ body#new_message.full_window {
 }
 
 body#new_message.full_window table#compose {
-  box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.2);
+  box-shadow:
+    0 8px 10px 1px rgba(0, 0, 0, 0.14),
+    0 3px 14px 2px rgba(0, 0, 0, 0.12),
+    0 5px 5px -3px rgba(0, 0, 0, 0.2);
 }
 
 div#reply_message_table_container {

extension/js/background_page/background_page.ts

@@ -59,7 +59,6 @@ console.info('background_process.js starting');
   //   is fixed, this can be moved to the gmail content script, and some may be removed
   BrowserMsg.addPgpListeners();
 
-  BrowserMsg.bgAddListener('ajax', BgHandlers.ajaxHandler);
   BrowserMsg.bgAddListener('ajaxGmailAttachmentGetChunk', BgHandlers.ajaxGmailAttachmentGetChunkHandler);
   BrowserMsg.bgAddListener('settings', BgHandlers.openSettingsPageHandler);
   BrowserMsg.bgAddListener('update_uninstall_url', BgHandlers.updateUninstallUrl);

extension/js/background_page/bg-handlers.ts

@@ -2,9 +2,8 @@
 
 'use strict';
 
-import { Api } from '../common/api/shared/api.js';
 import { BgUtils } from './bgutils.js';
-import { Bm, BrowserMsg } from '../common/browser/browser-msg.js';
+import { Bm } from '../common/browser/browser-msg.js';
 import { Gmail } from '../common/api/email-provider/gmail/gmail.js';
 import { GlobalStore } from '../common/platform/store/global-store.js';
 import { ContactStore } from '../common/platform/store/contact-store.js';
@@ -29,19 +28,6 @@ export class BgHandlers {
     return await dbFunc(db, ...request.args);
   };
 
-  public static ajaxHandler = async (r: Bm.Ajax): Promise<Bm.Res.Ajax> => {
-    if (r.req.context?.operationId) {
-      // progress updates were requested via messages
-      const frameId = r.req.context.frameId;
-      const operationId = r.req.context.operationId;
-      const expectedTransferSize = r.req.context.expectedTransferSize;
-      r.req.xhr = Api.getAjaxProgressXhrFactory({
-        download: (percent, loaded, total) => BrowserMsg.send.ajaxProgress(frameId, { percent, loaded, total, expectedTransferSize, operationId }),
-      });
-    }
-    return await Api.ajax(r.req, r.stack);
-  };
-
   public static ajaxGmailAttachmentGetChunkHandler = async (r: Bm.AjaxGmailAttachmentGetChunk): Promise<Bm.Res.AjaxGmailAttachmentGetChunk> => {
     return { chunk: await new Gmail(r.acctEmail).attachmentGetChunk(r.msgId, r.attachmentId) };
   };

extension/js/common/api/account-servers/external-service.ts

@@ -1,7 +1,7 @@
 /* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact [email protected] */
 'use strict';
 
-import { Api, ProgressCb, ProgressCbs, ReqFmt, ReqMethod } from '../shared/api.js';
+import { Api, ProgressCb, ProgressCbs } from '../shared/api.js';
 import { AcctStore } from '../../platform/store/acct-store.js';
 import { Dict, Str } from '../../core/common.js';
 import { ErrorReport } from '../../platform/catch.js';
@@ -12,6 +12,7 @@ import { ParsedRecipients } from '../email-provider/email-provider-api.js';
 import { Buf } from '../../core/buf.js';
 import { ClientConfigurationError, ClientConfigurationJson } from '../../client-configuration.js';
 import { InMemoryStore } from '../../platform/store/in-memory-store.js';
+import { Serializable } from '../../platform/store/abstract-store.js';
 import { GoogleOAuth } from '../authentication/google/google-oauth.js';
 
 // todo - decide which tags to use
@@ -84,11 +85,11 @@ export class ExternalService extends Api {
   };
 
   public getServiceInfo = async (): Promise<FesRes.ServiceInfo> => {
-    return await this.request<FesRes.ServiceInfo>('GET', `/api/`);
+    return await this.request<FesRes.ServiceInfo>(`/api/`);
   };
 
   public fetchAndSaveClientConfiguration = async (): Promise<ClientConfigurationJson> => {
-    const r = await this.request<FesRes.ClientConfiguration>('GET', `/api/${this.apiVersion}/client-configuration?domain=${this.domain}`);
+    const r = await this.request<FesRes.ClientConfiguration>(`/api/${this.apiVersion}/client-configuration?domain=${this.domain}`);
     if (r.clientConfiguration && !r.clientConfiguration.flags) {
       throw new ClientConfigurationError('missing_flags');
     }
@@ -97,28 +98,26 @@ export class ExternalService extends Api {
   };
 
   public reportException = async (errorReport: ErrorReport): Promise<void> => {
-    await this.request<void>('POST', `/api/${this.apiVersion}/log-collector/exception`, {}, errorReport);
+    await this.request<void>(`/api/${this.apiVersion}/log-collector/exception`, { fmt: 'JSON', data: errorReport });
   };
 
   public helpFeedback = async (email: string, message: string): Promise<FesRes.HelpFeedback> => {
-    return await this.request<FesRes.HelpFeedback>('POST', `/api/${this.apiVersion}/account/feedback`, {}, { email, message });
+    return await this.request<FesRes.HelpFeedback>(`/api/${this.apiVersion}/account/feedback`, { fmt: 'JSON', data: { email, message } });
   };
 
   public reportEvent = async (tags: EventTag[], message: string, details?: string): Promise<void> => {
-    await this.request<void>(
-      'POST',
-      `/api/${this.apiVersion}/log-collector/exception`,
-      {},
-      {
+    await this.request<void>(`/api/${this.apiVersion}/log-collector/exception`, {
+      fmt: 'JSON',
+      data: {
         tags,
         message,
         details,
-      }
-    );
+      },
+    });
   };
 
   public webPortalMessageNewReplyToken = async (): Promise<FesRes.ReplyToken> => {
-    return await this.request<FesRes.ReplyToken>('POST', `/api/${this.apiVersion}/message/new-reply-token`, {}, {});
+    return await this.request<FesRes.ReplyToken>(`/api/${this.apiVersion}/message/new-reply-token`, { fmt: 'JSON', data: {} });
   };
 
   public webPortalMessageUpload = async (
@@ -147,50 +146,52 @@ export class ExternalService extends Api {
       ),
     });
     const multipartBody = { content, details };
-    return await this.request<FesRes.MessageUpload>('POST', `/api/${this.apiVersion}/message`, {}, multipartBody, { upload: progressCb });
+    return await this.request<FesRes.MessageUpload>(`/api/${this.apiVersion}/message`, { fmt: 'FORM', data: multipartBody }, { upload: progressCb });
   };
 
   public messageGatewayUpdate = async (externalId: string, emailGatewayMessageId: string) => {
-    await this.request<void>(
-      'POST',
-      `/api/${this.apiVersion}/message/${externalId}/gateway`,
-      {},
-      {
+    await this.request<void>(`/api/${this.apiVersion}/message/${externalId}/gateway`, {
+      fmt: 'JSON',
+      data: {
         emailGatewayMessageId,
-      }
-    );
+      },
+    });
   };
 
-  private authHdr = async (): Promise<Dict<string>> => {
+  private authHdr = async (): Promise<{ authorization: string }> => {
     const idToken = await InMemoryStore.getUntilAvailable(this.acctEmail, InMemoryStoreKeys.ID_TOKEN);
     if (idToken) {
-      return { Authorization: `Bearer ${idToken}` }; // eslint-disable-line @typescript-eslint/naming-convention
+      return { authorization: `Bearer ${idToken}` };
     }
     // user will not actually see this message, they'll see a generic login prompt
     throw new BackendAuthErr('Missing id token, please re-authenticate');
   };
 
-  private request = async <RT>(method: ReqMethod, path: string, headers: Dict<string> = {}, vals?: Dict<unknown>, progress?: ProgressCbs): Promise<RT> => {
-    let reqFmt: ReqFmt | undefined;
-    if (progress) {
-      reqFmt = 'FORM';
-    } else if (method !== 'GET') {
-      reqFmt = 'JSON';
-    }
+  private request = async <RT>(
+    path: string,
+    vals?:
+      | {
+          data: Dict<string | Attachment>;
+          fmt: 'FORM';
+        }
+      | { data: Dict<Serializable>; fmt: 'JSON' },
+    progress?: ProgressCbs
+  ): Promise<RT> => {
+    const values:
+      | {
+          data: Dict<string | Attachment>;
+          fmt: 'FORM';
+          method: 'POST';
+        }
+      | { data: Dict<Serializable>; fmt: 'JSON'; method: 'POST' }
+      | undefined = vals
+      ? {
+          ...vals,
+          method: 'POST',
+        }
+      : undefined;
     try {
-      return await ExternalService.apiCall(
-        this.url,
-        path,
-        vals,
-        reqFmt,
-        progress,
-        {
-          ...headers,
-          ...(await this.authHdr()),
-        },
-        'json',
-        method
-      );
+      return await ExternalService.apiCall(this.url, path, values, progress, await this.authHdr(), 'json');
     } catch (firstAttemptErr) {
       const idToken = await InMemoryStore.get(this.acctEmail, InMemoryStoreKeys.ID_TOKEN);
       if (ApiErr.isAuthErr(firstAttemptErr) && idToken) {
@@ -200,16 +201,12 @@ export class ExternalService extends Api {
           return await ExternalService.apiCall(
             this.url,
             path,
-            vals,
-            reqFmt,
+            values,
             progress,
             {
-              ...headers,
-              // eslint-disable-next-line @typescript-eslint/naming-convention
-              Authorization: await GoogleOAuth.googleApiAuthHeader(email, true),
+              authorization: await GoogleOAuth.googleApiAuthHeader(email, true),
             },
-            'json',
-            method
+            'json'
           );
         }
       }