Merge branch 'master' into EC-598-beeep-properly-store-passkeys-in-bitwarden

libs/angular/src/admin-console/components/collections.component.ts

@@ -1,10 +1,10 @@
 import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
 
-import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { CollectionView } from "@bitwarden/common/models/view/collection.view";
+import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
+import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";

libs/angular/src/auth/components/change-password.component.ts

@@ -4,15 +4,16 @@ import { Subject, takeUntil } from "rxjs";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";
 import { KdfType } from "@bitwarden/common/enums/kdfType";
+import { Utils } from "@bitwarden/common/misc/utils";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 import { PasswordColorText } from "../../shared/components/password-strength/password-strength.component";
 
@@ -25,6 +26,8 @@ export class ChangePasswordComponent implements OnInit, OnDestroy {
   passwordStrengthResult: any;
   color: string;
   text: string;
+  leakedPassword: boolean;
+  minimumLength = Utils.minimumPasswordLength;
 
   protected email: string;
   protected kdf: KdfType;
@@ -36,7 +39,7 @@ export class ChangePasswordComponent implements OnInit, OnDestroy {
     protected i18nService: I18nService,
     protected cryptoService: CryptoService,
     protected messagingService: MessagingService,
-    protected passwordGenerationService: PasswordGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
     protected platformUtilsService: PlatformUtilsService,
     protected policyService: PolicyService,
     protected stateService: StateService
@@ -116,11 +119,11 @@ export class ChangePasswordComponent implements OnInit, OnDestroy {
       );
       return false;
     }
-    if (this.masterPassword.length < 8) {
+    if (this.masterPassword.length < this.minimumLength) {
       this.platformUtilsService.showToast(
         "error",
         this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPasswordMinlength")
+        this.i18nService.t("masterPasswordMinimumlength", this.minimumLength)
       );
       return false;
     }
@@ -151,10 +154,12 @@ export class ChangePasswordComponent implements OnInit, OnDestroy {
       return false;
     }
 
-    if (strengthResult != null && strengthResult.score < 3) {
+    const weakPassword = strengthResult != null && strengthResult.score < 3;
+
+    if (weakPassword && this.leakedPassword) {
       const result = await this.platformUtilsService.showDialog(
-        this.i18nService.t("weakMasterPasswordDesc"),
-        this.i18nService.t("weakMasterPassword"),
+        this.i18nService.t("weakAndBreachedMasterPasswordDesc"),
+        this.i18nService.t("weakAndExposedMasterPassword"),
         this.i18nService.t("yes"),
         this.i18nService.t("no"),
         "warning"
@@ -162,6 +167,31 @@ export class ChangePasswordComponent implements OnInit, OnDestroy {
       if (!result) {
         return false;
       }
+    } else {
+      if (weakPassword) {
+        const result = await this.platformUtilsService.showDialog(
+          this.i18nService.t("weakMasterPasswordDesc"),
+          this.i18nService.t("weakMasterPassword"),
+          this.i18nService.t("yes"),
+          this.i18nService.t("no"),
+          "warning"
+        );
+        if (!result) {
+          return false;
+        }
+      }
+      if (this.leakedPassword) {
+        const result = await this.platformUtilsService.showDialog(
+          this.i18nService.t("exposedMasterPasswordDesc"),
+          this.i18nService.t("exposedMasterPassword"),
+          this.i18nService.t("yes"),
+          this.i18nService.t("no"),
+          "warning"
+        );
+        if (!result) {
+          return false;
+        }
+      }
     }
 
     return true;

libs/angular/src/auth/components/login-with-device.component.ts

@@ -10,7 +10,6 @@ import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunc
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { ValidationService } from "@bitwarden/common/abstractions/validation.service";
@@ -23,6 +22,7 @@ import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth
 import { Utils } from "@bitwarden/common/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 import { CaptchaProtectedComponent } from "./captcha-protected.component";
 
@@ -35,6 +35,7 @@ export class LoginWithDeviceComponent
   email: string;
   showResendNotification = false;
   passwordlessRequest: PasswordlessCreateAuthRequest;
+  fingerprintPhrase: string;
   onSuccessfulLoginTwoFactorNavigate: () => Promise<any>;
   onSuccessfulLogin: () => Promise<any>;
   onSuccessfulLoginNavigate: () => Promise<any>;
@@ -51,7 +52,7 @@ export class LoginWithDeviceComponent
     private cryptoService: CryptoService,
     private cryptoFunctionService: CryptoFunctionService,
     private appIdService: AppIdService,
-    private passwordGenerationService: PasswordGenerationService,
+    private passwordGenerationService: PasswordGenerationServiceAbstraction,
     private apiService: ApiService,
     private authService: AuthService,
     private logService: LogService,
@@ -170,20 +171,20 @@ export class LoginWithDeviceComponent
 
   private async buildAuthRequest() {
     this.authRequestKeyPair = await this.cryptoFunctionService.rsaGenerateKeyPair(2048);
-    const fingerprint = await (
-      await this.cryptoService.getFingerprint(this.email, this.authRequestKeyPair[0])
-    ).join("-");
     const deviceIdentifier = await this.appIdService.getAppId();
     const publicKey = Utils.fromBufferToB64(this.authRequestKeyPair[0]);
     const accessCode = await this.passwordGenerationService.generatePassword({ length: 25 });
 
+    this.fingerprintPhrase = (
+      await this.cryptoService.getFingerprint(this.email, this.authRequestKeyPair[0])
+    ).join("-");
+
     this.passwordlessRequest = new PasswordlessCreateAuthRequest(
       this.email,
       deviceIdentifier,
       publicKey,
       AuthRequestType.AuthenticateAndUnlock,
-      accessCode,
-      fingerprint
+      accessCode
     );
   }
 

libs/angular/src/auth/components/login.component.ts

@@ -13,7 +13,6 @@ import {
 } from "@bitwarden/common/abstractions/formValidationErrors.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -21,6 +20,7 @@ import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { PasswordLogInCredentials } from "@bitwarden/common/auth/models/domain/log-in-credentials";
 import { Utils } from "@bitwarden/common/misc/utils";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 import { CaptchaProtectedComponent } from "./captcha-protected.component";
 
@@ -60,7 +60,7 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
     i18nService: I18nService,
     protected stateService: StateService,
     environmentService: EnvironmentService,
-    protected passwordGenerationService: PasswordGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
     protected cryptoFunctionService: CryptoFunctionService,
     protected logService: LogService,
     protected ngZone: NgZone,
@@ -221,7 +221,9 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
         "&state=" +
         state +
         "&codeChallenge=" +
-        codeChallenge
+        codeChallenge +
+        "&email=" +
+        encodeURIComponent(this.formGroup.controls.email.value)
     );
   }
 
@@ -236,7 +238,11 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
 
   toggleValidateEmail(value: boolean) {
     this.validatedEmail = value;
-    this.formGroup.controls.masterPassword.reset();
+    if (!value) {
+      // Reset master password only when going from validated to not validated (not you btn press)
+      // so that autofill can work properly
+      this.formGroup.controls.masterPassword.reset();
+    }
   }
 
   setFormValues() {

libs/angular/src/auth/components/remove-password.component.ts

@@ -2,11 +2,11 @@ import { Directive, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
-import { Organization } from "@bitwarden/common/models/domain/organization";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 @Directive()

libs/angular/src/auth/components/sso.component.ts

@@ -7,7 +7,6 @@ import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunc
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -15,6 +14,7 @@ import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { SsoLogInCredentials } from "@bitwarden/common/auth/models/domain/log-in-credentials";
 import { SsoPreValidateResponse } from "@bitwarden/common/auth/models/response/sso-pre-validate.response";
 import { Utils } from "@bitwarden/common/misc/utils";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 @Directive()
 export class SsoComponent {
@@ -48,7 +48,7 @@ export class SsoComponent {
     protected apiService: ApiService,
     protected cryptoFunctionService: CryptoFunctionService,
     protected environmentService: EnvironmentService,
-    protected passwordGenerationService: PasswordGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
     protected logService: LogService
   ) {}
 

libs/angular/src/auth/components/two-factor.component.ts

@@ -41,10 +41,6 @@ export class TwoFactorComponent extends CaptchaProtectedComponent implements OnI
   onSuccessfulLogin: () => Promise<any>;
   onSuccessfulLoginNavigate: () => Promise<any>;
 
-  get webAuthnAllow(): string {
-    return `publickey-credentials-get ${this.environmentService.getWebVaultUrl()}`;
-  }
-
   protected loginRoute = "login";
   protected successRoute = "vault";
 

libs/angular/src/auth/components/update-password.component.ts

@@ -6,16 +6,16 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
 import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { Verification } from "@bitwarden/common/types/verification";
 
 import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component";
@@ -34,7 +34,7 @@ export class UpdatePasswordComponent extends BaseChangePasswordComponent {
     protected router: Router,
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
-    passwordGenerationService: PasswordGenerationService,
+    passwordGenerationService: PasswordGenerationServiceAbstraction,
     policyService: PolicyService,
     cryptoService: CryptoService,
     messagingService: MessagingService,

libs/angular/src/auth/components/update-temp-password.component.ts

@@ -5,14 +5,14 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component";
@@ -29,7 +29,7 @@ export class UpdateTempPasswordComponent extends BaseChangePasswordComponent {
   constructor(
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
-    passwordGenerationService: PasswordGenerationService,
+    passwordGenerationService: PasswordGenerationServiceAbstraction,
     policyService: PolicyService,
     cryptoService: CryptoService,
     messagingService: MessagingService,

libs/angular/src/components/callout.component.html

@@ -12,10 +12,10 @@
     {{ enforcedPolicyMessage }}
     <ul>
       <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
-        {{ "policyInEffectMinComplexity" | i18n: getPasswordScoreAlertDisplay() }}
+        {{ "policyInEffectMinComplexity" | i18n : getPasswordScoreAlertDisplay() }}
       </li>
       <li *ngIf="enforcedPolicyOptions?.minLength > 0">
-        {{ "policyInEffectMinLength" | i18n: enforcedPolicyOptions?.minLength.toString() }}
+        {{ "policyInEffectMinLength" | i18n : enforcedPolicyOptions?.minLength.toString() }}
       </li>
       <li *ngIf="enforcedPolicyOptions?.requireUpper">
         {{ "policyInEffectUppercase" | i18n }}
@@ -27,7 +27,7 @@
         {{ "policyInEffectNumbers" | i18n }}
       </li>
       <li *ngIf="enforcedPolicyOptions?.requireSpecial">
-        {{ "policyInEffectSpecial" | i18n: "!@#$%^&*" }}
+        {{ "policyInEffectSpecial" | i18n : "!@#$%^&*" }}
       </li>
     </ul>
   </div>

libs/angular/src/components/callout.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 
 @Component({
   selector: "app-callout",

libs/angular/src/components/export-scope-callout.component.html

@@ -1,5 +1,5 @@
 <ng-container *ngIf="show">
   <app-callout type="info" title="{{ scopeConfig.title | i18n }}">
-    {{ scopeConfig.description | i18n: scopeConfig.scopeIdentifier }}
+    {{ scopeConfig.description | i18n : scopeConfig.scopeIdentifier }}
   </app-callout>
 </ng-container>

libs/angular/src/components/export-scope-callout.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from "@angular/core";
 
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 
 @Component({
   selector: "app-export-scope-callout",

libs/angular/src/components/export.component.ts

@@ -9,11 +9,11 @@ import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
 import { EncryptedExportType } from "@bitwarden/common/enums/encryptedExportType";
 import { EventType } from "@bitwarden/common/enums/eventType";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
 
 @Directive()
 export class ExportComponent implements OnInit, OnDestroy {

libs/angular/src/components/modal/modal-injector.ts

@@ -1,10 +1,18 @@
-import { InjectFlags, InjectionToken, Injector, Type } from "@angular/core";
+import { InjectFlags, InjectOptions, Injector, ProviderToken } from "@angular/core";
 
 export class ModalInjector implements Injector {
   constructor(private _parentInjector: Injector, private _additionalTokens: WeakMap<any, any>) {}
 
-  get<T>(token: Type<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
-  get(token: any, notFoundValue?: any, flags?: any) {
+  get<T>(
+    token: ProviderToken<T>,
+    notFoundValue: undefined,
+    options: InjectOptions & { optional?: false }
+  ): T;
+  get<T>(token: ProviderToken<T>, notFoundValue: null, options: InjectOptions): T;
+  get<T>(token: ProviderToken<T>, notFoundValue?: T, options?: InjectOptions | InjectFlags): T;
+  get<T>(token: ProviderToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
+  get(token: any, notFoundValue?: any): any;
+  get(token: any, notFoundValue?: any, flags?: any): any {
     return this._additionalTokens.get(token) ?? this._parentInjector.get<any>(token, notFoundValue);
   }
 }

libs/angular/src/components/register.component.ts

@@ -12,7 +12,6 @@ import {
 } from "@bitwarden/common/abstractions/formValidationErrors.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -23,6 +22,7 @@ import { Utils } from "@bitwarden/common/misc/utils";
 import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
 import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request";
 import { RegisterRequest } from "@bitwarden/common/models/request/register.request";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 import { CaptchaProtectedComponent } from "../auth/components/captcha-protected.component";
 import { PasswordColorText } from "../shared/components/password-strength/password-strength.component";
@@ -87,7 +87,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn
     protected apiService: ApiService,
     protected stateService: StateService,
     platformUtilsService: PlatformUtilsService,
-    protected passwordGenerationService: PasswordGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
     environmentService: EnvironmentService,
     protected logService: LogService,
     protected auditService: AuditService
@@ -171,6 +171,8 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn
           return this.i18nService.t("masterPassDoesntMatch");
         case "inputsMatchError":
           return this.i18nService.t("hintEqualsPassword");
+        case "minlength":
+          return this.i18nService.t("masterPasswordMinlength", Utils.minimumPasswordLength);
         default:
           return this.i18nService.t(this.errorTag(error));
       }

libs/angular/src/components/set-password.component.ts

@@ -8,12 +8,11 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { SetPasswordRequest } from "@bitwarden/common/auth/models/request/set-password.request";
 import { HashPurpose } from "@bitwarden/common/enums/hashPurpose";
 import { DEFAULT_KDF_TYPE, DEFAULT_KDF_CONFIG } from "@bitwarden/common/enums/kdfType";
@@ -21,6 +20,7 @@ import { Utils } from "@bitwarden/common/misc/utils";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
 import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { ChangePasswordComponent as BaseChangePasswordComponent } from "../auth/components/change-password.component";
@@ -41,7 +41,7 @@ export class SetPasswordComponent extends BaseChangePasswordComponent {
     i18nService: I18nService,
     cryptoService: CryptoService,
     messagingService: MessagingService,
-    passwordGenerationService: PasswordGenerationService,
+    passwordGenerationService: PasswordGenerationServiceAbstraction,
     platformUtilsService: PlatformUtilsService,
     private policyApiService: PolicyApiServiceAbstraction,
     policyService: PolicyService,

libs/angular/src/components/settings/vault-timeout-input.component.ts

@@ -9,9 +9,9 @@ import {
 import { combineLatestWith, Subject, takeUntil } from "rxjs";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
-import { Policy } from "@bitwarden/common/models/domain/policy";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
+import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 
 @Directive()
 export class VaultTimeoutInputComponent

libs/angular/src/components/share.component.ts

@@ -1,18 +1,18 @@
 import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
 import { firstValueFrom, map, Observable, Subject, takeUntil } from "rxjs";
 
-import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
 import {
   isNotProviderUser,
   OrganizationService,
-} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { Organization } from "@bitwarden/common/models/domain/organization";
-import { CollectionView } from "@bitwarden/common/models/view/collection.view";
 import { Checkable, isChecked } from "@bitwarden/common/types/checkable";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";

libs/angular/src/pipes/credit-card-number.pipe.ts

@@ -25,12 +25,6 @@ const numberFormats: Record<string, CardRuleEntry[]> = {
     { cardLength: 19, blocks: [6, 13] },
   ],
   Amex: [{ cardLength: 15, blocks: [4, 6, 5] }],
-  Mir: [
-    { cardLength: 16, blocks: [4, 4, 4, 4] },
-    { cardLength: 17, blocks: [5, 4, 4, 4] },
-    { cardLength: 18, blocks: [6, 4, 4, 4] },
-    { cardLength: 19, blocks: [7, 4, 4, 4] },
-  ],
   Other: [{ cardLength: 16, blocks: [4, 4, 4, 4] }],
 };
 

libs/angular/src/pipes/user-name.pipe.ts

@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from "@angular/core";
 
 interface User {
   name?: string;
-  email: string;
+  email?: string;
 }
 
 @Pipe({
@@ -14,6 +14,10 @@ export class UserNamePipe implements PipeTransform {
       return null;
     }
 
+    if (user.name == null && user.email == null) {
+      return null;
+    }
+
     return user.name == null || user.name.trim() === "" ? user.email : user.name;
   }
 }

libs/angular/src/pipes/user-type.pipe.ts

@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType";
+import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
 
 @Pipe({
   name: "userType",

libs/angular/src/scss/icons.scss

@@ -1,4 +1,4 @@
-$card-icons-base: "~@bitwarden/angular/src/images/cards/" !default;
+$card-icons-base: "~@bitwarden/angular/src/billing/images/cards/" !default;
 $card-icons: (
   "visa": $card-icons-base + "visa-light.png",
   "amex": $card-icons-base + "amex-light.png",
@@ -9,7 +9,6 @@ $card-icons: (
   "mastercard": $card-icons-base + "mastercard-light.png",
   "union-pay": $card-icons-base + "union_pay-light.png",
   "ru-pay": $card-icons-base + "ru_pay-light.png",
-  "mir": $card-icons-base + "mir-light.png",
 );
 
 $card-icons-dark: (
@@ -22,7 +21,6 @@ $card-icons-dark: (
   "mastercard": $card-icons-base + "mastercard-dark.png",
   "union-pay": $card-icons-base + "union_pay-dark.png",
   "ru-pay": $card-icons-base + "ru_pay-dark.png",
-  "mir": $card-icons-base + "mir-dark.png",
 );
 
 .credit-card-icon {

libs/angular/src/services/jslib-services.module.ts

@@ -6,7 +6,6 @@ import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstracti
 import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/abstractions/appId.service";
 import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service";
 import { BroadcasterService as BroadcasterServiceAbstraction } from "@bitwarden/common/abstractions/broadcaster.service";
-import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/abstractions/collection.service";
 import { ConfigApiServiceAbstraction } from "@bitwarden/common/abstractions/config/config-api.service.abstraction";
 import { ConfigServiceAbstraction } from "@bitwarden/common/abstractions/config/config.service.abstraction";
 import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
@@ -16,28 +15,20 @@ import { EnvironmentService as EnvironmentServiceAbstraction } from "@bitwarden/
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abstractions/export.service";
-import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/fileUpload.service";
+import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/file-upload/file-upload.service";
 import { FormValidationErrorsService as FormValidationErrorsServiceAbstraction } from "@bitwarden/common/abstractions/formValidationErrors.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
+import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/abstractions/organization-domain/org-domain-api.service.abstraction";
+import {
+  OrgDomainServiceAbstraction,
+  OrgDomainInternalServiceAbstraction,
+} from "@bitwarden/common/abstractions/organization-domain/org-domain.service.abstraction";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
-import {
-  InternalOrganizationService,
-  OrganizationService as OrganizationServiceAbstraction,
-} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
-import {
-  InternalPolicyService,
-  PolicyService as PolicyServiceAbstraction,
-} from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
-import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/abstractions/provider.service";
 import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service";
-import { SendService as SendServiceAbstraction } from "@bitwarden/common/abstractions/send.service";
 import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service";
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service";
 import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service";
@@ -45,10 +36,27 @@ import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.s
 import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service";
 import { UserVerificationApiServiceAbstraction } from "@bitwarden/common/abstractions/userVerification/userVerification-api.service.abstraction";
 import { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
-import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "@bitwarden/common/abstractions/usernameGeneration.service";
 import { ValidationService as ValidationServiceAbstraction } from "@bitwarden/common/abstractions/validation.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
+import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/collection.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import {
+  InternalOrganizationService,
+  OrganizationService as OrganizationServiceAbstraction,
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import {
+  InternalPolicyService,
+  PolicyService as PolicyServiceAbstraction,
+} from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider.service";
+import { CollectionService } from "@bitwarden/common/admin-console/services/collection.service";
+import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service";
+import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.service";
+import { PolicyApiService } from "@bitwarden/common/admin-console/services/policy/policy-api.service";
+import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service";
+import { ProviderService } from "@bitwarden/common/admin-console/services/provider.service";
 import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/account-api.service";
 import {
   AccountService as AccountServiceAbstraction,
@@ -77,7 +85,6 @@ import { AnonymousHubService } from "@bitwarden/common/services/anonymousHub.ser
 import { ApiService } from "@bitwarden/common/services/api.service";
 import { AppIdService } from "@bitwarden/common/services/appId.service";
 import { AuditService } from "@bitwarden/common/services/audit.service";
-import { CollectionService } from "@bitwarden/common/services/collection.service";
 import { ConfigApiService } from "@bitwarden/common/services/config/config-api.service";
 import { ConfigService } from "@bitwarden/common/services/config/config.service";
 import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
@@ -88,28 +95,35 @@ import { EnvironmentService } from "@bitwarden/common/services/environment.servi
 import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { ExportService } from "@bitwarden/common/services/export.service";
-import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
+import { FileUploadService } from "@bitwarden/common/services/file-upload/file-upload.service";
 import { FormValidationErrorsService } from "@bitwarden/common/services/formValidationErrors.service";
 import { NotificationsService } from "@bitwarden/common/services/notifications.service";
+import { OrgDomainApiService } from "@bitwarden/common/services/organization-domain/org-domain-api.service";
+import { OrgDomainService } from "@bitwarden/common/services/organization-domain/org-domain.service";
 import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation";
-import { OrganizationApiService } from "@bitwarden/common/services/organization/organization-api.service";
-import { OrganizationService } from "@bitwarden/common/services/organization/organization.service";
-import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service";
-import { PolicyApiService } from "@bitwarden/common/services/policy/policy-api.service";
-import { PolicyService } from "@bitwarden/common/services/policy/policy.service";
-import { ProviderService } from "@bitwarden/common/services/provider.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
-import { SendService } from "@bitwarden/common/services/send.service";
 import { SettingsService } from "@bitwarden/common/services/settings.service";
 import { StateService } from "@bitwarden/common/services/state.service";
 import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
 import { TotpService } from "@bitwarden/common/services/totp.service";
-import { UsernameGenerationService } from "@bitwarden/common/services/usernameGeneration.service";
 import { ValidationService } from "@bitwarden/common/services/validation.service";
 import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service";
 import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service";
+import {
+  PasswordGenerationService,
+  PasswordGenerationServiceAbstraction,
+} from "@bitwarden/common/tools/generator/password";
+import {
+  UsernameGenerationService,
+  UsernameGenerationServiceAbstraction,
+} from "@bitwarden/common/tools/generator/username";
+import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service";
+import { SendApiService as SendApiServiceAbstraction } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
+import { SendService } from "@bitwarden/common/tools/send/services/send.service";
+import { SendService as SendServiceAbstraction } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import {
   FolderService as FolderServiceAbstraction,
@@ -119,6 +133,7 @@ import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@
 import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync-notifier.service.abstraction";
 import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
+import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";
 import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
 import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service";
 import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";
@@ -219,40 +234,50 @@ import { AbstractThemingService } from "./theming/theming.service.abstraction";
         I18nServiceAbstraction,
       ],
     },
+    {
+      provide: FileUploadServiceAbstraction,
+      useClass: FileUploadService,
+      deps: [LoginServiceAbstraction],
+    },
+    {
+      provide: CipherFileUploadServiceAbstraction,
+      useClass: CipherFileUploadService,
+      deps: [ApiServiceAbstraction, FileUploadServiceAbstraction],
+    },
     {
       provide: CipherServiceAbstraction,
       useFactory: (
         cryptoService: CryptoServiceAbstraction,
         settingsService: SettingsServiceAbstraction,
         apiService: ApiServiceAbstraction,
-        fileUploadService: FileUploadServiceAbstraction,
         i18nService: I18nServiceAbstraction,
         injector: Injector,
         logService: LogService,
         stateService: StateServiceAbstraction,
-        encryptService: EncryptService
+        encryptService: EncryptService,
+        fileUploadService: CipherFileUploadServiceAbstraction
       ) =>
         new CipherService(
           cryptoService,
           settingsService,
           apiService,
-          fileUploadService,
           i18nService,
           () => injector.get(SearchServiceAbstraction),
           logService,
           stateService,
-          encryptService
+          encryptService,
+          fileUploadService
         ),
       deps: [
         CryptoServiceAbstraction,
         SettingsServiceAbstraction,
         ApiServiceAbstraction,
-        FileUploadServiceAbstraction,
         I18nServiceAbstraction,
         Injector, // TODO: Get rid of this circular dependency!
         LogService,
         StateServiceAbstraction,
         EncryptService,
+        CipherFileUploadServiceAbstraction,
       ],
     },
     {
@@ -348,9 +373,19 @@ import { AbstractThemingService } from "./theming/theming.service.abstraction";
       ],
     },
     {
-      provide: FileUploadServiceAbstraction,
-      useClass: FileUploadService,
-      deps: [LogService, ApiServiceAbstraction],
+      provide: SendServiceAbstraction,
+      useClass: SendService,
+      deps: [
+        CryptoServiceAbstraction,
+        I18nServiceAbstraction,
+        CryptoFunctionServiceAbstraction,
+        StateServiceAbstraction,
+      ],
+    },
+    {
+      provide: SendApiServiceAbstraction,
+      useClass: SendApiService,
+      deps: [ApiServiceAbstraction, FileUploadServiceAbstraction, SendServiceAbstraction],
     },
     {
       provide: SyncServiceAbstraction,
@@ -371,6 +406,7 @@ import { AbstractThemingService } from "./theming/theming.service.abstraction";
         ProviderServiceAbstraction,
         FolderApiServiceAbstraction,
         OrganizationServiceAbstraction,
+        SendApiServiceAbstraction,
         LOGOUT_CALLBACK,
       ],
     },
@@ -436,6 +472,7 @@ import { AbstractThemingService } from "./theming/theming.service.abstraction";
         ApiServiceAbstraction,
         CryptoServiceAbstraction,
         CryptoFunctionServiceAbstraction,
+        StateServiceAbstraction,
       ],
     },
     {
@@ -497,18 +534,6 @@ import { AbstractThemingService } from "./theming/theming.service.abstraction";
       useClass: PolicyApiService,
       deps: [PolicyServiceAbstraction, ApiServiceAbstraction, StateServiceAbstraction],
     },
-    {
-      provide: SendServiceAbstraction,
-      useClass: SendService,
-      deps: [
-        CryptoServiceAbstraction,
-        ApiServiceAbstraction,
-        FileUploadServiceAbstraction,
-        I18nServiceAbstraction,
-        CryptoFunctionServiceAbstraction,
-        StateServiceAbstraction,
-      ],
-    },
     {
       provide: KeyConnectorServiceAbstraction,
       useClass: KeyConnectorService,
@@ -610,6 +635,20 @@ import { AbstractThemingService } from "./theming/theming.service.abstraction";
       useClass: LoginService,
       deps: [StateServiceAbstraction],
     },
+    {
+      provide: OrgDomainServiceAbstraction,
+      useClass: OrgDomainService,
+      deps: [PlatformUtilsServiceAbstraction, I18nServiceAbstraction],
+    },
+    {
+      provide: OrgDomainInternalServiceAbstraction,
+      useExisting: OrgDomainServiceAbstraction,
+    },
+    {
+      provide: OrgDomainApiServiceAbstraction,
+      useClass: OrgDomainApiService,
+      deps: [OrgDomainServiceAbstraction, ApiServiceAbstraction],
+    },
   ],
 })
 export class JslibServicesModule {}

libs/angular/src/shared/components/password-strength/password-strength.component.ts

@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnChanges, Output } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 export interface PasswordColorText {
   color: string;
@@ -59,7 +59,7 @@ export class PasswordStrengthComponent implements OnChanges {
 
   constructor(
     private i18nService: I18nService,
-    private passwordGenerationService: PasswordGenerationService
+    private passwordGenerationService: PasswordGenerationServiceAbstraction
   ) {}
 
   ngOnChanges(): void {

libs/angular/src/tools/generator/components/generator.component.ts

@@ -4,11 +4,12 @@ import { first } from "rxjs/operators";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service";
-import { PasswordGeneratorPolicyOptions } from "@bitwarden/common/models/domain/password-generator-policy-options";
+import { PasswordGeneratorPolicyOptions } from "@bitwarden/common/admin-console/models/domain/password-generator-policy-options";
+import { EmailForwarderOptions } from "@bitwarden/common/models/domain/email-forwarder-options";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
+import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username";
 
 @Directive()
 export class GeneratorComponent implements OnInit {
@@ -22,7 +23,7 @@ export class GeneratorComponent implements OnInit {
   usernameTypeOptions: any[];
   subaddressOptions: any[];
   catchallOptions: any[];
-  forwardOptions: any[];
+  forwardOptions: EmailForwarderOptions[];
   usernameOptions: any = {};
   passwordOptions: any = {};
   username = "-";
@@ -33,8 +34,8 @@ export class GeneratorComponent implements OnInit {
   usernameWebsite: string = null;
 
   constructor(
-    protected passwordGenerationService: PasswordGenerationService,
-    protected usernameGenerationService: UsernameGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
+    protected usernameGenerationService: UsernameGenerationServiceAbstraction,
     protected platformUtilsService: PlatformUtilsService,
     protected stateService: StateService,
     protected i18nService: I18nService,
@@ -236,11 +237,11 @@ export class GeneratorComponent implements OnInit {
 
   private async initForwardOptions() {
     this.forwardOptions = [
-      { name: "AnonAddy", value: "anonaddy" },
-      { name: "DuckDuckGo", value: "duckduckgo" },
-      { name: "Fastmail", value: "fastmail" },
-      { name: "Firefox Relay", value: "firefoxrelay" },
-      { name: "SimpleLogin", value: "simplelogin" },
+      { name: "AnonAddy", value: "anonaddy", validForSelfHosted: true },
+      { name: "DuckDuckGo", value: "duckduckgo", validForSelfHosted: false },
+      { name: "Fastmail", value: "fastmail", validForSelfHosted: true },
+      { name: "Firefox Relay", value: "firefoxrelay", validForSelfHosted: false },
+      { name: "SimpleLogin", value: "simplelogin", validForSelfHosted: true },
     ];
 
     this.usernameOptions = await this.usernameGenerationService.getOptions();
@@ -248,7 +249,7 @@ export class GeneratorComponent implements OnInit {
       this.usernameOptions.forwardedService == null ||
       this.usernameOptions.forwardedService === ""
     ) {
-      this.forwardOptions.push({ name: "", value: null });
+      this.forwardOptions.push({ name: "", value: null, validForSelfHosted: false });
     }
 
     this.forwardOptions = this.forwardOptions.sort((a, b) => a.name.localeCompare(b.name));

libs/angular/src/tools/generator/components/password-generator-history.component.ts

@@ -1,16 +1,18 @@
 import { Directive, OnInit } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { GeneratedPasswordHistory } from "@bitwarden/common/models/domain/generated-password-history";
+import {
+  GeneratedPasswordHistory,
+  PasswordGenerationServiceAbstraction,
+} from "@bitwarden/common/tools/generator/password";
 
 @Directive()
 export class PasswordGeneratorHistoryComponent implements OnInit {
   history: GeneratedPasswordHistory[] = [];
 
   constructor(
-    protected passwordGenerationService: PasswordGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
     protected platformUtilsService: PlatformUtilsService,
     protected i18nService: I18nService,
     private win: Window

libs/angular/src/tools/send/add-edit.component.ts

@@ -7,16 +7,17 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
-import { SendService } from "@bitwarden/common/abstractions/send.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
-import { SendType } from "@bitwarden/common/enums/sendType";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
 import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer";
-import { Send } from "@bitwarden/common/models/domain/send";
-import { SendFileView } from "@bitwarden/common/models/view/send-file.view";
-import { SendTextView } from "@bitwarden/common/models/view/send-text.view";
-import { SendView } from "@bitwarden/common/models/view/send.view";
+import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
+import { Send } from "@bitwarden/common/tools/send/models/domain/send";
+import { SendFileView } from "@bitwarden/common/tools/send/models/view/send-file.view";
+import { SendTextView } from "@bitwarden/common/tools/send/models/view/send-text.view";
+import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
+import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
+import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 
 @Directive()
 export class AddEditComponent implements OnInit, OnDestroy {
@@ -58,7 +59,8 @@ export class AddEditComponent implements OnInit, OnDestroy {
     protected messagingService: MessagingService,
     protected policyService: PolicyService,
     private logService: LogService,
-    protected stateService: StateService
+    protected stateService: StateService,
+    protected sendApiService: SendApiService
   ) {
     this.typeOptions = [
       { name: i18nService.t("sendTypeFile"), value: SendType.File },
@@ -127,7 +129,7 @@ export class AddEditComponent implements OnInit, OnDestroy {
 
     if (this.send == null) {
       if (this.editMode) {
-        const send = await this.loadSend();
+        const send = this.loadSend();
         this.send = await send.decrypt();
       } else {
         this.send = new SendView();
@@ -191,7 +193,7 @@ export class AddEditComponent implements OnInit, OnDestroy {
     }
 
     this.formPromise = this.encryptSend(file).then(async (encSend) => {
-      const uploadPromise = this.sendService.saveWithServer(encSend);
+      const uploadPromise = this.sendApiService.save(encSend);
       await uploadPromise;
       if (this.send.id == null) {
         this.send.id = encSend[0].id;
@@ -241,7 +243,7 @@ export class AddEditComponent implements OnInit, OnDestroy {
     }
 
     try {
-      this.deletePromise = this.sendService.deleteWithServer(this.send.id);
+      this.deletePromise = this.sendApiService.delete(this.send.id);
       await this.deletePromise;
       this.platformUtilsService.showToast("success", null, this.i18nService.t("deletedSend"));
       await this.load();
@@ -270,7 +272,7 @@ export class AddEditComponent implements OnInit, OnDestroy {
     this.showOptions = !this.showOptions;
   }
 
-  protected async loadSend(): Promise<Send> {
+  protected loadSend(): Send {
     return this.sendService.get(this.sendId);
   }
 

libs/angular/src/tools/send/send.component.ts

@@ -5,12 +5,13 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { SendService } from "@bitwarden/common/abstractions/send.service";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
-import { SendType } from "@bitwarden/common/enums/sendType";
-import { SendView } from "@bitwarden/common/models/view/send.view";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
+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 { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 
 @Directive()
 export class SendComponent implements OnInit, OnDestroy {
@@ -47,7 +48,8 @@ export class SendComponent implements OnInit, OnDestroy {
     protected ngZone: NgZone,
     protected searchService: SearchService,
     protected policyService: PolicyService,
-    private logService: LogService
+    private logService: LogService,
+    protected sendApiService: SendApiService
   ) {}
 
   async ngOnInit() {
@@ -66,8 +68,9 @@ export class SendComponent implements OnInit, OnDestroy {
 
   async load(filter: (send: SendView) => boolean = null) {
     this.loading = true;
-    const sends = await this.sendService.getAllDecrypted();
-    this.sends = sends;
+    this.sendService.sendViews$.pipe(takeUntil(this.destroy$)).subscribe((sends) => {
+      this.sends = sends;
+    });
     if (this.onSuccessfulLoad != null) {
       await this.onSuccessfulLoad();
     } else {
@@ -134,7 +137,7 @@ export class SendComponent implements OnInit, OnDestroy {
     }
 
     try {
-      this.actionPromise = this.sendService.removePasswordWithServer(s.id);
+      this.actionPromise = this.sendApiService.removePassword(s.id);
       await this.actionPromise;
       if (this.onSuccessfulRemovePassword != null) {
         this.onSuccessfulRemovePassword();
@@ -165,7 +168,7 @@ export class SendComponent implements OnInit, OnDestroy {
     }
 
     try {
-      this.actionPromise = this.sendService.deleteWithServer(s.id);
+      this.actionPromise = this.sendApiService.delete(s.id);
       await this.actionPromise;
 
       if (this.onSuccessfulDelete != null) {

libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts

@@ -1,7 +1,7 @@
 import { Observable } from "rxjs";
 
-import { Organization } from "@bitwarden/common/models/domain/organization";
-import { CollectionView } from "@bitwarden/common/models/view/collection.view";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
 import { DynamicTreeNode } from "../vault-filter/models/dynamic-tree-node.model";

libs/angular/src/vault/components/add-edit.component.ts

@@ -2,26 +2,27 @@ import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angu
 import { Observable, Subject, takeUntil, concatMap } from "rxjs";
 
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
+import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
 import {
   isNotProviderUser,
   OrganizationService,
-} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
 import { EventType } from "@bitwarden/common/enums/eventType";
-import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
 import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
 import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { Organization } from "@bitwarden/common/models/domain/organization";
-import { CollectionView } from "@bitwarden/common/models/view/collection.view";
+import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
@@ -99,7 +100,8 @@ export class AddEditComponent implements OnInit, OnDestroy {
     protected policyService: PolicyService,
     private logService: LogService,
     protected passwordRepromptService: PasswordRepromptService,
-    private organizationService: OrganizationService
+    private organizationService: OrganizationService,
+    protected sendApiService: SendApiService
   ) {
     this.typeOptions = [
       { name: i18nService.t("typeLogin"), value: CipherType.Login },
@@ -118,7 +120,6 @@ export class AddEditComponent implements OnInit, OnDestroy {
       { name: "Maestro", value: "Maestro" },
       { name: "UnionPay", value: "UnionPay" },
       { name: "RuPay", value: "RuPay" },
-      { name: i18nService.t("cardBrandMir"), value: "Mir" },
       { name: i18nService.t("other"), value: "Other" },
     ];
     this.cardExpMonthOptions = [
@@ -201,8 +202,8 @@ export class AddEditComponent implements OnInit, OnDestroy {
           this.ownershipOptions.push({ name: o.name, value: o.id });
         }
       });
-    if (!this.allowPersonal) {
-      this.organizationId = this.ownershipOptions[0].value;
+    if (!this.allowPersonal && this.organizationId == undefined) {
+      this.organizationId = this.defaultOwnerId;
     }
   }
 
@@ -220,12 +221,7 @@ export class AddEditComponent implements OnInit, OnDestroy {
       this.title = this.i18nService.t("addItem");
     }
 
-    const addEditCipherInfo: any = await this.stateService.getAddEditCipherInfo();
-    if (addEditCipherInfo != null) {
-      this.cipher = addEditCipherInfo.cipher;
-      this.collectionIds = addEditCipherInfo.collectionIds;
-    }
-    await this.stateService.setAddEditCipherInfo(null);
+    const loadedAddEditCipherInfo = await this.loadAddEditCipherInfo();
 
     if (this.cipher == null) {
       if (this.editMode) {
@@ -255,7 +251,7 @@ export class AddEditComponent implements OnInit, OnDestroy {
       }
     }
 
-    if (this.cipher != null && (!this.editMode || addEditCipherInfo != null || this.cloneMode)) {
+    if (this.cipher != null && (!this.editMode || loadedAddEditCipherInfo || this.cloneMode)) {
       await this.organizationChanged();
       if (
         this.collectionIds != null &&
@@ -618,4 +614,27 @@ export class AddEditComponent implements OnInit, OnDestroy {
   protected restoreCipher() {
     return this.cipherService.restoreWithServer(this.cipher.id);
   }
+
+  get defaultOwnerId(): string | null {
+    return this.ownershipOptions[0].value;
+  }
+
+  async loadAddEditCipherInfo(): Promise<boolean> {
+    const addEditCipherInfo: any = await this.stateService.getAddEditCipherInfo();
+    const loadedSavedInfo = addEditCipherInfo != null;
+
+    if (loadedSavedInfo) {
+      this.cipher = addEditCipherInfo.cipher;
+      this.collectionIds = addEditCipherInfo.collectionIds;
+
+      if (!this.editMode && !this.allowPersonal && this.cipher.organizationId == null) {
+        // This is a new cipher and personal ownership isn't allowed, so we need to set the default owner
+        this.cipher.organizationId = this.defaultOwnerId;
+      }
+    }
+
+    await this.stateService.setAddEditCipherInfo(null);
+
+    return loadedSavedInfo;
+  }
 }

libs/angular/src/vault/components/icon.component.ts

@@ -20,7 +20,6 @@ const cardIcons: Record<string, string> = {
   Maestro: "card-maestro",
   UnionPay: "card-union-pay",
   RuPay: "card-ru-pay",
-  Mir: "card-mir",
 };
 
 @Component({

libs/angular/src/vault/components/vault-items.component.ts

@@ -1,7 +1,7 @@
 import { Directive, EventEmitter, Input, Output } from "@angular/core";
 
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 @Directive()

libs/angular/src/vault/components/view.component.ts

@@ -434,6 +434,7 @@ export class ViewComponent implements OnDestroy, OnInit {
   private cleanUp() {
     this.totpCode = null;
     this.cipher = null;
+    this.folder = null;
     this.showPassword = false;
     this.showCardNumber = false;
     this.showCardCode = false;

libs/angular/src/vault/vault-filter/components/collection-filter.component.ts

@@ -1,7 +1,7 @@
 import { Directive, EventEmitter, Input, Output } from "@angular/core";
 
+import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
 import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node";
-import { CollectionView } from "@bitwarden/common/models/view/collection.view";
 
 import { DynamicTreeNode } from "../models/dynamic-tree-node.model";
 import { TopLevelTreeNode } from "../models/top-level-tree-node.model";

libs/angular/src/vault/vault-filter/components/organization-filter.component.ts

@@ -1,6 +1,6 @@
 import { Directive, EventEmitter, Input, Output } from "@angular/core";
 
-import { Organization } from "@bitwarden/common/models/domain/organization";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node";
 
 import { DisplayMode } from "../models/display-mode";

libs/angular/src/vault/vault-filter/components/vault-filter.component.ts

@@ -1,9 +1,9 @@
 import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
 import { firstValueFrom, Observable } from "rxjs";
 
-import { Organization } from "@bitwarden/common/models/domain/organization";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
 import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node";
-import { CollectionView } from "@bitwarden/common/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
 import { DeprecatedVaultFilterService } from "../../abstractions/deprecated-vault-filter.service";

libs/angular/src/vault/vault-filter/services/vault-filter.service.ts

@@ -1,18 +1,18 @@
 import { Injectable } from "@angular/core";
 import { firstValueFrom, from, mergeMap, Observable } from "rxjs";
 
-import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
+import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
 import {
   isNotProviderUser,
   OrganizationService,
-} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
 import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils";
-import { Organization } from "@bitwarden/common/models/domain/organization";
 import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
-import { CollectionView } from "@bitwarden/common/models/view/collection.view";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
@@ -55,17 +55,19 @@ export class VaultFilterService implements DeprecatedVaultFilterServiceAbstracti
   buildNestedFolders(organizationId?: string): Observable<DynamicTreeNode<FolderView>> {
     const transformation = async (storedFolders: FolderView[]) => {
       let folders: FolderView[];
-      if (organizationId != null) {
+
+      // If no org or "My Vault" is selected, show all folders
+      if (organizationId == null || organizationId == "MyVault") {
+        folders = storedFolders;
+      } else {
+        // Otherwise, show only folders that have ciphers from the selected org and the "no folder" folder
         const ciphers = await this.cipherService.getAllDecrypted();
         const orgCiphers = ciphers.filter((c) => c.organizationId == organizationId);
         folders = storedFolders.filter(
-          (f) =>
-            orgCiphers.filter((oc) => oc.folderId == f.id).length > 0 ||
-            ciphers.filter((c) => c.folderId == f.id).length < 1
+          (f) => orgCiphers.some((oc) => oc.folderId == f.id) || f.id == null
         );
-      } else {
-        folders = storedFolders;
       }
+
       const nestedFolders = await this.getAllFoldersNested(folders);
       return new DynamicTreeNode<FolderView>({
         fullList: folders,