From 804e706fdf83f7c7ec7f8b6c641fd5f08b1bf2b9 Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Fri, 4 Oct 2024 15:59:35 +0100
Subject: [PATCH 1/8] Update AccountService to include a method for setting the
 managedByOrganizationId

---
 libs/common/src/auth/abstractions/account.service.ts  | 10 ++++++++++
 libs/common/src/auth/services/account.service.ts      |  7 +++++++
 libs/common/src/platform/sync/default-sync.service.ts |  4 ++++
 3 files changed, 21 insertions(+)

diff --git a/libs/common/src/auth/abstractions/account.service.ts b/libs/common/src/auth/abstractions/account.service.ts
index 849abc65f66..a77bbd96803 100644
--- a/libs/common/src/auth/abstractions/account.service.ts
+++ b/libs/common/src/auth/abstractions/account.service.ts
@@ -10,6 +10,7 @@ export type AccountInfo = {
   email: string;
   emailVerified: boolean;
   name: string | undefined;
+  managedByOrganizationId?: string | null;
 };
 
 export function accountInfoEqual(a: AccountInfo, b: AccountInfo) {
@@ -68,6 +69,15 @@ export abstract class AccountService {
    * @param emailVerified
    */
   abstract setAccountEmailVerified(userId: UserId, emailVerified: boolean): Promise<void>;
+  /**
+   * updates the `accounts$` observable with the new ID of the organization the account is managed by.
+   * @param userId
+   * @param managedByOrganizationId
+   */
+  abstract setAccountManagedByOrganizationId(
+    userId: UserId,
+    managedByOrganizationId?: string | null,
+  ): Promise<void>;
   /**
    * Updates the `activeAccount$` observable with the new active account.
    * @param userId
diff --git a/libs/common/src/auth/services/account.service.ts b/libs/common/src/auth/services/account.service.ts
index dceec2cbf13..19e37b8f269 100644
--- a/libs/common/src/auth/services/account.service.ts
+++ b/libs/common/src/auth/services/account.service.ts
@@ -120,6 +120,13 @@ export class AccountServiceImplementation implements InternalAccountService {
     await this.setAccountInfo(userId, { emailVerified });
   }
 
+  async setAccountManagedByOrganizationId(
+    userId: UserId,
+    managedByOrganizationId?: string | null,
+  ): Promise<void> {
+    await this.setAccountInfo(userId, { managedByOrganizationId });
+  }
+
   async clean(userId: UserId) {
     await this.setAccountInfo(userId, LOGGED_OUT_INFO);
     await this.removeAccountActivity(userId);
diff --git a/libs/common/src/platform/sync/default-sync.service.ts b/libs/common/src/platform/sync/default-sync.service.ts
index 322687ce6a6..fe85ab42b27 100644
--- a/libs/common/src/platform/sync/default-sync.service.ts
+++ b/libs/common/src/platform/sync/default-sync.service.ts
@@ -186,6 +186,10 @@ export class DefaultSyncService extends CoreSyncService {
     await this.avatarService.setSyncAvatarColor(response.id, response.avatarColor);
     await this.tokenService.setSecurityStamp(response.securityStamp, response.id);
     await this.accountService.setAccountEmailVerified(response.id, response.emailVerified);
+    await this.accountService.setAccountManagedByOrganizationId(
+      response.id,
+      response.managedByOrganizationId,
+    );
 
     await this.billingAccountProfileStateService.setHasPremium(
       response.premiumPersonally,

From ebfcf3a9ca8baac923183c4d6702c9195d99a623 Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Fri, 4 Oct 2024 16:00:09 +0100
Subject: [PATCH 2/8] Update AccountComponent to conditionally show the
 purgeVault button based on a feature flag and if the user is managed by an
 organization

---
 .../settings/account/account.component.html   |  8 +++++++-
 .../settings/account/account.component.ts     | 19 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/app/auth/settings/account/account.component.html b/apps/web/src/app/auth/settings/account/account.component.html
index c1764693717..71508f7ae97 100644
--- a/apps/web/src/app/auth/settings/account/account.component.html
+++ b/apps/web/src/app/auth/settings/account/account.component.html
@@ -12,7 +12,13 @@ <h1 bitTypography="h1">{{ "changeEmail" | i18n }}</h1>
     <button type="button" bitButton buttonType="danger" (click)="deauthorizeSessions()">
       {{ "deauthorizeSessions" | i18n }}
     </button>
-    <button type="button" bitButton buttonType="danger" [bitAction]="purgeVault">
+    <button
+      *ngIf="showPurgeVault$ | async"
+      type="button"
+      bitButton
+      buttonType="danger"
+      [bitAction]="purgeVault"
+    >
       {{ "purgeVault" | i18n }}
     </button>
     <button type="button" bitButton buttonType="danger" [bitAction]="deleteAccount">
diff --git a/apps/web/src/app/auth/settings/account/account.component.ts b/apps/web/src/app/auth/settings/account/account.component.ts
index 6ee76623740..03150398e9d 100644
--- a/apps/web/src/app/auth/settings/account/account.component.ts
+++ b/apps/web/src/app/auth/settings/account/account.component.ts
@@ -1,8 +1,11 @@
 import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
-import { lastValueFrom } from "rxjs";
+import { lastValueFrom, map, Observable, of, switchMap } from "rxjs";
 
 import { ModalService } from "@bitwarden/angular/services/modal.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { DialogService } from "@bitwarden/components";
 
 import { PurgeVaultComponent } from "../../../vault/settings/purge-vault.component";
@@ -19,15 +22,29 @@ export class AccountComponent implements OnInit {
   deauthModalRef: ViewContainerRef;
 
   showChangeEmail = true;
+  showPurgeVault$: Observable<boolean>;
 
   constructor(
     private modalService: ModalService,
     private dialogService: DialogService,
     private userVerificationService: UserVerificationService,
+    private accountService: AccountService,
+    private configService: ConfigService,
   ) {}
 
   async ngOnInit() {
     this.showChangeEmail = await this.userVerificationService.hasMasterPassword();
+    this.showPurgeVault$ = this.configService
+      .getFeatureFlag$(FeatureFlag.AccountDeprovisioning)
+      .pipe(
+        switchMap((isAccountDeprovisioningEnabled) =>
+          isAccountDeprovisioningEnabled
+            ? this.accountService.activeAccount$.pipe(
+                map((account) => account?.managedByOrganizationId === null),
+              )
+            : of(true),
+        ),
+      );
   }
 
   async deauthorizeSessions() {

From d01119fbd1f70fda754eb4f399e005d3401d8acc Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Mon, 7 Oct 2024 10:47:45 +0100
Subject: [PATCH 3/8] Add missing method to FakeAccountService

---
 libs/common/spec/fake-account-service.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libs/common/spec/fake-account-service.ts b/libs/common/spec/fake-account-service.ts
index 649a158d757..099da9f3660 100644
--- a/libs/common/spec/fake-account-service.ts
+++ b/libs/common/spec/fake-account-service.ts
@@ -91,6 +91,13 @@ export class FakeAccountService implements AccountService {
     await this.mock.setAccountEmailVerified(userId, emailVerified);
   }
 
+  async setAccountManagedByOrganizationId(
+    userId: UserId,
+    managedByOrganizationId?: string | null,
+  ): Promise<void> {
+    await this.mock.setAccountManagedByOrganizationId(userId, managedByOrganizationId);
+  }
+
   async switchAccount(userId: UserId): Promise<void> {
     const next =
       userId == null ? null : { id: userId, ...this.accountsSubject["_buffer"]?.[0]?.[userId] };

From 077d8c3a656aedc72cf02131cf3395994341297a Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Tue, 8 Oct 2024 18:44:36 +0100
Subject: [PATCH 4/8] Remove the setAccountManagedByOrganizationId method from
 the AccountService abstract class.

---
 libs/common/spec/fake-account-service.ts              |  7 -------
 libs/common/src/auth/abstractions/account.service.ts  | 10 ----------
 libs/common/src/auth/services/account.service.ts      |  7 -------
 libs/common/src/models/response/profile.response.ts   |  2 --
 libs/common/src/platform/sync/default-sync.service.ts |  4 ----
 5 files changed, 30 deletions(-)

diff --git a/libs/common/spec/fake-account-service.ts b/libs/common/spec/fake-account-service.ts
index 099da9f3660..649a158d757 100644
--- a/libs/common/spec/fake-account-service.ts
+++ b/libs/common/spec/fake-account-service.ts
@@ -91,13 +91,6 @@ export class FakeAccountService implements AccountService {
     await this.mock.setAccountEmailVerified(userId, emailVerified);
   }
 
-  async setAccountManagedByOrganizationId(
-    userId: UserId,
-    managedByOrganizationId?: string | null,
-  ): Promise<void> {
-    await this.mock.setAccountManagedByOrganizationId(userId, managedByOrganizationId);
-  }
-
   async switchAccount(userId: UserId): Promise<void> {
     const next =
       userId == null ? null : { id: userId, ...this.accountsSubject["_buffer"]?.[0]?.[userId] };
diff --git a/libs/common/src/auth/abstractions/account.service.ts b/libs/common/src/auth/abstractions/account.service.ts
index a77bbd96803..849abc65f66 100644
--- a/libs/common/src/auth/abstractions/account.service.ts
+++ b/libs/common/src/auth/abstractions/account.service.ts
@@ -10,7 +10,6 @@ export type AccountInfo = {
   email: string;
   emailVerified: boolean;
   name: string | undefined;
-  managedByOrganizationId?: string | null;
 };
 
 export function accountInfoEqual(a: AccountInfo, b: AccountInfo) {
@@ -69,15 +68,6 @@ export abstract class AccountService {
    * @param emailVerified
    */
   abstract setAccountEmailVerified(userId: UserId, emailVerified: boolean): Promise<void>;
-  /**
-   * updates the `accounts$` observable with the new ID of the organization the account is managed by.
-   * @param userId
-   * @param managedByOrganizationId
-   */
-  abstract setAccountManagedByOrganizationId(
-    userId: UserId,
-    managedByOrganizationId?: string | null,
-  ): Promise<void>;
   /**
    * Updates the `activeAccount$` observable with the new active account.
    * @param userId
diff --git a/libs/common/src/auth/services/account.service.ts b/libs/common/src/auth/services/account.service.ts
index 19e37b8f269..dceec2cbf13 100644
--- a/libs/common/src/auth/services/account.service.ts
+++ b/libs/common/src/auth/services/account.service.ts
@@ -120,13 +120,6 @@ export class AccountServiceImplementation implements InternalAccountService {
     await this.setAccountInfo(userId, { emailVerified });
   }
 
-  async setAccountManagedByOrganizationId(
-    userId: UserId,
-    managedByOrganizationId?: string | null,
-  ): Promise<void> {
-    await this.setAccountInfo(userId, { managedByOrganizationId });
-  }
-
   async clean(userId: UserId) {
     await this.setAccountInfo(userId, LOGGED_OUT_INFO);
     await this.removeAccountActivity(userId);
diff --git a/libs/common/src/models/response/profile.response.ts b/libs/common/src/models/response/profile.response.ts
index 24aeb11cdbb..6b6555fc566 100644
--- a/libs/common/src/models/response/profile.response.ts
+++ b/libs/common/src/models/response/profile.response.ts
@@ -21,7 +21,6 @@ export class ProfileResponse extends BaseResponse {
   securityStamp: string;
   forcePasswordReset: boolean;
   usesKeyConnector: boolean;
-  managedByOrganizationId?: string | null;
   organizations: ProfileOrganizationResponse[] = [];
   providers: ProfileProviderResponse[] = [];
   providerOrganizations: ProfileProviderOrganizationResponse[] = [];
@@ -43,7 +42,6 @@ export class ProfileResponse extends BaseResponse {
     this.securityStamp = this.getResponseProperty("SecurityStamp");
     this.forcePasswordReset = this.getResponseProperty("ForcePasswordReset") ?? false;
     this.usesKeyConnector = this.getResponseProperty("UsesKeyConnector") ?? false;
-    this.managedByOrganizationId = this.getResponseProperty("ManagedByOrganizationId");
 
     const organizations = this.getResponseProperty("Organizations");
     if (organizations != null) {
diff --git a/libs/common/src/platform/sync/default-sync.service.ts b/libs/common/src/platform/sync/default-sync.service.ts
index fe85ab42b27..322687ce6a6 100644
--- a/libs/common/src/platform/sync/default-sync.service.ts
+++ b/libs/common/src/platform/sync/default-sync.service.ts
@@ -186,10 +186,6 @@ export class DefaultSyncService extends CoreSyncService {
     await this.avatarService.setSyncAvatarColor(response.id, response.avatarColor);
     await this.tokenService.setSecurityStamp(response.securityStamp, response.id);
     await this.accountService.setAccountEmailVerified(response.id, response.emailVerified);
-    await this.accountService.setAccountManagedByOrganizationId(
-      response.id,
-      response.managedByOrganizationId,
-    );
 
     await this.billingAccountProfileStateService.setHasPremium(
       response.premiumPersonally,

From 3a02b677a803e68947c4b96a8ec5f2c71f571d65 Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Tue, 8 Oct 2024 18:45:24 +0100
Subject: [PATCH 5/8] Refactor AccountComponent to use OrganizationService to
 check for managing organization

---
 .../src/app/auth/settings/account/account.component.ts    | 8 ++++----
 .../src/admin-console/models/data/organization.data.ts    | 2 ++
 .../src/admin-console/models/domain/organization.ts       | 7 +++++++
 .../models/response/profile-organization.response.ts      | 2 ++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/app/auth/settings/account/account.component.ts b/apps/web/src/app/auth/settings/account/account.component.ts
index 03150398e9d..c231a0fe022 100644
--- a/apps/web/src/app/auth/settings/account/account.component.ts
+++ b/apps/web/src/app/auth/settings/account/account.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
 import { lastValueFrom, map, Observable, of, switchMap } from "rxjs";
 
 import { ModalService } from "@bitwarden/angular/services/modal.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
@@ -28,8 +28,8 @@ export class AccountComponent implements OnInit {
     private modalService: ModalService,
     private dialogService: DialogService,
     private userVerificationService: UserVerificationService,
-    private accountService: AccountService,
     private configService: ConfigService,
+    private organizationService: OrganizationService,
   ) {}
 
   async ngOnInit() {
@@ -39,8 +39,8 @@ export class AccountComponent implements OnInit {
       .pipe(
         switchMap((isAccountDeprovisioningEnabled) =>
           isAccountDeprovisioningEnabled
-            ? this.accountService.activeAccount$.pipe(
-                map((account) => account?.managedByOrganizationId === null),
+            ? this.organizationService.organizations$.pipe(
+                map((organizations) => !organizations.some((o) => o.managesActiveUser === true)),
               )
             : of(true),
         ),
diff --git a/libs/common/src/admin-console/models/data/organization.data.ts b/libs/common/src/admin-console/models/data/organization.data.ts
index 77f7908caf5..2eec322b336 100644
--- a/libs/common/src/admin-console/models/data/organization.data.ts
+++ b/libs/common/src/admin-console/models/data/organization.data.ts
@@ -54,6 +54,7 @@ export class OrganizationData {
   accessSecretsManager: boolean;
   limitCollectionCreationDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
+  managesActiveUser?: boolean | null;
 
   constructor(
     response?: ProfileOrganizationResponse,
@@ -112,6 +113,7 @@ export class OrganizationData {
     this.accessSecretsManager = response.accessSecretsManager;
     this.limitCollectionCreationDeletion = response.limitCollectionCreationDeletion;
     this.allowAdminAccessToAllCollectionItems = response.allowAdminAccessToAllCollectionItems;
+    this.managesActiveUser = response.managesActiveUser;
 
     this.isMember = options.isMember;
     this.isProviderUser = options.isProviderUser;
diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts
index 8c28bcb4935..f8df58ea8e0 100644
--- a/libs/common/src/admin-console/models/domain/organization.ts
+++ b/libs/common/src/admin-console/models/domain/organization.ts
@@ -73,6 +73,12 @@ export class Organization {
    * Refers to the ability for an owner/admin to access all collection items, regardless of assigned collections
    */
   allowAdminAccessToAllCollectionItems: boolean;
+  /**
+   * Indicates if this organization manages the active user.
+   * A user is considered managed by an organization if their email domain
+   * matches one of the verified domains of that organization, and the user is a member of it.
+   */
+  managesActiveUser?: boolean | null;
 
   constructor(obj?: OrganizationData) {
     if (obj == null) {
@@ -127,6 +133,7 @@ export class Organization {
     this.accessSecretsManager = obj.accessSecretsManager;
     this.limitCollectionCreationDeletion = obj.limitCollectionCreationDeletion;
     this.allowAdminAccessToAllCollectionItems = obj.allowAdminAccessToAllCollectionItems;
+    this.managesActiveUser = obj.managesActiveUser;
   }
 
   get canAccess() {
diff --git a/libs/common/src/admin-console/models/response/profile-organization.response.ts b/libs/common/src/admin-console/models/response/profile-organization.response.ts
index 693a7db4eb3..9a1a00491b2 100644
--- a/libs/common/src/admin-console/models/response/profile-organization.response.ts
+++ b/libs/common/src/admin-console/models/response/profile-organization.response.ts
@@ -51,6 +51,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
   accessSecretsManager: boolean;
   limitCollectionCreationDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
+  managesActiveUser?: boolean | null;
 
   constructor(response: any) {
     super(response);
@@ -115,5 +116,6 @@ export class ProfileOrganizationResponse extends BaseResponse {
     this.allowAdminAccessToAllCollectionItems = this.getResponseProperty(
       "AllowAdminAccessToAllCollectionItems",
     );
+    this.managesActiveUser = this.getResponseProperty("ManagesActiveUser") ?? null;
   }
 }

From 5d3689cf92f5f266619afae2a4440f63447b1544 Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Wed, 9 Oct 2024 16:25:29 +0100
Subject: [PATCH 6/8] Rename managesActiveUser to userIsManagedByOrganization

---
 apps/web/src/app/auth/settings/account/account.component.ts | 5 ++++-
 .../src/admin-console/models/data/organization.data.ts      | 4 ++--
 libs/common/src/admin-console/models/domain/organization.ts | 6 +++---
 .../models/response/profile-organization.response.ts        | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/web/src/app/auth/settings/account/account.component.ts b/apps/web/src/app/auth/settings/account/account.component.ts
index c231a0fe022..dd8dc881f6e 100644
--- a/apps/web/src/app/auth/settings/account/account.component.ts
+++ b/apps/web/src/app/auth/settings/account/account.component.ts
@@ -40,7 +40,10 @@ export class AccountComponent implements OnInit {
         switchMap((isAccountDeprovisioningEnabled) =>
           isAccountDeprovisioningEnabled
             ? this.organizationService.organizations$.pipe(
-                map((organizations) => !organizations.some((o) => o.managesActiveUser === true)),
+                map(
+                  (organizations) =>
+                    !organizations.some((o) => o.userIsManagedByOrganization === true),
+                ),
               )
             : of(true),
         ),
diff --git a/libs/common/src/admin-console/models/data/organization.data.ts b/libs/common/src/admin-console/models/data/organization.data.ts
index 2eec322b336..4923ff3b577 100644
--- a/libs/common/src/admin-console/models/data/organization.data.ts
+++ b/libs/common/src/admin-console/models/data/organization.data.ts
@@ -54,7 +54,7 @@ export class OrganizationData {
   accessSecretsManager: boolean;
   limitCollectionCreationDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
-  managesActiveUser?: boolean | null;
+  userIsManagedByOrganization?: boolean | null;
 
   constructor(
     response?: ProfileOrganizationResponse,
@@ -113,7 +113,7 @@ export class OrganizationData {
     this.accessSecretsManager = response.accessSecretsManager;
     this.limitCollectionCreationDeletion = response.limitCollectionCreationDeletion;
     this.allowAdminAccessToAllCollectionItems = response.allowAdminAccessToAllCollectionItems;
-    this.managesActiveUser = response.managesActiveUser;
+    this.userIsManagedByOrganization = response.userIsManagedByOrganization;
 
     this.isMember = options.isMember;
     this.isProviderUser = options.isProviderUser;
diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts
index f8df58ea8e0..91222f0049e 100644
--- a/libs/common/src/admin-console/models/domain/organization.ts
+++ b/libs/common/src/admin-console/models/domain/organization.ts
@@ -74,11 +74,11 @@ export class Organization {
    */
   allowAdminAccessToAllCollectionItems: boolean;
   /**
-   * Indicates if this organization manages the active user.
+   * Indicates if this organization manages the user.
    * A user is considered managed by an organization if their email domain
    * matches one of the verified domains of that organization, and the user is a member of it.
    */
-  managesActiveUser?: boolean | null;
+  userIsManagedByOrganization?: boolean | null;
 
   constructor(obj?: OrganizationData) {
     if (obj == null) {
@@ -133,7 +133,7 @@ export class Organization {
     this.accessSecretsManager = obj.accessSecretsManager;
     this.limitCollectionCreationDeletion = obj.limitCollectionCreationDeletion;
     this.allowAdminAccessToAllCollectionItems = obj.allowAdminAccessToAllCollectionItems;
-    this.managesActiveUser = obj.managesActiveUser;
+    this.userIsManagedByOrganization = obj.userIsManagedByOrganization;
   }
 
   get canAccess() {
diff --git a/libs/common/src/admin-console/models/response/profile-organization.response.ts b/libs/common/src/admin-console/models/response/profile-organization.response.ts
index 9a1a00491b2..27d32576fdb 100644
--- a/libs/common/src/admin-console/models/response/profile-organization.response.ts
+++ b/libs/common/src/admin-console/models/response/profile-organization.response.ts
@@ -51,7 +51,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
   accessSecretsManager: boolean;
   limitCollectionCreationDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
-  managesActiveUser?: boolean | null;
+  userIsManagedByOrganization?: boolean | null;
 
   constructor(response: any) {
     super(response);
@@ -116,6 +116,6 @@ export class ProfileOrganizationResponse extends BaseResponse {
     this.allowAdminAccessToAllCollectionItems = this.getResponseProperty(
       "AllowAdminAccessToAllCollectionItems",
     );
-    this.managesActiveUser = this.getResponseProperty("ManagesActiveUser") ?? null;
+    this.userIsManagedByOrganization = this.getResponseProperty("UserIsManagedByOrganization");
   }
 }

From 48d4efd0289f5f233e3e4d6f1133be1302f319f3 Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Fri, 11 Oct 2024 11:01:15 +0100
Subject: [PATCH 7/8] Refactor userIsManagedByOrganization property to be
 non-nullable in organization data and response models

---
 libs/common/src/admin-console/models/data/organization.data.ts  | 2 +-
 libs/common/src/admin-console/models/domain/organization.ts     | 2 +-
 .../models/response/profile-organization.response.ts            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/common/src/admin-console/models/data/organization.data.ts b/libs/common/src/admin-console/models/data/organization.data.ts
index 4923ff3b577..1eb68fe1e13 100644
--- a/libs/common/src/admin-console/models/data/organization.data.ts
+++ b/libs/common/src/admin-console/models/data/organization.data.ts
@@ -54,7 +54,7 @@ export class OrganizationData {
   accessSecretsManager: boolean;
   limitCollectionCreationDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
-  userIsManagedByOrganization?: boolean | null;
+  userIsManagedByOrganization: boolean;
 
   constructor(
     response?: ProfileOrganizationResponse,
diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts
index 91222f0049e..492ae9b96ea 100644
--- a/libs/common/src/admin-console/models/domain/organization.ts
+++ b/libs/common/src/admin-console/models/domain/organization.ts
@@ -78,7 +78,7 @@ export class Organization {
    * A user is considered managed by an organization if their email domain
    * matches one of the verified domains of that organization, and the user is a member of it.
    */
-  userIsManagedByOrganization?: boolean | null;
+  userIsManagedByOrganization: boolean;
 
   constructor(obj?: OrganizationData) {
     if (obj == null) {
diff --git a/libs/common/src/admin-console/models/response/profile-organization.response.ts b/libs/common/src/admin-console/models/response/profile-organization.response.ts
index 27d32576fdb..8e3bd18c4f4 100644
--- a/libs/common/src/admin-console/models/response/profile-organization.response.ts
+++ b/libs/common/src/admin-console/models/response/profile-organization.response.ts
@@ -51,7 +51,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
   accessSecretsManager: boolean;
   limitCollectionCreationDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
-  userIsManagedByOrganization?: boolean | null;
+  userIsManagedByOrganization: boolean;
 
   constructor(response: any) {
     super(response);

From 8d068794f566470d31db82cd6c62539b9958d122 Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Fri, 11 Oct 2024 11:18:29 +0100
Subject: [PATCH 8/8] Refactor organization.data.spec.ts to include
 non-nullable userIsManagedByOrganization property

---
 .../src/admin-console/models/data/organization.data.spec.ts      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/common/src/admin-console/models/data/organization.data.spec.ts b/libs/common/src/admin-console/models/data/organization.data.spec.ts
index 7b0d1ea2e99..7a941aa98c9 100644
--- a/libs/common/src/admin-console/models/data/organization.data.spec.ts
+++ b/libs/common/src/admin-console/models/data/organization.data.spec.ts
@@ -54,6 +54,7 @@ describe("ORGANIZATIONS state", () => {
         limitCollectionCreationDeletion: false,
         allowAdminAccessToAllCollectionItems: false,
         familySponsorshipLastSyncDate: new Date(),
+        userIsManagedByOrganization: false,
       },
     };
     const result = sut.deserializer(JSON.parse(JSON.stringify(expectedResult)));