Merge branch 'main' into rename-tsconfig

2026-02-07 20:24:01 +00:00 · 2025-05-27 13:14:39 -04:00
parent 83b3e80056 5423ab3268
commit 32e6f44e7a
26 changed files with 2026 additions and 873 deletions
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -59,6 +59,7 @@
    {
      matchPackageNames: [
        "@angular-eslint/schematics",
+        "@eslint/compat",
        "@typescript-eslint/rule-tester",
        "@typescript-eslint/utils",
        "angular-eslint",
@@ -81,6 +82,7 @@
    {
      matchPackageNames: [
        "@angular-eslint/schematics",
+        "@eslint/compat",
        "@typescript-eslint/rule-tester",
        "@typescript-eslint/utils",
        "angular-eslint",
--- a/apps/browser/src/key-management/vault-timeout/vault-timeout.service.ts
+++ b/apps/browser/src/key-management/vault-timeout/vault-timeout.service.ts
@@ -17,7 +17,6 @@ export default class VaultTimeoutService extends BaseVaultTimeoutService {
  //  setIntervals. It works by calling the native extension which sleeps for 10s,
  //  efficiently replicating setInterval.
  async checkSafari() {
-    // eslint-disable-next-line
    while (true) {
      try {
        await SafariApp.sendMessageToApp("sleep");
--- a/apps/browser/src/platform/popup/services/browser-router.service.ts
+++ b/apps/browser/src/platform/popup/services/browser-router.service.ts
@@ -21,6 +21,8 @@ export class BrowserRouterService {
          child = child.firstChild;
        }

+        // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
+        // eslint-disable-next-line no-constant-binary-expression
        const updateUrl = !child?.data?.doNotSaveUrl ?? true;

        if (updateUrl) {
--- a/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
+++ b/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
@@ -62,6 +62,8 @@ export class PopupRouterCacheService {
            child = child.firstChild;
          }

+          // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
+          // eslint-disable-next-line no-constant-binary-expression
          return !child?.data?.doNotSaveUrl ?? true;
        }),
        switchMap((event) => this.push(event.url)),
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -86,7 +86,7 @@
    "node-fetch": "2.6.12",
    "node-forge": "1.3.1",
    "open": "8.4.2",
-    "papaparse": "5.5.2",
+    "papaparse": "5.5.3",
    "proper-lockfile": "4.1.2",
    "rxjs": "7.8.1",
    "tldts": "7.0.1",
--- a/apps/cli/src/utils.ts
+++ b/apps/cli/src/utils.ts
@@ -161,7 +161,6 @@ export class CliUtils {

      process.stdin.setEncoding("utf8");
      process.stdin.on("readable", () => {
-        // eslint-disable-next-line
        while (true) {
          const chunk = process.stdin.read();
          if (chunk == null) {
--- a/apps/desktop/src/vault/app/vault/view.component.ts
+++ b/apps/desktop/src/vault/app/vault/view.component.ts
@@ -9,6 +9,7 @@ import {
  OnDestroy,
  OnInit,
  Output,
+  SimpleChanges,
 } from "@angular/core";

 import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/vault/components/view.component";
@@ -130,7 +131,7 @@ export class ViewComponent extends BaseViewComponent implements OnInit, OnDestro
    this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
  }

-  async ngOnChanges() {
+  async ngOnChanges(changes: SimpleChanges) {
    if (this.cipher?.decryptionFailure) {
      DecryptionFailureDialogComponent.open(this.dialogService, {
        cipherIds: [this.cipherId as CipherId],
@@ -138,6 +139,12 @@ export class ViewComponent extends BaseViewComponent implements OnInit, OnDestro
      return;
    }
    this.passwordReprompted = this.masterPasswordAlreadyPrompted;
+
+    if (changes["cipherId"]) {
+      if (changes["cipherId"].currentValue !== changes["cipherId"].previousValue) {
+        this.showPrivateKey = false;
+      }
+    }
  }

  viewHistory() {
--- a/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts
+++ b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts
@@ -9,12 +9,16 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";

+// eslint-disable-next-line no-restricted-imports
 import { ExposedPasswordsReportComponent } from "../../../dirt/reports/pages/organizations/exposed-passwords-report.component";
+// eslint-disable-next-line no-restricted-imports
 import { InactiveTwoFactorReportComponent } from "../../../dirt/reports/pages/organizations/inactive-two-factor-report.component";
+// eslint-disable-next-line no-restricted-imports
 import { ReusedPasswordsReportComponent } from "../../../dirt/reports/pages/organizations/reused-passwords-report.component";
+// eslint-disable-next-line no-restricted-imports
 import { UnsecuredWebsitesReportComponent } from "../../../dirt/reports/pages/organizations/unsecured-websites-report.component";
+// eslint-disable-next-line no-restricted-imports
 import { WeakPasswordsReportComponent } from "../../../dirt/reports/pages/organizations/weak-passwords-report.component";
-/* eslint no-restricted-imports: "error" */
 import { isPaidOrgGuard } from "../guards/is-paid-org.guard";
 import { organizationPermissionsGuard } from "../guards/org-permissions.guard";
 import { organizationRedirectGuard } from "../guards/org-redirect.guard";
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
@@ -607,6 +607,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {

    return (
      plan.PasswordManager.additionalStoragePricePerGb *
+      // TODO: Eslint upgrade. Please resolve this  since the null check does nothing
+      // eslint-disable-next-line no-constant-binary-expression
      Math.abs(this.sub?.maxStorageGb ? this.sub?.maxStorageGb - 1 : 0 || 0)
    );
  }
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
+++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
@@ -148,6 +148,8 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
          paymentSource,
        );
      }
+      // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
+      // eslint-disable-next-line no-constant-binary-expression
      this.isUnpaid = this.subscriptionStatus === "unpaid" ?? false;
      // If the flag `launchPaymentModalAutomatically` is set to true,
      // we schedule a timeout (delay of 800ms) to automatically launch the payment modal.
--- a/apps/web/src/app/billing/shared/payment-method.component.ts
+++ b/apps/web/src/app/billing/shared/payment-method.component.ts
@@ -143,6 +143,8 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {

      [this.billing, this.sub] = await Promise.all([billingPromise, subPromise]);
    }
+    // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
+    // eslint-disable-next-line no-constant-binary-expression
    this.isUnpaid = this.subscription?.status === "unpaid" ?? false;
    this.loading = false;
    // If the flag `launchPaymentModalAutomatically` is set to true,
--- a/apps/web/src/app/core/router.service.ts
+++ b/apps/web/src/app/core/router.service.ts
@@ -74,6 +74,9 @@ export class RouterService {

        const titleId: string = child?.snapshot?.data?.titleId;
        const rawTitle: string = child?.snapshot?.data?.title;
+
+        // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
+        // eslint-disable-next-line no-constant-binary-expression
        const updateUrl = !child?.snapshot?.data?.doNotSaveUrl ?? true;

        if (titleId != null || rawTitle != null) {
--- a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts
+++ b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts
@@ -5,6 +5,7 @@ import { BehaviorSubject, firstValueFrom, Observable, of } from "rxjs";

 import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
@@ -130,6 +131,12 @@ export default {
            return new I18nMockService(translations);
          },
        },
+        {
+          provide: PolicyService,
+          useValue: {
+            policyAppliesToUser$: () => of(false),
+          },
+        },
      ],
    }),
    applicationConfig({
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
@@ -5,6 +5,7 @@ import { BehaviorSubject, firstValueFrom, Observable, of } from "rxjs";

 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
@@ -126,6 +127,12 @@ export default {
            });
          },
        },
+        {
+          provide: PolicyService,
+          useValue: {
+            policyAppliesToUser$: () => of(false),
+          },
+        },
      ],
    }),
    applicationConfig({
--- a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts
+++ b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts
@@ -7,6 +7,7 @@ import { Observable, firstValueFrom, of } from "rxjs";

 import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
@@ -27,6 +28,7 @@ describe("ProductSwitcherService", () => {
  let accountService: FakeAccountService;
  let platformUtilsService: MockProxy<PlatformUtilsService>;
  let activeRouteParams = convertToParamMap({ organizationId: "1234" });
+  let singleOrgPolicyEnabled = false;
  const getLastSync = jest.fn().mockResolvedValue(new Date("2024-05-14"));
  const userId = Utils.newGuid() as UserId;

@@ -77,6 +79,12 @@ describe("ProductSwitcherService", () => {
          provide: SyncService,
          useValue: { getLastSync },
        },
+        {
+          provide: PolicyService,
+          useValue: {
+            policyAppliesToUser$: () => of(singleOrgPolicyEnabled),
+          },
+        },
      ],
    });
  });
@@ -184,6 +192,14 @@ describe("ProductSwitcherService", () => {
        expect(products.bento.find((p) => p.name === "Admin Console")).toBeDefined();
        expect(products.other.find((p) => p.name === "Organizations")).toBeUndefined();
      });
+
+      it("does not include Organizations when the user's single org policy is enabled", async () => {
+        singleOrgPolicyEnabled = true;
+        initiateService();
+        const products = await firstValueFrom(service.products$);
+
+        expect(products.other.find((p) => p.name === "Organizations")).not.toBeDefined();
+      });
    });

    describe("Provider Portal", () => {
--- a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts
+++ b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts
@@ -6,6 +6,7 @@ import {
  combineLatest,
  concatMap,
  filter,
+  firstValueFrom,
  map,
  Observable,
  ReplaySubject,
@@ -18,10 +19,12 @@ import {
  canAccessOrgAdmin,
  OrganizationService,
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { ProviderType } from "@bitwarden/common/admin-console/enums";
+import { PolicyType, ProviderType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";

@@ -104,6 +107,7 @@ export class ProductSwitcherService {
    private syncService: SyncService,
    private accountService: AccountService,
    private platformUtilsService: PlatformUtilsService,
+    private policyService: PolicyService,
  ) {
    this.pollUntilSynced();
  }
@@ -235,7 +239,15 @@ export class ProductSwitcherService {
      if (acOrg) {
        bento.push(products.ac);
      } else {
-        other.push(products.orgs);
+        const activeUserId = await firstValueFrom(
+          this.accountService.activeAccount$.pipe(getUserId),
+        );
+        const userHasSingleOrgPolicy = await firstValueFrom(
+          this.policyService.policyAppliesToUser$(PolicyType.SingleOrg, activeUserId),
+        );
+        if (!userHasSingleOrgPolicy) {
+          other.push(products.orgs);
+        }
      }

      if (providers.length > 0) {
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,5 +1,5 @@
 // @ts-check
-
+import { fixupPluginRules } from "@eslint/compat";
 import eslint from "@eslint/js";
 import tseslint from "typescript-eslint";
 import angular from "angular-eslint";
@@ -31,8 +31,8 @@ export default tseslint.config(
      reportUnusedDisableDirectives: "error",
    },
    plugins: {
-      rxjs: rxjs,
-      "rxjs-angular": angularRxjs,
+      rxjs: fixupPluginRules(rxjs),
+      "rxjs-angular": fixupPluginRules(angularRxjs),
      "@bitwarden/platform": platformPlugins,
    },
    languageOptions: {
--- a/libs/common/src/key-management/device-trust/services/device-trust.service.implementation.ts
+++ b/libs/common/src/key-management/device-trust/services/device-trust.service.implementation.ts
@@ -89,6 +89,8 @@ export class DeviceTrustService implements DeviceTrustServiceAbstraction {
  ) {
    this.supportsDeviceTrust$ = this.userDecryptionOptionsService.userDecryptionOptions$.pipe(
      map((options) => {
+        // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
+        // eslint-disable-next-line no-constant-binary-expression
        return options?.trustedDeviceOption != null ?? false;
      }),
    );
@@ -97,6 +99,8 @@ export class DeviceTrustService implements DeviceTrustServiceAbstraction {
  supportsDeviceTrustByUserId$(userId: UserId): Observable<boolean> {
    return this.userDecryptionOptionsService.userDecryptionOptionsById$(userId).pipe(
      map((options) => {
+        // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
+        // eslint-disable-next-line no-constant-binary-expression
        return options?.trustedDeviceOption != null ?? false;
      }),
    );
--- a/libs/common/src/vault/models/view/login.view.ts
+++ b/libs/common/src/vault/models/view/login.view.ts
@@ -118,7 +118,7 @@ export class LoginView extends ItemView {

    const passwordRevisionDate =
      obj.passwordRevisionDate == null ? null : new Date(obj.passwordRevisionDate);
-    const uris = obj.uris?.map((uri) => LoginUriView.fromSdkLoginUriView(uri));
+    const uris = obj.uris?.map((uri) => LoginUriView.fromSdkLoginUriView(uri)) || [];

    return Object.assign(new LoginView(), obj, {
      passwordRevisionDate,
--- a/libs/eslint/fix-jsdom.ts
+++ b/libs/eslint/fix-jsdom.ts
@@ -0,0 +1,10 @@
+import JSDOMEnvironment from "jest-environment-jsdom";
+
+export default class FixJSDOMEnvironment extends JSDOMEnvironment {
+  constructor(...args: ConstructorParameters<typeof JSDOMEnvironment>) {
+    super(...args);
+
+    // FIXME https://github.com/jsdom/jsdom/issues/3363
+    this.global.structuredClone = structuredClone;
+  }
+}
--- a/libs/eslint/jest.config.js
+++ b/libs/eslint/jest.config.js
@@ -3,6 +3,7 @@ const sharedConfig = require("../../libs/shared/jest.config.angular");
 /** @type {import('jest').Config} */
 module.exports = {
  ...sharedConfig,
+  testEnvironment: "./fix-jsdom.ts",
  testMatch: ["**/+(*.)+(spec).+(mjs)"],
  displayName: "libs/eslint tests",
  preset: "jest-preset-angular",
--- a/libs/eslint/test.setup.mjs
+++ b/libs/eslint/test.setup.mjs
@@ -1,5 +1,3 @@
-/* eslint-disable no-undef */
-
 import { clearImmediate, setImmediate } from "node:timers";

 Object.defineProperties(globalThis, {
--- a/libs/eslint/tsconfig.json
+++ b/libs/eslint/tsconfig.json
@@ -1,4 +1,5 @@
 {
  "extends": "../../tsconfig.base",
-  "exclude": ["node_modules", "dist"]
+  "exclude": ["node_modules", "dist"],
+  "files": ["empty.ts"]
 }
--- a/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts
+++ b/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts
@@ -92,7 +92,7 @@ export class DashlaneCsvImporter extends BaseImporter implements Importer {
        this.parseIdRecord(cipher, row);
      }

-      if ((rowKeys[0] === "type") != null && rowKeys[1] === "title") {
+      if (rowKeys[0] === "type" && rowKeys[1] === "title") {
        this.parsePersonalInformationRecord(cipher, row);
      }

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
    "@compodoc/compodoc": "1.1.26",
    "@electron/notarize": "2.5.0",
    "@electron/rebuild": "3.7.2",
+    "@eslint/compat": "1.2.9",
    "@lit-labs/signals": "0.1.2",
    "@ngtools/webpack": "18.2.19",
    "@storybook/addon-a11y": "8.6.12",
@@ -77,7 +78,7 @@
    "@types/node": "22.15.3",
    "@types/node-fetch": "2.6.4",
    "@types/node-forge": "1.3.11",
-    "@types/papaparse": "5.3.15",
+    "@types/papaparse": "5.3.16",
    "@types/proper-lockfile": "4.1.4",
    "@types/retry": "0.12.5",
    "@types/zxcvbn": "4.4.5",
@@ -102,7 +103,7 @@
    "electron-reload": "2.0.0-alpha.1",
    "electron-store": "8.2.0",
    "electron-updater": "6.6.4",
-    "eslint": "8.57.1",
+    "eslint": "9.26.0",
    "eslint-config-prettier": "10.1.2",
    "eslint-import-resolver-typescript": "4.3.4",
    "eslint-plugin-import": "2.31.0",
@@ -194,7 +195,7 @@
    "node-forge": "1.3.1",
    "oidc-client-ts": "2.4.1",
    "open": "8.4.2",
-    "papaparse": "5.5.2",
+    "papaparse": "5.5.3",
    "patch-package": "8.0.0",
    "proper-lockfile": "4.1.2",
    "qrcode-parser": "2.1.3",
@@ -207,6 +208,12 @@
    "zxcvbn": "4.4.2"
  },
  "overrides": {
+    "eslint-plugin-rxjs": {
+      "eslint": "$eslint"
+    },
+    "eslint-plugin-rxjs-angular": {
+      "eslint": "$eslint"
+    },
    "tailwindcss": "$tailwindcss",
    "@storybook/angular": {
      "zone.js": "$zone.js"