Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-02-08 00:01:28 +01:00
Code Issues Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
--global 2025-01-24 17:00:52 -05:00
parent 23cbc06b1f
commit b6688e1929
16 changed files with 93 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts
View File

@ -1,13 +1,8 @@
import { NgModule } from "@angular/core";
import { CipherFormConfigService, DefaultCipherFormConfigService } from "@bitwarden/vault";
import { LooseComponentsModule } from "../../../shared";
import { SharedModule } from "../../../shared/shared.module";
import { ReportsSharedModule } from "../../../tools/reports";
import { RoutedVaultFilterBridgeService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
import { RoutedVaultFilterService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
import { OrganizationReportingRoutingModule } from "./organization-reporting-routing.module";
import { ReportsHomeComponent } from "./reports-home.component";
@ -20,14 +15,5 @@ import { ReportsHomeComponent } from "./reports-home.component";
LooseComponentsModule,
],
declarations: [ReportsHomeComponent],
providers: [
// {
// provide: CipherFormConfigService,
// useClass: AdminConsoleCipherFormConfigService,
// },
// AdminConsoleCipherFormConfigService,
// RoutedVaultFilterService,
// RoutedVaultFilterBridgeService,
],
})
export class OrganizationReportingModule {}

15
apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts
View File

@ -19,11 +19,22 @@ import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vau
// eslint-disable-next-line no-restricted-imports
import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../../../tools/reports/pages/inactive-two-factor-report.component";
import { RoutedVaultFilterBridgeService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
import { RoutedVaultFilterService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
@Component({
selector: "app-inactive-two-factor-report",
templateUrl: "../../../tools/reports/pages/inactive-two-factor-report.component.html",
providers: [
{
provide: CipherFormConfigService,
useClass: AdminConsoleCipherFormConfigService,
},
AdminConsoleCipherFormConfigService,
RoutedVaultFilterService,
RoutedVaultFilterBridgeService,
],
})
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
export class InactiveTwoFactorReportComponent
@ -41,7 +52,7 @@ export class InactiveTwoFactorReportComponent
i18nService: I18nService,
syncService: SyncService,
cipherFormConfigService: CipherFormConfigService,
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService,
) {
super(
cipherService,
@ -53,7 +64,7 @@ export class InactiveTwoFactorReportComponent
i18nService,
syncService,
cipherFormConfigService,
adminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService,
);
}

13
apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts
View File

@ -19,11 +19,22 @@ import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vau
// eslint-disable-next-line no-restricted-imports
import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent } from "../../../tools/reports/pages/reused-passwords-report.component";
import { RoutedVaultFilterBridgeService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
import { RoutedVaultFilterService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
@Component({
selector: "app-reused-passwords-report",
templateUrl: "../../../tools/reports/pages/reused-passwords-report.component.html",
providers: [
{
provide: CipherFormConfigService,
useClass: AdminConsoleCipherFormConfigService,
},
AdminConsoleCipherFormConfigService,
RoutedVaultFilterService,
RoutedVaultFilterBridgeService,
],
})
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
export class ReusedPasswordsReportComponent
@ -42,7 +53,7 @@ export class ReusedPasswordsReportComponent
i18nService: I18nService,
syncService: SyncService,
cipherFormConfigService: CipherFormConfigService,
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService,
) {
super(
cipherService,

15
apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts
View File

@ -19,11 +19,22 @@ import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vau
// eslint-disable-next-line no-restricted-imports
import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../../../tools/reports/pages/unsecured-websites-report.component";
import { RoutedVaultFilterBridgeService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
import { RoutedVaultFilterService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
@Component({
selector: "app-unsecured-websites-report",
templateUrl: "../../../tools/reports/pages/unsecured-websites-report.component.html",
providers: [
{
provide: CipherFormConfigService,
useClass: AdminConsoleCipherFormConfigService,
},
AdminConsoleCipherFormConfigService,
RoutedVaultFilterService,
RoutedVaultFilterBridgeService,
],
})
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
export class UnsecuredWebsitesReportComponent
@ -41,7 +52,7 @@ export class UnsecuredWebsitesReportComponent
syncService: SyncService,
collectionService: CollectionService,
cipherFormConfigService: CipherFormConfigService,
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService,
) {
super(
cipherService,
@ -53,7 +64,7 @@ export class UnsecuredWebsitesReportComponent
syncService,
collectionService,
cipherFormConfigService,
adminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService,
);
}

15
apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts
View File

@ -20,11 +20,22 @@ import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vau
// eslint-disable-next-line no-restricted-imports
import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../../../tools/reports/pages/weak-passwords-report.component";
import { RoutedVaultFilterBridgeService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
import { RoutedVaultFilterService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
@Component({
selector: "app-weak-passwords-report",
templateUrl: "../../../tools/reports/pages/weak-passwords-report.component.html",
providers: [
{
provide: CipherFormConfigService,
useClass: AdminConsoleCipherFormConfigService,
},
AdminConsoleCipherFormConfigService,
RoutedVaultFilterService,
RoutedVaultFilterBridgeService,
],
})
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
export class WeakPasswordsReportComponent
@ -44,7 +55,7 @@ export class WeakPasswordsReportComponent
syncService: SyncService,
cipherFormConfigService: CipherFormConfigService,
protected accountService: AccountService,
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService,
) {
super(
cipherService,
@ -56,7 +67,7 @@ export class WeakPasswordsReportComponent
i18nService,
syncService,
cipherFormConfigService,
adminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService,
);
}

3
apps/web/src/app/tools/reports/pages/cipher-report.component.ts
View File

@ -147,8 +147,6 @@ export class CipherReportComponent implements OnDestroy {
return;
}
console.error("here");
if (this.organization) {
const adminCipherFormConfig = await this.adminConsoleCipherFormConfigService.buildConfig(
"edit",
@ -156,7 +154,6 @@ export class CipherReportComponent implements OnDestroy {
cipher.type,
);
console.error("failed");
await this.openVaultItemDialog("view", adminCipherFormConfig);
} else {
const cipherFormConfig = await this.cipherFormConfigService.buildConfig(

2
apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.ts
View File

@ -11,8 +11,6 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { DialogService } from "@bitwarden/components";
import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
import { RoutedVaultFilterBridgeService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
import { RoutedVaultFilterService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
import { CipherReportComponent } from "./cipher-report.component";

6
apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.ts
View File

@ -14,9 +14,10 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { DialogService } from "@bitwarden/components";
import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
import { CipherReportComponent } from "./cipher-report.component";
import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
import { CipherReportComponent } from "./cipher-report.component";
@Component({
selector: "app-inactive-two-factor-report",
templateUrl: "inactive-two-factor-report.component.html",
@ -36,8 +37,7 @@ export class InactiveTwoFactorReportComponent extends CipherReportComponent impl
i18nService: I18nService,
syncService: SyncService,
cipherFormConfigService: CipherFormConfigService,
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService,
) {
super(
cipherService,

6
apps/web/src/app/tools/reports/pages/reused-passwords-report.component.ts
View File

@ -12,9 +12,10 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { DialogService } from "@bitwarden/components";
import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
import { CipherReportComponent } from "./cipher-report.component";
import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
import { CipherReportComponent } from "./cipher-report.component";
@Component({
selector: "app-reused-passwords-report",
templateUrl: "reused-passwords-report.component.html",
@ -32,8 +33,7 @@ export class ReusedPasswordsReportComponent extends CipherReportComponent implem
i18nService: I18nService,
syncService: SyncService,
cipherFormConfigService: CipherFormConfigService,
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService,
) {
super(
cipherService,

24
apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.spec.ts
View File

@ -16,6 +16,10 @@ import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.serv
import { DialogService } from "@bitwarden/components";
import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
import { RoutedVaultFilterService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
import { CipherReportComponent } from "./cipher-report.component";
import { cipherData } from "./reports-ciphers.mock";
import { UnsecuredWebsitesReportComponent } from "./unsecured-websites-report.component";
@ -26,15 +30,24 @@ describe("UnsecuredWebsitesReportComponent", () => {
let syncServiceMock: MockProxy<SyncService>;
let collectionService: MockProxy<CollectionService>;
let accountService: FakeAccountService;
let cipherReportComponentMock: MockProxy<CipherReportComponent>;
let cipherFormConfigServiceMock: MockProxy<CipherFormConfigService>;
let routedVaultFilterServiceMock: MockProxy<RoutedVaultFilterService>;
let adminConsoleCipherFormConfigServiceMock: MockProxy<AdminConsoleCipherFormConfigService>;
const userId = Utils.newGuid() as UserId;
beforeEach(() => {
let cipherFormConfigServiceMock: MockProxy<CipherFormConfigService>;
organizationService = mock<OrganizationService>();
organizationService.organizations$.mockReturnValue(of([]));
syncServiceMock = mock<SyncService>();
collectionService = mock<CollectionService>();
accountService = mockAccountServiceWith(userId);
cipherReportComponentMock = mock<CipherReportComponent>();
cipherFormConfigServiceMock = mock<CipherFormConfigService>();
routedVaultFilterServiceMock = mock<RoutedVaultFilterService>();
adminConsoleCipherFormConfigServiceMock = mock<AdminConsoleCipherFormConfigService>();
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
// eslint-disable-next-line @typescript-eslint/no-floating-promises
TestBed.configureTestingModule({
@ -76,6 +89,15 @@ describe("UnsecuredWebsitesReportComponent", () => {
provide: CipherFormConfigService,
useValue: cipherFormConfigServiceMock,
},
{
provide: CipherReportComponent,
useClass: cipherReportComponentMock,
},
{ provide: RoutedVaultFilterService, useValue: routedVaultFilterServiceMock },
{
provide: AdminConsoleCipherFormConfigService,
useClass: adminConsoleCipherFormConfigServiceMock, // Ensure this service is provided
},
],
schemas: [],
}).compileComponents();

5
apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.ts
View File

@ -11,9 +11,10 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { DialogService } from "@bitwarden/components";
import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
import { CipherReportComponent } from "./cipher-report.component";
import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
import { CipherReportComponent } from "./cipher-report.component";
@Component({
selector: "app-unsecured-websites-report",
templateUrl: "unsecured-websites-report.component.html",
@ -31,7 +32,7 @@ export class UnsecuredWebsitesReportComponent extends CipherReportComponent impl
syncService: SyncService,
private collectionService: CollectionService,
cipherFormConfigService: CipherFormConfigService,
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService,
) {
super(
cipherService,

9
apps/web/src/app/tools/reports/pages/weak-passwords-report.component.ts
View File

@ -11,12 +11,13 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
import { CipherType } from "@bitwarden/common/vault/enums";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { BadgeVariant , DialogService } from "@bitwarden/components";
import { BadgeVariant, DialogService } from "@bitwarden/components";
import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
import { CipherReportComponent } from "./cipher-report.component";
import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
import { CipherReportComponent } from "./cipher-report.component";
type ReportScore = { label: string; badgeVariant: BadgeVariant };
type ReportResult = CipherView & { score: number; reportValue: ReportScore };
@ -39,7 +40,7 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen
i18nService: I18nService,
syncService: SyncService,
cipherFormConfigService: CipherFormConfigService,
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService,
) {
super(
cipherService,
@ -50,7 +51,7 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen
i18nService,
syncService,
cipherFormConfigService,
adminConsoleCipherFormConfigService
adminConsoleCipherFormConfigService,
);
}

5
apps/web/src/app/tools/reports/reports.module.ts
View File

@ -18,8 +18,10 @@ import { WeakPasswordsReportComponent } from "./pages/weak-passwords-report.comp
import { ReportsLayoutComponent } from "./reports-layout.component";
import { ReportsRoutingModule } from "./reports-routing.module";
import { ReportsSharedModule } from "./shared";
import { AdminConsoleCipherFormConfigService } from "../../vault/org-vault/services/admin-console-cipher-form-config.service";
import { RoutedVaultFilterService } from "../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
import { RoutedVaultFilterBridgeService } from "../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
@NgModule({
imports: [
@ -47,7 +49,8 @@ import { RoutedVaultFilterService } from "../../vault/individual-vault/vault-fil
useClass: DefaultCipherFormConfigService,
},
RoutedVaultFilterService,
AdminConsoleCipherFormConfigService
AdminConsoleCipherFormConfigService,
RoutedVaultFilterBridgeService,
],
})
export class ReportsModule {}

1
apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service.ts
View File

@ -25,7 +25,6 @@ export class RoutedVaultFilterService implements OnDestroy {
filter$: Observable<RoutedVaultFilterModel>;
constructor(activatedRoute: ActivatedRoute) {
console.log("constructor for routed vault filter service {0} {1} ", activatedRoute.paramMap, activatedRoute.queryParamMap);
this.filter$ = combineLatest([activatedRoute.paramMap, activatedRoute.queryParamMap]).pipe(
map(([params, queryParams]) => {
const unsafeType = queryParams.get("type");

17
apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts
View File

@ -22,7 +22,6 @@ import {
CipherFormMode,
} from "../../../../../../../libs/vault/src/cipher-form/abstractions/cipher-form-config.service";
import { RoutedVaultFilterService } from "../../individual-vault/vault-filter/services/routed-vault-filter.service";
import { RoutedVaultFilterBridgeService } from "../../individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
/** Admin Console implementation of the `CipherFormConfigService`. */
@Injectable()
@ -34,18 +33,13 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ
private cipherService: CipherService = inject(CipherService);
private apiService: ApiService = inject(ApiService);
private accountService: AccountService = inject(AccountService);
private routedVaultFilterBridgeService: RoutedVaultFilterBridgeService = inject(RoutedVaultFilterBridgeService);
private allowPersonalOwnership$ = this.policyService
.policyAppliesToActiveUser$(PolicyType.PersonalOwnership)
.pipe(map((p) => !p));
private organizationId$ = this.routedVaultFilterService.filter$.pipe(
map((filter) => {
filter.organizationId
console.log("filter {0}", filter);
return filter.organizationId
}),
map((filter) => filter.organizationId),
filter((filter) => filter !== undefined),
);
@ -74,12 +68,6 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ
cipherId?: CipherId,
cipherType?: CipherType,
): Promise<CipherFormConfig> {
this.organization$.subscribe(value => console.log("1 organization$ emitted:", value));
this.allowPersonalOwnership$.subscribe(value => console.log("2 allowPersonalOwnership$ emitted:", value));
this.allOrganizations$.subscribe(value => console.log("3 allOrganizations$ emitted:", value));
this.allCollections$.subscribe(value => console.log("4 allCollections$ emitted:", value));
const [organization, allowPersonalOwnership, allOrganizations, allCollections] =
await firstValueFrom(
combineLatest([
@ -90,8 +78,6 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ
]),
);
console.log("Building config with mode:", mode, "cipherId:", cipherId, "cipherType:", cipherType);
// When cloning from within the Admin Console, all organizations should be available.
// Otherwise only the one in context should be
const organizations = mode === "clone" ? allOrganizations : [organization];
@ -99,7 +85,6 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ
// the policies are enabled for it.
const allowPersonalOwnershipOnlyForClone = mode === "clone" ? allowPersonalOwnership : false;
const cipher = await this.getCipher(cipherId, organization);
console.error("cipher");
return {
mode,
cipherType: cipher?.type ?? cipherType ?? CipherType.Login,

2
libs/admin-console/src/common/collections/services/default-collection-admin.service.ts
View File

@ -30,8 +30,6 @@ export class DefaultCollectionAdminService implements CollectionAdminService {
const collectionResponse =
await this.apiService.getManyCollectionsWithAccessDetails(organizationId);
console.log("COLLECTIONRESPONSE {0}", collectionResponse);
if (collectionResponse?.data == null || collectionResponse.data.length === 0) {
return [];
}