Merge branch 'master' into dependabot/npm_and_yarn/ava-6.1.1

# Conflicts:
#	extension/js/common/browser/ui.ts
#	extension/js/common/platform/catch.ts
#	package-lock.json

Author: sosnovsky

eslint-local-rules.js

@@ -40,7 +40,8 @@ module.exports = {
             if (propertyName === 'forEach' || propertyName === 'each') {
               context.report({ node, message: DO_NOT_USE_EACH });
             } else if (propertyName === 'map') {
-              const ancestors = context.getAncestors();
+              const sourceCode = context.sourceCode ?? context.getSourceCode();
+              const ancestors = sourceCode.getAncestors ? sourceCode.getAncestors(node) : context.getAncestors();
               const parent = ancestors[ancestors.length - 1];
               if (parent && parent.type === 'ExpressionStatement') {
                 context.report({ node, message: DO_NOT_USE_MAP_EXPR_STMT });

eslint.config.mjs

@@ -4,7 +4,6 @@ import noOnlyTestsPlugin from 'eslint-plugin-no-only-tests';
 import headerPlugin from 'eslint-plugin-header';
 import jsdocPlugin from 'eslint-plugin-jsdoc';
 import preferArrowPlugin from 'eslint-plugin-prefer-arrow';
-import importPlugin from 'eslint-plugin-import';
 import noNullPlugin from 'eslint-plugin-no-null';
 import localRulesPlugin from 'eslint-plugin-local-rules';
 import eslintConfigPrettier from 'eslint-config-prettier';
@@ -17,7 +16,6 @@ const commonConfig = {
     header: headerPlugin,
     jsdoc: jsdocPlugin,
     'prefer-arrow': preferArrowPlugin,
-    import: importPlugin,
     'no-null': noNullPlugin,
     'local-rules': localRulesPlugin,
   },
@@ -94,7 +92,6 @@ const commonConfig = {
     '@typescript-eslint/no-unused-vars': ['error'],
     '@typescript-eslint/no-unused-expressions': 'error',
     '@typescript-eslint/no-use-before-define': 'off',
-    '@typescript-eslint/no-var-requires': 'error',
     '@typescript-eslint/prefer-for-of': 'error',
     '@typescript-eslint/prefer-function-type': 'error',
     '@typescript-eslint/prefer-namespace-keyword': 'error',
@@ -110,7 +107,6 @@ const commonConfig = {
     'header/header': ['error', 'block', ' ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact [email protected] '],
     'id-denylist': 'error',
     'id-match': 'error',
-    'import/order': 'off',
     'jsdoc/check-alignment': 'off',
     'jsdoc/check-indentation': 'off',
     'jsdoc/newline-after-description': 'off',
@@ -154,20 +150,23 @@ const commonConfig = {
     radix: 'off',
     'require-atomic-updates': 0,
     'sort-imports': 'off',
-    'spaced-comment': [
-      'error',
-      'always',
-      {
-        markers: ['/'],
-      },
-    ],
     'local-rules/standard-loops': 'error',
   },
 };
 
 export default [
   {
-    ignores: ['extension/types/**', 'extension/js/common/core/types/**', 'test/source/core/types/**', 'build/**', 'extension/lib/**', 'eslint.config.js'],
+    ignores: [
+      'build/**',
+      'conf/**',
+      'eslint.config.mjs',
+      'eslint-local-rules.js',
+      'extension/lib/**',
+      'extension/types/**',
+      'extension/js/common/core/types/**',
+      'test/source/core/types/**',
+      'test/source/tests/**/*.js',
+    ],
   },
   pluginJs.configs.recommended,
   ...tseslint.configs.strictTypeChecked,

extension/chrome/elements/attachment.ts

@@ -221,7 +221,7 @@ export class AttachmentDownloadView extends View {
       try {
         const googleDriveFileId = url.split('/').pop()?.split('?').shift(); // try and catch any errors below if structure is not as expected
         url = googleDriveFileId ? `https://drive.google.com/uc?export=download&id=${googleDriveFileId}` : url; // attempt to get length headers from Google Drive file if available
-      } catch (e) {
+      } catch {
         // leave url as is
       }
     }

extension/chrome/elements/compose-modules/compose-err-module.ts

@@ -6,7 +6,7 @@ import { Browser } from '../../../js/common/browser/browser.js';
 import { BrowserEventErrHandler, Ui } from '../../../js/common/browser/ui.js';
 import { Catch } from '../../../js/common/platform/catch.js';
 import { NewMsgData, SendBtnTexts, SendMsgsResult } from './compose-types.js';
-import { ApiErr } from '../../../js/common/api/shared/api-error.js';
+import { ApiErr, EnterpriseServerAuthErr } from '../../../js/common/api/shared/api-error.js';
 import { BrowserExtension } from '../../../js/common/browser/browser-extension.js';
 import { BrowserMsg } from '../../../js/common/browser/browser-msg.js';
 import { Settings } from '../../../js/common/settings.js';
@@ -44,7 +44,7 @@ export class ComposeErrModule extends ViewModule<ComposeView> {
         } else if (typeof e === 'object' && e && typeof (e as { stack: string }).stack === 'undefined') {
           try {
             (e as { stack: string }).stack = `[compose action: ${couldNotDoWhat}]`;
-          } catch (e) {
+          } catch {
             // no need
           }
         }
@@ -82,6 +82,9 @@ export class ComposeErrModule extends ViewModule<ComposeView> {
           '(This may also be caused by <a href="https://flowcrypt.com/docs/help/network-error.html" target="_blank">missing extension permissions</a>).';
       }
       await Ui.modal.error(netErrMsg, true);
+    } else if (e instanceof EnterpriseServerAuthErr) {
+      BrowserMsg.send.notificationShowCustomIDPAuthPopupNeeded(this.view.parentTabId, { acctEmail: this.view.acctEmail });
+      Settings.offerToLoginWithPopupShowModalOnErr(this.view.acctEmail, () => this.view.sendBtnModule.extractProcessSendMsg());
     } else if (ApiErr.isAuthErr(e)) {
       BrowserMsg.send.notificationShowAuthPopupNeeded(this.view.parentTabId, { acctEmail: this.view.acctEmail });
       Settings.offerToLoginWithPopupShowModalOnErr(this.view.acctEmail, () => this.view.sendBtnModule.extractProcessSendMsg());

extension/chrome/elements/compose-modules/compose-send-btn-module.ts

@@ -212,7 +212,7 @@ export class ComposeSendBtnModule extends ViewModule<ComposeView> {
     let mimeType;
     let data = '';
     const parts = src.split(/[:;,]/);
-    if (parts.length === 4 && parts[0] === 'data' && parts[1].match(/^image\/\w+/) && parts[2] === 'base64') {
+    if (parts.length === 4 && parts[0] === 'data' && /^image\/\w+/.exec(parts[1]) && parts[2] === 'base64') {
       mimeType = parts[1];
       data = parts[3];
     }

extension/chrome/elements/compose-modules/compose-storage-module.ts

@@ -140,7 +140,7 @@ export class ComposeStorageModule extends ViewModule<ComposeView> {
     try {
       // no valid keys found, query synchronously, then return result
       await this.updateLocalPubkeysFromRemote(storedContact?.sortedPubkeys || [], email);
-    } catch (e) {
+    } catch {
       return PUBKEY_LOOKUP_RESULT_FAIL;
     }
     // re-query the storage, which is now updated

extension/chrome/elements/compose-modules/formatters/encrypted-mail-msg-formatter.ts

@@ -4,7 +4,7 @@
 
 import { UploadedMessageData } from '../../../../js/common/api/account-server.js';
 import { SendableMsg } from '../../../../js/common/api/email-provider/sendable-msg.js';
-import { ApiErr } from '../../../../js/common/api/shared/api-error.js';
+import { ApiErr, EnterpriseServerAuthErr } from '../../../../js/common/api/shared/api-error.js';
 import { Api, RecipientType } from '../../../../js/common/api/shared/api.js';
 import { Ui } from '../../../../js/common/browser/ui.js';
 import { Attachment } from '../../../../js/common/core/attachment.js';
@@ -275,6 +275,10 @@ export class EncryptedMsgMailFormatter extends BaseMailFormatter {
         replyToken: response.replyToken,
       };
     } catch (msgTokenErr) {
+      if (msgTokenErr instanceof EnterpriseServerAuthErr) {
+        Settings.offerToLoginCustomIDPWithPopupShowModalOnErr(this.acctEmail, () => this.view.sendBtnModule.extractProcessSendMsg());
+        throw new ComposerResetBtnTrigger();
+      }
       if (ApiErr.isAuthErr(msgTokenErr)) {
         Settings.offerToLoginWithPopupShowModalOnErr(this.acctEmail, () => this.view.sendBtnModule.extractProcessSendMsg());
         throw new ComposerResetBtnTrigger();

extension/chrome/elements/compose-modules/formatters/general-mail-formatter.ts

@@ -47,11 +47,9 @@ export class GeneralMailFormatter {
           `Could not sign this encrypted message. The sender email ${view.senderModule.getSender()} isn't present in the signing key's user ids`
         );
       }
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const msg = await new SignedMsgMailFormatter(view).sendableMsg(newMsgData, signingKey.key);
 
       return {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         senderKi: signingKey.keyInfo,
         msgs: [msg],
         renderSentMessage: { recipients: msg.recipients, attachments: msg.attachments },

extension/chrome/settings/inbox/inbox-modules/inbox-menu-module.ts

@@ -149,7 +149,7 @@ export class InboxMenuModule extends ViewModule<InboxView> {
 
   private renderFolder = (labelEl: HTMLSpanElement) => {
     for (const cls of labelEl.classList) {
-      const labelId = (cls.match(/^label_([a-zA-Z0-9_]+)$/) || [])[1];
+      const labelId = (/^label_([a-zA-Z0-9_]+)$/.exec(cls) || [])[1];
       if (labelId) {
         this.view.redirectToUrl({ acctEmail: this.view.acctEmail, labelId });
         return;

extension/chrome/settings/inbox/inbox-modules/inbox-notification-module.ts

@@ -49,6 +49,9 @@ export class InboxNotificationModule extends ViewModule<InboxView> {
     BrowserMsg.addListener('notification_show_auth_popup_needed', async ({ acctEmail }: Bm.NotificationShowAuthPopupNeeded) => {
       this.notifications.showAuthPopupNeeded(acctEmail);
     });
+    BrowserMsg.addListener('notification_show_custom_idp_auth_popup_needed', async ({ acctEmail }: Bm.NotificationShowAuthPopupNeeded) => {
+      this.notifications.showCustomIDPAuthPopupNeeded(acctEmail);
+    });
   };
 
   private notificationShowHandler: Bm.AsyncResponselessHandler = async ({ notification, callbacks, group }: Bm.NotificationShow) => {