From eb42a47bdcb02ea2194819ccb36f4f5bdb251956 Mon Sep 17 00:00:00 2001 From: Rui Tome Date: Wed, 17 Apr 2024 13:03:28 +0100 Subject: [PATCH] [AC-2302] Move organization-auth-request.service to bit-common folder --- .../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.service.ts | 2 +- .../pending-organization-auth-request.response.ts | 0 .../views/auth-requests}/pending-auth-request.view.ts | 2 +- .../organizations/core/core-organization.module.ts | 2 +- .../manage/device-approvals/device-approvals.component.ts | 4 ++-- tsconfig.json | 7 ++++++- 9 files changed, 11 insertions(+), 6 deletions(-) rename bitwarden_license/{bit-web/src/app/admin-console/organizations/core => bit-common/src/admin-console}/services/auth-requests/admin-auth-request-update.request.ts (100%) rename bitwarden_license/{bit-web/src/app/admin-console/organizations/core => bit-common/src/admin-console}/services/auth-requests/bulk-deny-auth-requests.request.ts (100%) rename bitwarden_license/{bit-web/src/app/admin-console/organizations/core => bit-common/src/admin-console}/services/auth-requests/index.ts (100%) rename bitwarden_license/{bit-web/src/app/admin-console/organizations/core => bit-common/src/admin-console}/services/auth-requests/organization-auth-request.service.ts (94%) rename bitwarden_license/{bit-web/src/app/admin-console/organizations/core => bit-common/src/admin-console}/services/auth-requests/pending-organization-auth-request.response.ts (100%) rename bitwarden_license/{bit-web/src/app/admin-console/organizations/core/views => bit-common/src/admin-console/views/auth-requests}/pending-auth-request.view.ts (87%) diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/core/services/auth-requests/admin-auth-request-update.request.ts b/bitwarden_license/bit-common/src/admin-console/services/auth-requests/admin-auth-request-update.request.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/admin-console/organizations/core/services/auth-requests/admin-auth-request-update.request.ts rename to bitwarden_license/bit-common/src/admin-console/services/auth-requests/admin-auth-request-update.request.ts diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/core/services/auth-requests/bulk-deny-auth-requests.request.ts b/bitwarden_license/bit-common/src/admin-console/services/auth-requests/bulk-deny-auth-requests.request.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/admin-console/organizations/core/services/auth-requests/bulk-deny-auth-requests.request.ts rename to bitwarden_license/bit-common/src/admin-console/services/auth-requests/bulk-deny-auth-requests.request.ts diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/core/services/auth-requests/index.ts b/bitwarden_license/bit-common/src/admin-console/services/auth-requests/index.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/admin-console/organizations/core/services/auth-requests/index.ts rename to bitwarden_license/bit-common/src/admin-console/services/auth-requests/index.ts diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/core/services/auth-requests/organization-auth-request.service.ts b/bitwarden_license/bit-common/src/admin-console/services/auth-requests/organization-auth-request.service.ts similarity index 94% rename from bitwarden_license/bit-web/src/app/admin-console/organizations/core/services/auth-requests/organization-auth-request.service.ts rename to bitwarden_license/bit-common/src/admin-console/services/auth-requests/organization-auth-request.service.ts index d9de9fe297..76c4d6ec29 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/core/services/auth-requests/organization-auth-request.service.ts +++ b/bitwarden_license/bit-common/src/admin-console/services/auth-requests/organization-auth-request.service.ts @@ -4,7 +4,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; -import { PendingAuthRequestView } from "../../views/pending-auth-request.view"; +import { PendingAuthRequestView } from "../../views/auth-requests/pending-auth-request.view"; import { AdminAuthRequestUpdateRequest } from "./admin-auth-request-update.request"; import { BulkDenyAuthRequestsRequest } from "./bulk-deny-auth-requests.request"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/core/services/auth-requests/pending-organization-auth-request.response.ts b/bitwarden_license/bit-common/src/admin-console/services/auth-requests/pending-organization-auth-request.response.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/admin-console/organizations/core/services/auth-requests/pending-organization-auth-request.response.ts rename to bitwarden_license/bit-common/src/admin-console/services/auth-requests/pending-organization-auth-request.response.ts diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/core/views/pending-auth-request.view.ts b/bitwarden_license/bit-common/src/admin-console/views/auth-requests/pending-auth-request.view.ts similarity index 87% rename from bitwarden_license/bit-web/src/app/admin-console/organizations/core/views/pending-auth-request.view.ts rename to bitwarden_license/bit-common/src/admin-console/views/auth-requests/pending-auth-request.view.ts index 8f3415a236..44c1d4a9a6 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/core/views/pending-auth-request.view.ts +++ b/bitwarden_license/bit-common/src/admin-console/views/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 "../../services/auth-requests"; export class PendingAuthRequestView implements View { id: string; diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/core/core-organization.module.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/core/core-organization.module.ts index bba3bfce93..2f25270aba 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/core/core-organization.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/core/core-organization.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { OrganizationAuthRequestService } from "./services/auth-requests"; +import { OrganizationAuthRequestService } from "../../../../../../bit-common/src/admin-console/services/auth-requests"; @NgModule({ providers: [OrganizationAuthRequestService], 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 dec65df9fb..03c69bf15d 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 @@ -15,8 +15,8 @@ import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/sym import { TableDataSource } from "@bitwarden/components"; import { Devices } from "@bitwarden/web-vault/app/admin-console/icons"; -import { OrganizationAuthRequestService } from "../../core/services/auth-requests"; -import { PendingAuthRequestView } from "../../core/views/pending-auth-request.view"; +import { OrganizationAuthRequestService } from "../../../../../../../bit-common/src/admin-console/services/auth-requests"; +import { PendingAuthRequestView } from "../../../../../../../bit-common/src/admin-console/views/auth-requests/pending-auth-request.view"; @Component({ selector: "app-org-device-approvals", diff --git a/tsconfig.json b/tsconfig.json index ab3f8861a9..8dad7a7c13 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -38,6 +38,11 @@ ], "useDefineForClassFields": false }, - "include": ["apps/web/src/**/*", "libs/*/src/**/*", "bitwarden_license/bit-web/src/**/*"], + "include": [ + "apps/web/src/**/*", + "libs/*/src/**/*", + "bitwarden_license/bit-web/src/**/*", + "bitwarden_license/bit-common/src/**/*" + ], "exclude": ["apps/web/src/**/*.spec.ts", "libs/*/src/**/*.spec.ts", "**/*.spec-util.ts"] }