diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts index 7280c943eb..6ebb5d266c 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts @@ -48,13 +48,10 @@ export class ProjectService { return await this.createProjectsListView(organizationId, results.data); } - async getProjectCounts( - organizationId: string, - projectId: string, - ): Promise { + async getProjectCounts(projectId: string): Promise { const r = await this.apiService.send( "GET", - "/organizations/" + organizationId + "/projects/" + projectId + "/sm-counts", + "/projects/" + projectId + "/sm-counts", null, true, true, diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts index 489de0907f..2764406497 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts @@ -75,11 +75,7 @@ export class ProjectComponent implements OnInit, OnDestroy { this.secretService.secret$.pipe(startWith(null)), this.accessPolicyService.accessPolicy$.pipe(startWith(null)), this.serviceAccountService.serviceAccount$.pipe(startWith(null)), - ]).pipe( - switchMap(([params]) => - this.projectService.getProjectCounts(params.organizationId, params.projectId), - ), - ); + ]).pipe(switchMap(([params]) => this.projectService.getProjectCounts(params.projectId))); combineLatest([projectId$, organization$, projectCounts$]) .pipe(takeUntil(this.destroy$)) diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts index 8268ecb24b..4b0087905c 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts @@ -57,9 +57,7 @@ export class ServiceAccountComponent implements OnInit, OnDestroy { this.accessService.accessToken$.pipe(startWith(null)), this.onChange$, ]).pipe( - switchMap(([params, _]) => - this.serviceAccountService.getCounts(params.organizationId, params.serviceAccountId), - ), + switchMap(([params, _]) => this.serviceAccountService.getCounts(params.serviceAccountId)), ); combineLatest([this.serviceAccount$, serviceAccountCounts$]) diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts index 073b7fa30c..28105a191e 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts @@ -71,13 +71,10 @@ export class ServiceAccountService { return await this.createServiceAccountView(orgKey, new ServiceAccountResponse(r)); } - async getCounts( - organizationId: string, - serviceAccountId: string, - ): Promise { + async getCounts(serviceAccountId: string): Promise { const r = await this.apiService.send( "GET", - "/organizations/" + organizationId + "/service-accounts/" + serviceAccountId + "/sm-counts", + "/service-accounts/" + serviceAccountId + "/sm-counts", null, true, true,