Merge branch 'main' of github.com:bitwarden/clients into desktop/send-search-on-push

# Conflicts:
#	apps/desktop/src/app/tools/send-v2/send-v2.component.ts

libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts

@@ -3,13 +3,13 @@
 import * as papa from "papaparse";
 import { filter, firstValueFrom, map } from "rxjs";
 
+import { CollectionService } from "@bitwarden/admin-console/common";
 import {
-  CollectionService,
-  CollectionData,
-  Collection,
-  CollectionDetailsResponse,
   CollectionView,
-} from "@bitwarden/admin-console/common";
+  CollectionDetailsResponse,
+  Collection,
+  CollectionData,
+} from "@bitwarden/common/admin-console/models/collections";
 import { KeyGenerationService } from "@bitwarden/common/key-management/crypto";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";

libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.ts

@@ -6,9 +6,9 @@ import { FormsModule } from "@angular/forms";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import {
   DIALOG_DATA,
   DialogRef,

libs/tools/send/send-ui/src/new-send-dropdown-v2/new-send-dropdown-v2.component.spec.ts

@@ -5,7 +5,7 @@ import { BehaviorSubject, of } from "rxjs";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 
 import { NewSendDropdownV2Component } from "./new-send-dropdown-v2.component";

libs/tools/send/send-ui/src/new-send-dropdown-v2/new-send-dropdown-v2.component.ts

@@ -6,7 +6,7 @@ import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/pre
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { ButtonModule, ButtonType, MenuModule } from "@bitwarden/components";
 

libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts

@@ -7,7 +7,7 @@ import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/pre
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { ButtonModule, ButtonType, MenuModule } from "@bitwarden/components";
 

libs/tools/send/send-ui/src/send-form/abstractions/send-form-config.service.ts

@@ -1,5 +1,5 @@
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { Send } from "@bitwarden/common/tools/send/models/domain/send";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import { SendId } from "@bitwarden/common/types/guid";
 
 /**

libs/tools/send/send-ui/src/send-form/components/options/send-options.component.spec.ts

@@ -6,9 +6,9 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import { DialogService, ToastService } from "@bitwarden/components";
 import { CredentialGeneratorService } from "@bitwarden/generator-core";
 

libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.ts

@@ -9,8 +9,8 @@ import { firstValueFrom } from "rxjs";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import {
   SectionComponent,
   SectionHeaderComponent,

libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts

@@ -4,9 +4,9 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormBuilder, Validators, ReactiveFormsModule, FormsModule } from "@angular/forms";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendFileView } from "@bitwarden/common/tools/send/models/view/send-file.view";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import {
   ButtonModule,
   FormFieldModule,

libs/tools/send/send-ui/src/send-form/components/send-form.component.ts

@@ -18,8 +18,8 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormBuilder, ReactiveFormsModule } from "@angular/forms";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import {
   AsyncActionsModule,
   BitSubmitDirective,

libs/tools/send/send-ui/src/send-form/services/default-send-form-config.service.ts

@@ -7,8 +7,8 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import { SendId } from "@bitwarden/common/types/guid";
 
 import {

libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.ts

@@ -10,9 +10,9 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import {
   BadgeModule,
   ButtonModule,

libs/tools/send/send-ui/src/send-list/send-list.component.ts

@@ -1,8 +1,17 @@
 import { CommonModule } from "@angular/common";
-import { ChangeDetectionStrategy, Component, computed, effect, input, output } from "@angular/core";
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  effect,
+  inject,
+  input,
+  output,
+} from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NoResults, NoSendsIcon } from "@bitwarden/assets/svg";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import {
   ButtonModule,
@@ -48,6 +57,8 @@ export class SendListComponent {
   protected readonly noResultsIcon = NoResults;
   protected readonly sendListState = SendListState;
 
+  private i18nService = inject(I18nService);
+
   readonly sends = input.required<SendView[]>();
   readonly loading = input<boolean>(false);
   readonly disableSend = input<boolean>(false);
@@ -59,7 +70,7 @@ export class SendListComponent {
   );
 
   protected readonly noSearchResults = computed(
-    () => this.showSearchBar() && this.sends().length === 0,
+    () => this.showSearchBar() && (this.sends().length === 0 || this.searchText().length > 0),
   );
 
   // Reusable data source instance - updated reactively when sends change

libs/tools/send/send-ui/src/send-table/send-table.component.html

@@ -33,14 +33,16 @@
               ></i>
               <span class="tw-sr-only">{{ "disabled" | i18n }}</span>
             }
-            @if (s.password) {
+            @if (s.authType !== authType.None) {
+              @let titleKey =
+                s.authType === authType.Email ? "emailProtected" : "passwordProtected";
               <i
-                class="bwi bwi-key"
+                class="bwi bwi-lock"
                 appStopProp
-                title="{{ 'password' | i18n }}"
+                title="{{ titleKey | i18n }}"
                 aria-hidden="true"
               ></i>
-              <span class="tw-sr-only">{{ "password" | i18n }}</span>
+              <span class="tw-sr-only">{{ titleKey | i18n }}</span>
             }
             @if (s.maxAccessCountReached) {
               <i

libs/tools/send/send-ui/src/send-table/send-table.component.stories.ts

@@ -1,8 +1,9 @@
 import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
+import { AuthType } from "@bitwarden/common/tools/send/types/auth-type";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import { TableDataSource, I18nMockService } from "@bitwarden/components";
 
 import { SendTableComponent } from "./send-table.component";
@@ -13,6 +14,7 @@ function createMockSend(id: number, overrides: Partial<SendView> = {}): SendView
   send.id = `send-${id}`;
   send.name = "My Send";
   send.type = SendType.Text;
+  send.authType = AuthType.None;
   send.deletionDate = new Date("2030-01-01T12:00:00Z");
   send.password = null as any;
 
@@ -34,21 +36,29 @@ dataSource.data = [
   createMockSend(2, {
     name: "Password Protected Send",
     type: SendType.Text,
+    authType: AuthType.Password,
     password: "123",
   }),
   createMockSend(3, {
+    name: "Email Protected Send",
+    type: SendType.Text,
+    authType: AuthType.Email,
+    emails: ["ckent@dailyplanet.com"],
+  }),
+  createMockSend(4, {
     name: "Disabled Send",
     type: SendType.Text,
     disabled: true,
   }),
-  createMockSend(4, {
+  createMockSend(5, {
     name: "Expired Send",
     type: SendType.File,
     expirationDate: new Date("2025-12-01T00:00:00Z"),
   }),
-  createMockSend(5, {
+  createMockSend(6, {
     name: "Max Access Reached",
     type: SendType.Text,
+    authType: AuthType.Password,
     maxAccessCount: 5,
     accessCount: 5,
     password: "123",
@@ -69,7 +79,8 @@ export default {
               deletionDate: "Deletion Date",
               options: "Options",
               disabled: "Disabled",
-              password: "Password",
+              passwordProtected: "Password protected",
+              emailProtected: "Email protected",
               maxAccessCountReached: "Max access count reached",
               expired: "Expired",
               pendingDeletion: "Pending deletion",

libs/tools/send/send-ui/src/send-table/send-table.component.ts

@@ -2,8 +2,9 @@ import { CommonModule } from "@angular/common";
 import { ChangeDetectionStrategy, Component, input, output } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
+import { AuthType } from "@bitwarden/common/tools/send/types/auth-type";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import {
   BadgeModule,
   ButtonModule,
@@ -37,6 +38,7 @@ import {
 })
 export class SendTableComponent {
   protected readonly sendType = SendType;
+  protected readonly authType = AuthType;
 
   /**
    * The data source containing the Send items to display in the table.

libs/tools/send/send-ui/src/services/send-list-filters.service.spec.ts

@@ -4,8 +4,8 @@ import { BehaviorSubject } from "rxjs";
 
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 
 import { SendListFiltersService } from "./send-list-filters.service";
 

libs/tools/send/send-ui/src/services/send-list-filters.service.ts

@@ -5,8 +5,8 @@ import { FormBuilder } from "@angular/forms";
 import { map, Observable, startWith } from "rxjs";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
+import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import { ITreeNodeObject, TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { ChipSelectOption } from "@bitwarden/components";