Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-22 16:29:09 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5098 from bitwarden/ac1202-org-api-key-request

Browse Source 
[AC-1202] Move org-api-key request back into admin-console
This commit is contained in:
Vincent Salucci 2023-03-28 15:11:04 -05:00 committed by GitHub
commit e645688f8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts
View File

@ -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 {

2
bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts
View File

@ -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",

2
libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts
View File

@ -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";

6
libs/common/src/admin-console/models/request/organization-api-key.request.ts Normal file
View File

@ -0,0 +1,6 @@
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;
}

2
libs/common/src/admin-console/services/organization/organization-api.service.ts
View File

@ -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";

6
libs/common/src/models/request/organization-api-key.request.ts
View File

@ -1,6 +0,0 @@
import { OrganizationApiKeyType } from "../../admin-console/enums/organization-api-key-type";
import { SecretVerificationRequest } from "../../auth/models/request/secret-verification.request";
export class OrganizationApiKeyRequest extends SecretVerificationRequest {
type: OrganizationApiKeyType = OrganizationApiKeyType.Default;
}