From 16f86d1da29513be99e950a5b2dff13f3b7bdbc7 Mon Sep 17 00:00:00 2001 From: Vincent Salucci Date: Tue, 28 Mar 2023 14:18:40 -0500 Subject: [PATCH 1/2] refactor: move organization-api-key.request to admin-console, refs AC-1202 --- .../models/request/organization-api-key.request.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename libs/common/src/{ => admin-console}/models/request/organization-api-key.request.ts (100%) diff --git a/libs/common/src/models/request/organization-api-key.request.ts b/libs/common/src/admin-console/models/request/organization-api-key.request.ts similarity index 100% rename from libs/common/src/models/request/organization-api-key.request.ts rename to libs/common/src/admin-console/models/request/organization-api-key.request.ts From 5008acfd131e1559db15259a2fc30abc6b5f9b6f Mon Sep 17 00:00:00 2001 From: Vincent Salucci Date: Tue, 28 Mar 2023 14:28:58 -0500 Subject: [PATCH 2/2] fix: update downstream imports for org-api-key.request file move, refs AC-1202 --- .../billing/organizations/billing-sync-api-key.component.ts | 2 +- .../app/admin-console/organizations/manage/scim.component.ts | 2 +- .../organization/organization-api.service.abstraction.ts | 2 +- .../models/request/organization-api-key.request.ts | 4 ++-- .../services/organization/organization-api.service.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts index ab3c45212b..d38bc391ec 100644 --- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts +++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts @@ -7,8 +7,8 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { OrganizationApiKeyType } from "@bitwarden/common/admin-console/enums/organization-api-key-type"; +import { OrganizationApiKeyRequest } from "@bitwarden/common/admin-console/models/request/organization-api-key.request"; import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response"; -import { OrganizationApiKeyRequest } from "@bitwarden/common/models/request/organization-api-key.request"; import { Verification } from "@bitwarden/common/types/verification"; export interface BillingSyncApiModalData { diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts index 88f3e638c5..5db647cdc2 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts @@ -10,11 +10,11 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso import { OrganizationApiKeyType } from "@bitwarden/common/admin-console/enums/organization-api-key-type"; import { OrganizationConnectionType } from "@bitwarden/common/admin-console/enums/organization-connection-type"; import { ScimConfigApi } from "@bitwarden/common/admin-console/models/api/scim-config.api"; +import { OrganizationApiKeyRequest } from "@bitwarden/common/admin-console/models/request/organization-api-key.request"; import { OrganizationConnectionRequest } from "@bitwarden/common/admin-console/models/request/organization-connection.request"; import { ScimConfigRequest } from "@bitwarden/common/admin-console/models/request/scim-config.request"; import { OrganizationConnectionResponse } from "@bitwarden/common/admin-console/models/response/organization-connection.response"; import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response"; -import { OrganizationApiKeyRequest } from "@bitwarden/common/models/request/organization-api-key.request"; @Component({ selector: "app-org-manage-scim", diff --git a/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts index 3195f636b2..fa9583b16a 100644 --- a/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts +++ b/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts @@ -1,3 +1,4 @@ +import { OrganizationApiKeyRequest } from "../../../admin-console/models/request/organization-api-key.request"; import { OrganizationSsoRequest } from "../../../auth/models/request/organization-sso.request"; import { SecretVerificationRequest } from "../../../auth/models/request/secret-verification.request"; import { ApiKeyResponse } from "../../../auth/models/response/api-key.response"; @@ -10,7 +11,6 @@ import { OrganizationSubscriptionResponse } from "../../../billing/models/respon import { PaymentResponse } from "../../../billing/models/response/payment.response"; import { TaxInfoResponse } from "../../../billing/models/response/tax-info.response"; import { ImportDirectoryRequest } from "../../../models/request/import-directory.request"; -import { OrganizationApiKeyRequest } from "../../../models/request/organization-api-key.request"; import { SeatRequest } from "../../../models/request/seat.request"; import { StorageRequest } from "../../../models/request/storage.request"; import { VerifyBankRequest } from "../../../models/request/verify-bank.request"; diff --git a/libs/common/src/admin-console/models/request/organization-api-key.request.ts b/libs/common/src/admin-console/models/request/organization-api-key.request.ts index a16f3e5092..bec2472118 100644 --- a/libs/common/src/admin-console/models/request/organization-api-key.request.ts +++ b/libs/common/src/admin-console/models/request/organization-api-key.request.ts @@ -1,5 +1,5 @@ -import { OrganizationApiKeyType } from "../../admin-console/enums/organization-api-key-type"; -import { SecretVerificationRequest } from "../../auth/models/request/secret-verification.request"; +import { SecretVerificationRequest } from "../../../auth/models/request/secret-verification.request"; +import { OrganizationApiKeyType } from "../../enums/organization-api-key-type"; export class OrganizationApiKeyRequest extends SecretVerificationRequest { type: OrganizationApiKeyType = OrganizationApiKeyType.Default; diff --git a/libs/common/src/admin-console/services/organization/organization-api.service.ts b/libs/common/src/admin-console/services/organization/organization-api.service.ts index c9bbafe085..074ef6bb4c 100644 --- a/libs/common/src/admin-console/services/organization/organization-api.service.ts +++ b/libs/common/src/admin-console/services/organization/organization-api.service.ts @@ -1,4 +1,5 @@ import { ApiService } from "../../../abstractions/api.service"; +import { OrganizationApiKeyRequest } from "../../../admin-console/models/request/organization-api-key.request"; import { OrganizationSsoRequest } from "../../../auth/models/request/organization-sso.request"; import { SecretVerificationRequest } from "../../../auth/models/request/secret-verification.request"; import { ApiKeyResponse } from "../../../auth/models/response/api-key.response"; @@ -11,7 +12,6 @@ import { OrganizationSubscriptionResponse } from "../../../billing/models/respon import { PaymentResponse } from "../../../billing/models/response/payment.response"; import { TaxInfoResponse } from "../../../billing/models/response/tax-info.response"; import { ImportDirectoryRequest } from "../../../models/request/import-directory.request"; -import { OrganizationApiKeyRequest } from "../../../models/request/organization-api-key.request"; import { SeatRequest } from "../../../models/request/seat.request"; import { StorageRequest } from "../../../models/request/storage.request"; import { VerifyBankRequest } from "../../../models/request/verify-bank.request";