[AC-2304] added User Status check to revoke-restore as well as remove…

… components (#8347)
bitwarden · Mar 15, 2024 · 65534a1 · 65534a1
1 parent 161fb1d
commit 65534a1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.../web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.ts b/.../web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.ts
@@ -2,6 +2,7 @@ import { Component, Input } from "@angular/core";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
+import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { BulkUserDetails } from "./bulk-status.component";
@@ -14,7 +15,9 @@ export class BulkRemoveComponent {
   @Input() organizationId: string;
   @Input() set users(value: BulkUserDetails[]) {
     this._users = value;
-    this.showNoMasterPasswordWarning = this._users.some((u) => u.hasMasterPassword === false);
+    this.showNoMasterPasswordWarning = this._users.some(
+      (u) => u.status > OrganizationUserStatusType.Invited && u.hasMasterPassword === false,
+    );
   }
 
   get users(): BulkUserDetails[] {

diff --git a/.../app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts b/.../app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts
@@ -2,6 +2,7 @@ import { DIALOG_DATA } from "@angular/cdk/dialog";
 import { Component, Inject } from "@angular/core";
 
 import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
+import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DialogService } from "@bitwarden/components";
 
@@ -37,7 +38,9 @@ export class BulkRestoreRevokeComponent {
     this.isRevoking = data.isRevoking;
     this.organizationId = data.organizationId;
     this.users = data.users;
-    this.showNoMasterPasswordWarning = this.users.some((u) => u.hasMasterPassword === false);
+    this.showNoMasterPasswordWarning = this.users.some(
+      (u) => u.status > OrganizationUserStatusType.Invited && u.hasMasterPassword === false,
+    );
   }
 
   get bulkTitle() {