Merge branch 'main' into pm-11505-delete-the-feature-flag-pm-5864-dol…

…lar-threshold
bitwarden · Nov 6, 2024 · 109817f · 109817f
2 parents 667ad68 + b877624
commit 109817f
Show file tree

Hide file tree

Showing 34 changed files with 103 additions and 159 deletions.
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
@@ -40,9 +40,9 @@
       ></bit-nav-item>
     </bit-nav-group>
     <bit-nav-item
-      *ngIf="isAccessIntelligenceFeatureEnabled"
-      [text]="'accessIntelligence' | i18n"
-      route="access-intelligence"
+      *ngIf="isRiskInsightsFeatureEnabled"
+      [text]="'riskInsights' | i18n"
+      route="risk-insights"
     ></bit-nav-item>
     <bit-nav-group
       icon="bwi-billing"

diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
@@ -51,7 +51,7 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
   showPaymentAndHistory$: Observable<boolean>;
   hideNewOrgButton$: Observable<boolean>;
   organizationIsUnmanaged$: Observable<boolean>;
-  isAccessIntelligenceFeatureEnabled = false;
+  isRiskInsightsFeatureEnabled = false;
 
   private _destroy = new Subject<void>();
 
@@ -71,7 +71,7 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
   async ngOnInit() {
     document.body.classList.remove("layout_frontend");
 
-    this.isAccessIntelligenceFeatureEnabled = await this.configService.getFeatureFlag(
+    this.isRiskInsightsFeatureEnabled = await this.configService.getFeatureFlag(
       FeatureFlag.AccessIntelligence,
     );
 

diff --git a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts
@@ -63,10 +63,10 @@ const routes: Routes = [
           ),
       },
       {
-        path: "access-intelligence",
+        path: "risk-insights",
         loadChildren: () =>
-          import("../../tools/access-intelligence/access-intelligence.module").then(
-            (m) => m.AccessIntelligenceModule,
+          import("../../tools/risk-insights/risk-insights.module").then(
+            (m) => m.RiskInsightsModule,
           ),
       },
       {

diff --git a/apps/web/src/app/tools/access-intelligence/access-intelligence.module.ts b/apps/web/src/app/tools/access-intelligence/access-intelligence.module.ts
diff --git a/apps/web/src/app/tools/access-intelligence/password-health-members.component.html b/apps/web/src/app/tools/access-intelligence/password-health-members.component.html
diff --git a/...elligence/all-applications.component.html → ...-insights/all-applications.component.html b/...elligence/all-applications.component.html → ...-insights/all-applications.component.html
diff --git a/...ntelligence/all-applications.component.ts → ...sk-insights/all-applications.component.ts b/...ntelligence/all-applications.component.ts → ...sk-insights/all-applications.component.ts
diff --git a/...ss-intelligence/application-table.mock.ts → ...s/risk-insights/application-table.mock.ts b/...ss-intelligence/application-table.mock.ts → ...s/risk-insights/application-table.mock.ts
diff --git a/...ence/critical-applications.component.html → ...ghts/critical-applications.component.html b/...ence/critical-applications.component.html → ...ghts/critical-applications.component.html
diff --git a/...igence/critical-applications.component.ts → ...sights/critical-applications.component.ts b/...igence/critical-applications.component.ts → ...sights/critical-applications.component.ts
@@ -12,8 +12,8 @@ import { HeaderModule } from "../../layouts/header/header.module";
 import { SharedModule } from "../../shared";
 import { PipesModule } from "../../vault/individual-vault/pipes/pipes.module";
 
-import { AccessIntelligenceTabType } from "./access-intelligence.component";
 import { applicationTableMockData } from "./application-table.mock";
+import { RiskInsightsTabType } from "./risk-insights.component";
 
 @Component({
   standalone: true,
@@ -49,8 +49,8 @@ export class CriticalApplicationsComponent implements OnInit {
   }
 
   goToAllAppsTab = async () => {
-    await this.router.navigate([`organizations/${this.organizationId}/access-intelligence`], {
-      queryParams: { tabIndex: AccessIntelligenceTabType.AllApps },
+    await this.router.navigate([`organizations/${this.organizationId}/risk-insights`], {
+      queryParams: { tabIndex: RiskInsightsTabType.AllApps },
       queryParamsHandling: "merge",
     });
   };

diff --git a/...nce/notified-members-table.component.html → ...hts/notified-members-table.component.html b/...nce/notified-members-table.component.html → ...hts/notified-members-table.component.html
diff --git a/...gence/notified-members-table.component.ts → ...ights/notified-members-table.component.ts b/...gence/notified-members-table.component.ts → ...ights/notified-members-table.component.ts
diff --git a/...assword-health-members-uri.component.html → ...assword-health-members-uri.component.html b/...assword-health-members-uri.component.html → ...assword-health-members-uri.component.html
diff --git a/...word-health-members-uri.component.spec.ts → ...word-health-members-uri.component.spec.ts b/...word-health-members-uri.component.spec.ts → ...word-health-members-uri.component.spec.ts
@@ -4,7 +4,7 @@ import { mock, MockProxy } from "jest-mock-extended";
 import { of } from "rxjs";
 
 // eslint-disable-next-line no-restricted-imports
-import { PasswordHealthService } from "@bitwarden/bit-common/tools/reports/access-intelligence";
+import { PasswordHealthService } from "@bitwarden/bit-common/tools/reports/risk-insights";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";

diff --git a/.../password-health-members-uri.component.ts → .../password-health-members-uri.component.ts b/.../password-health-members-uri.component.ts → .../password-health-members-uri.component.ts
@@ -6,7 +6,7 @@ import { map } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 // eslint-disable-next-line no-restricted-imports
-import { PasswordHealthService } from "@bitwarden/bit-common/tools/reports/access-intelligence";
+import { PasswordHealthService } from "@bitwarden/bit-common/tools/reports/risk-insights";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";

diff --git a/apps/web/src/app/tools/risk-insights/password-health-members.component.html b/apps/web/src/app/tools/risk-insights/password-health-members.component.html
@@ -0,0 +1,64 @@
+<p>{{ "passwordsReportDesc" | i18n }}</p>
+<div *ngIf="loading">
+  <i
+    class="bwi bwi-spinner bwi-spin tw-text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
+</div>
+<div class="tw-flex tw-flex-col" *ngIf="!loading && dataSource.data.length">
+  <bit-table [dataSource]="dataSource">
+    <ng-container header>
+      <tr bitRow>
+        <th bitCell></th>
+        <th bitCell bitSortable="name">{{ "name" | i18n }}</th>
+        <th bitCell class="tw-text-right">{{ "weakness" | i18n }}</th>
+        <th bitCell class="tw-text-right">{{ "timesReused" | i18n }}</th>
+        <th bitCell class="tw-text-right">{{ "timesExposed" | i18n }}</th>
+        <th bitCell class="tw-text-right">{{ "totalMembers" | i18n }}</th>
+      </tr>
+    </ng-container>
+    <ng-template body let-rows$>
+      <tr bitRow *ngFor="let r of rows$ | async; trackBy: trackByFunction">
+        <td bitCell>
+          <input
+            bitCheckbox
+            type="checkbox"
+            [checked]="selectedIds.has(r.id)"
+            (change)="onCheckboxChange(r.id, $event)"
+          />
+        </td>
+        <td bitCell>
+          <ng-container>
+            <span>{{ r.name }}</span>
+          </ng-container>
+          <br />
+          <small>{{ r.subTitle }}</small>
+        </td>
+        <td bitCell class="tw-text-right">
+          <span
+            bitBadge
+            *ngIf="passwordStrengthMap.has(r.id)"
+            [variant]="passwordStrengthMap.get(r.id)[1]"
+          >
+            {{ passwordStrengthMap.get(r.id)[0] | i18n }}
+          </span>
+        </td>
+        <td bitCell class="tw-text-right">
+          <span bitBadge *ngIf="passwordUseMap.has(r.login.password)" variant="warning">
+            {{ "reusedXTimes" | i18n: passwordUseMap.get(r.login.password) }}
+          </span>
+        </td>
+        <td bitCell class="tw-text-right">
+          <span bitBadge *ngIf="exposedPasswordMap.has(r.id)" variant="warning">
+            {{ "exposedXTimes" | i18n: exposedPasswordMap.get(r.id) }}
+          </span>
+        </td>
+        <td bitCell class="tw-text-right" data-testid="total-membership">
+          {{ totalMembersMap.get(r.id) || 0 }}
+        </td>
+      </tr>
+    </ng-template>
+  </bit-table>
+</div>
diff --git a/...ence/password-health-members.component.ts → ...ghts/password-health-members.component.ts b/...ence/password-health-members.component.ts → ...ghts/password-health-members.component.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute } from "@angular/router";
 import { debounceTime, map } from "rxjs";
 
 // eslint-disable-next-line no-restricted-imports
-import { PasswordHealthService } from "@bitwarden/bit-common/tools/reports/access-intelligence";
+import { PasswordHealthService } from "@bitwarden/bit-common/tools/reports/risk-insights";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";

diff --git a/...telligence/password-health.component.html → ...k-insights/password-health.component.html b/...telligence/password-health.component.html → ...k-insights/password-health.component.html
diff --git a/...ligence/password-health.component.spec.ts → ...nsights/password-health.component.spec.ts b/...ligence/password-health.component.spec.ts → ...nsights/password-health.component.spec.ts
@@ -4,7 +4,7 @@ import { mock } from "jest-mock-extended";
 import { of } from "rxjs";
 
 // eslint-disable-next-line no-restricted-imports
-import { PasswordHealthService } from "@bitwarden/bit-common/tools/reports/access-intelligence";
+import { PasswordHealthService } from "@bitwarden/bit-common/tools/reports/risk-insights";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";

diff --git a/...intelligence/password-health.component.ts → ...isk-insights/password-health.component.ts b/...intelligence/password-health.component.ts → ...isk-insights/password-health.component.ts
@@ -6,7 +6,7 @@ import { map } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 // eslint-disable-next-line no-restricted-imports
-import { PasswordHealthService } from "@bitwarden/bit-common/tools/reports/access-intelligence";
+import { PasswordHealthService } from "@bitwarden/bit-common/tools/reports/risk-insights";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";

diff --git a/...nce/access-intelligence-routing.module.ts → ...-insights/risk-insights-routing.module.ts b/...nce/access-intelligence-routing.module.ts → ...-insights/risk-insights-routing.module.ts
@@ -4,15 +4,15 @@ import { RouterModule, Routes } from "@angular/router";
 import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
-import { AccessIntelligenceComponent } from "./access-intelligence.component";
+import { RiskInsightsComponent } from "./risk-insights.component";
 
 const routes: Routes = [
   {
     path: "",
-    component: AccessIntelligenceComponent,
+    component: RiskInsightsComponent,
     canActivate: [canAccessFeature(FeatureFlag.AccessIntelligence)],
     data: {
-      titleId: "accessIntelligence",
+      titleId: "RiskInsights",
     },
   },
 ];
@@ -21,4 +21,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule],
 })
-export class AccessIntelligenceRoutingModule {}
+export class RiskInsightsRoutingModule {}
diff --git a/...igence/access-intelligence.component.html → ...isk-insights/risk-insights.component.html b/...igence/access-intelligence.component.html → ...isk-insights/risk-insights.component.html
@@ -1,4 +1,4 @@
-<div class="tw-mb-1 text-primary" bitTypography="body1">{{ "accessIntelligence" | i18n }}</div>
+<div class="tw-mb-1 text-primary" bitTypography="body1">{{ "riskInsights" | i18n }}</div>
 <h1 bitTypography="h1">{{ "passwordRisk" | i18n }}</h1>
 <div class="tw-text-muted">{{ "discoverAtRiskPasswords" | i18n }}</div>
 <div class="tw-bg-primary-100 tw-rounded-lg tw-w-full tw-px-8 tw-py-2 tw-my-4">

diff --git a/...lligence/access-intelligence.component.ts → .../risk-insights/risk-insights.component.ts b/...lligence/access-intelligence.component.ts → .../risk-insights/risk-insights.component.ts
@@ -15,15 +15,15 @@ import { PasswordHealthMembersURIComponent } from "./password-health-members-uri
 import { PasswordHealthMembersComponent } from "./password-health-members.component";
 import { PasswordHealthComponent } from "./password-health.component";
 
-export enum AccessIntelligenceTabType {
+export enum RiskInsightsTabType {
   AllApps = 0,
   CriticalApps = 1,
   NotifiedMembers = 2,
 }
 
 @Component({
   standalone: true,
-  templateUrl: "./access-intelligence.component.html",
+  templateUrl: "./risk-insights.component.html",
   imports: [
     AllApplicationsComponent,
     AsyncActionsModule,
@@ -39,8 +39,8 @@ export enum AccessIntelligenceTabType {
     TabsModule,
   ],
 })
-export class AccessIntelligenceComponent {
-  tabIndex: AccessIntelligenceTabType;
+export class RiskInsightsComponent {
+  tabIndex: RiskInsightsTabType;
   dataLastUpdated = new Date();
 
   apps: any[] = [];
@@ -70,7 +70,7 @@ export class AccessIntelligenceComponent {
     private router: Router,
   ) {
     route.queryParams.pipe(takeUntilDestroyed()).subscribe(({ tabIndex }) => {
-      this.tabIndex = !isNaN(tabIndex) ? tabIndex : AccessIntelligenceTabType.AllApps;
+      this.tabIndex = !isNaN(tabIndex) ? tabIndex : RiskInsightsTabType.AllApps;
     });
   }
 }
diff --git a/apps/web/src/app/tools/risk-insights/risk-insights.module.ts b/apps/web/src/app/tools/risk-insights/risk-insights.module.ts
@@ -0,0 +1,9 @@
+import { NgModule } from "@angular/core";
+
+import { RiskInsightsRoutingModule } from "./risk-insights-routing.module";
+import { RiskInsightsComponent } from "./risk-insights.component";
+
+@NgModule({
+  imports: [RiskInsightsComponent, RiskInsightsRoutingModule],
+})
+export class RiskInsightsModule {}
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
@@ -5,8 +5,8 @@
   "criticalApplications": {
     "message": "Critical applications"
   },
-  "accessIntelligence": {
-    "message": "Access Intelligence"
+  "riskInsights": {
+    "message": "Risk Insights"
   },
   "passwordRisk": {
     "message": "Password Risk"

diff --git a/...ools/reports/access-intelligence/index.ts → .../src/tools/reports/risk-insights/index.ts b/...ools/reports/access-intelligence/index.ts → .../src/tools/reports/risk-insights/index.ts
diff --git a/...esponse/member-cipher-details.response.ts → ...esponse/member-cipher-details.response.ts b/...esponse/member-cipher-details.response.ts → ...esponse/member-cipher-details.response.ts
diff --git a/...ess-intelligence/services/ciphers.mock.ts → ...ts/risk-insights/services/ciphers.mock.ts b/...ess-intelligence/services/ciphers.mock.ts → ...ts/risk-insights/services/ciphers.mock.ts
diff --git a/...rts/access-intelligence/services/index.ts → ...s/reports/risk-insights/services/index.ts b/...rts/access-intelligence/services/index.ts → ...s/reports/risk-insights/services/index.ts
diff --git a/...member-cipher-details-api.service.spec.ts → ...member-cipher-details-api.service.spec.ts b/...member-cipher-details-api.service.spec.ts → ...member-cipher-details-api.service.spec.ts
diff --git a/...ices/member-cipher-details-api.service.ts → ...ices/member-cipher-details-api.service.ts b/...ices/member-cipher-details-api.service.ts → ...ices/member-cipher-details-api.service.ts
diff --git a/...es/member-cipher-details-response.mock.ts → ...es/member-cipher-details-response.mock.ts b/...es/member-cipher-details-response.mock.ts → ...es/member-cipher-details-response.mock.ts
diff --git a/.../services/password-health.service.spec.ts → .../services/password-health.service.spec.ts b/.../services/password-health.service.spec.ts → .../services/password-health.service.spec.ts