From 8e0e85b070e2c41257721df61e3ab074335794a9 Mon Sep 17 00:00:00 2001 From: Rui Tome Date: Wed, 1 May 2024 12:27:44 +0100 Subject: [PATCH] [AC-2302] Remove services and views folders from bit-common --- .../auth-requests/admin-auth-request-update.request.ts | 0 .../auth-requests/bulk-deny-auth-requests.request.ts | 0 .../src/admin-console/{services => }/auth-requests/index.ts | 0 .../auth-requests/organization-auth-request-api.service.ts | 0 .../auth-requests/organization-auth-request.service.spec.ts | 3 +-- .../auth-requests/organization-auth-request.service.ts | 3 +-- .../{views => }/auth-requests/pending-auth-request.view.ts | 2 +- .../pending-organization-auth-request.response.ts | 0 .../manage/device-approvals/device-approvals.component.ts | 4 ++-- .../app/admin-console/organizations/organizations.module.ts | 4 ++-- 10 files changed, 7 insertions(+), 9 deletions(-) rename bitwarden_license/bit-common/src/admin-console/{services => }/auth-requests/admin-auth-request-update.request.ts (100%) rename bitwarden_license/bit-common/src/admin-console/{services => }/auth-requests/bulk-deny-auth-requests.request.ts (100%) rename bitwarden_license/bit-common/src/admin-console/{services => }/auth-requests/index.ts (100%) rename bitwarden_license/bit-common/src/admin-console/{services => }/auth-requests/organization-auth-request-api.service.ts (100%) rename bitwarden_license/bit-common/src/admin-console/{services => }/auth-requests/organization-auth-request.service.spec.ts (98%) rename bitwarden_license/bit-common/src/admin-console/{services => }/auth-requests/organization-auth-request.service.ts (97%) rename bitwarden_license/bit-common/src/admin-console/{views => }/auth-requests/pending-auth-request.view.ts (87%) rename bitwarden_license/bit-common/src/admin-console/{services => }/auth-requests/pending-organization-auth-request.response.ts (100%) diff --git a/bitwarden_license/bit-common/src/admin-console/services/auth-requests/admin-auth-request-update.request.ts b/bitwarden_license/bit-common/src/admin-console/auth-requests/admin-auth-request-update.request.ts similarity index 100% rename from bitwarden_license/bit-common/src/admin-console/services/auth-requests/admin-auth-request-update.request.ts rename to bitwarden_license/bit-common/src/admin-console/auth-requests/admin-auth-request-update.request.ts diff --git a/bitwarden_license/bit-common/src/admin-console/services/auth-requests/bulk-deny-auth-requests.request.ts b/bitwarden_license/bit-common/src/admin-console/auth-requests/bulk-deny-auth-requests.request.ts similarity index 100% rename from bitwarden_license/bit-common/src/admin-console/services/auth-requests/bulk-deny-auth-requests.request.ts rename to bitwarden_license/bit-common/src/admin-console/auth-requests/bulk-deny-auth-requests.request.ts diff --git a/bitwarden_license/bit-common/src/admin-console/services/auth-requests/index.ts b/bitwarden_license/bit-common/src/admin-console/auth-requests/index.ts similarity index 100% rename from bitwarden_license/bit-common/src/admin-console/services/auth-requests/index.ts rename to bitwarden_license/bit-common/src/admin-console/auth-requests/index.ts diff --git a/bitwarden_license/bit-common/src/admin-console/services/auth-requests/organization-auth-request-api.service.ts b/bitwarden_license/bit-common/src/admin-console/auth-requests/organization-auth-request-api.service.ts similarity index 100% rename from bitwarden_license/bit-common/src/admin-console/services/auth-requests/organization-auth-request-api.service.ts rename to bitwarden_license/bit-common/src/admin-console/auth-requests/organization-auth-request-api.service.ts diff --git a/bitwarden_license/bit-common/src/admin-console/services/auth-requests/organization-auth-request.service.spec.ts b/bitwarden_license/bit-common/src/admin-console/auth-requests/organization-auth-request.service.spec.ts similarity index 98% rename from bitwarden_license/bit-common/src/admin-console/services/auth-requests/organization-auth-request.service.spec.ts rename to bitwarden_license/bit-common/src/admin-console/auth-requests/organization-auth-request.service.spec.ts index c2d83da229..24c6f06be3 100644 --- a/bitwarden_license/bit-common/src/admin-console/services/auth-requests/organization-auth-request.service.spec.ts +++ b/bitwarden_license/bit-common/src/admin-console/auth-requests/organization-auth-request.service.spec.ts @@ -5,10 +5,9 @@ import { OrganizationUserResetPasswordDetailsResponse } from "@bitwarden/common/ import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; -import { PendingAuthRequestView } from "../../views/auth-requests/pending-auth-request.view"; - import { OrganizationAuthRequestApiService } from "./organization-auth-request-api.service"; import { OrganizationAuthRequestService } from "./organization-auth-request.service"; +import { PendingAuthRequestView } from "./pending-auth-request.view"; describe("OrganizationAuthRequestService", () => { let organizationAuthRequestApiService: MockProxy; diff --git a/bitwarden_license/bit-common/src/admin-console/services/auth-requests/organization-auth-request.service.ts b/bitwarden_license/bit-common/src/admin-console/auth-requests/organization-auth-request.service.ts similarity index 97% rename from bitwarden_license/bit-common/src/admin-console/services/auth-requests/organization-auth-request.service.ts rename to bitwarden_license/bit-common/src/admin-console/auth-requests/organization-auth-request.service.ts index 3db2f5b4ea..efc2cdcedb 100644 --- a/bitwarden_license/bit-common/src/admin-console/services/auth-requests/organization-auth-request.service.ts +++ b/bitwarden_license/bit-common/src/admin-console/auth-requests/organization-auth-request.service.ts @@ -5,9 +5,8 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; -import { PendingAuthRequestView } from "../../views/auth-requests/pending-auth-request.view"; - import { OrganizationAuthRequestApiService } from "./organization-auth-request-api.service"; +import { PendingAuthRequestView } from "./pending-auth-request.view"; export class OrganizationAuthRequestService { constructor( diff --git a/bitwarden_license/bit-common/src/admin-console/views/auth-requests/pending-auth-request.view.ts b/bitwarden_license/bit-common/src/admin-console/auth-requests/pending-auth-request.view.ts similarity index 87% rename from bitwarden_license/bit-common/src/admin-console/views/auth-requests/pending-auth-request.view.ts rename to bitwarden_license/bit-common/src/admin-console/auth-requests/pending-auth-request.view.ts index 44c1d4a9a6..d9f3601352 100644 --- a/bitwarden_license/bit-common/src/admin-console/views/auth-requests/pending-auth-request.view.ts +++ b/bitwarden_license/bit-common/src/admin-console/auth-requests/pending-auth-request.view.ts @@ -1,6 +1,6 @@ import { View } from "@bitwarden/common/models/view/view"; -import { PendingOrganizationAuthRequestResponse } from "../../services/auth-requests"; +import { PendingOrganizationAuthRequestResponse } from "."; export class PendingAuthRequestView implements View { id: string; diff --git a/bitwarden_license/bit-common/src/admin-console/services/auth-requests/pending-organization-auth-request.response.ts b/bitwarden_license/bit-common/src/admin-console/auth-requests/pending-organization-auth-request.response.ts similarity index 100% rename from bitwarden_license/bit-common/src/admin-console/services/auth-requests/pending-organization-auth-request.response.ts rename to bitwarden_license/bit-common/src/admin-console/auth-requests/pending-organization-auth-request.response.ts diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts index 72dd7692c8..6668f876c2 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts @@ -9,8 +9,8 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid import { TableDataSource } from "@bitwarden/components"; import { Devices } from "@bitwarden/web-vault/app/admin-console/icons"; -import { OrganizationAuthRequestService } from "../../../../../../../bit-common/src/admin-console/services/auth-requests/organization-auth-request.service"; -import { PendingAuthRequestView } from "../../../../../../../bit-common/src/admin-console/views/auth-requests/pending-auth-request.view"; +import { OrganizationAuthRequestService } from "../../../../../../../bit-common/src/admin-console/auth-requests/organization-auth-request.service"; +import { PendingAuthRequestView } from "../../../../../../../bit-common/src/admin-console/auth-requests/pending-auth-request.view"; @Component({ selector: "app-org-device-approvals", templateUrl: "./device-approvals.component.html", diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations.module.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations.module.ts index 706a59dd58..e129587b80 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations.module.ts @@ -14,8 +14,8 @@ import { NoItemsModule } from "@bitwarden/components"; import { LooseComponentsModule } from "@bitwarden/web-vault/app/shared"; import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module"; -import { OrganizationAuthRequestApiService } from "../../../../../bit-common/src/admin-console/services/auth-requests/organization-auth-request-api.service"; -import { OrganizationAuthRequestService } from "../../../../../bit-common/src/admin-console/services/auth-requests/organization-auth-request.service"; +import { OrganizationAuthRequestApiService } from "../../../../../bit-common/src/admin-console/auth-requests/organization-auth-request-api.service"; +import { OrganizationAuthRequestService } from "../../../../../bit-common/src/admin-console/auth-requests/organization-auth-request.service"; import { SsoComponent } from "../../auth/sso/sso.component"; import { DeviceApprovalsComponent } from "./manage/device-approvals/device-approvals.component";