bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 15:53:27 +00:00
Code Issues Releases Wiki Activity

[AC-1202] Update enums filenames for admin-console/billing teams (#5169)

Browse Source 
* refactor: add barrel file for admin-console enums, update references, refs AC-1202

* fix: lint/prettier updates, refs AC-1202

* refactor: add enum suffix, refs AC-1202

* refactor: add barrel file for billing enums, update imports to use it, refs AC-1202

* fix: prettier, refs AC-1202

* refactor: add enum suffix for billing enums, refs AC-1202
This commit is contained in:
Vincent Salucci
2023-04-05 20:34:23 -05:00
committed by GitHub
parent c6bc97cf5c
commit 576d85b268
128 changed files with 171 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/common/src/abstractions/api.service.ts
View File

@@ -1,4 +1,4 @@
import { OrganizationConnectionType } from "../admin-console/enums/organization-connection-type";
import { OrganizationConnectionType } from "../admin-console/enums";
import { CollectionRequest } from "../admin-console/models/request/collection.request";
import { OrganizationConnectionRequest } from "../admin-console/models/request/organization-connection.request";
import { OrganizationSponsorshipCreateRequest } from "../admin-console/models/request/organization/organization-sponsorship-create.request";

2
libs/common/src/abstractions/organization-user/requests/organization-user-invite.request.ts
View File

@@ -1,4 +1,4 @@
import { OrganizationUserType } from "../../../admin-console/enums/organization-user-type";
import { OrganizationUserType } from "../../../admin-console/enums";
import { PermissionsApi } from "../../../admin-console/models/api/permissions.api";
import { SelectionReadOnlyRequest } from "../../../admin-console/models/request/selection-read-only.request";

2
libs/common/src/abstractions/organization-user/requests/organization-user-update.request.ts
View File

@@ -1,4 +1,4 @@
import { OrganizationUserType } from "../../../admin-console/enums/organization-user-type";
import { OrganizationUserType } from "../../../admin-console/enums";
import { PermissionsApi } from "../../../admin-console/models/api/permissions.api";
import { SelectionReadOnlyRequest } from "../../../admin-console/models/request/selection-read-only.request";

3
libs/common/src/abstractions/organization-user/responses/organization-user.response.ts
View File

@@ -1,5 +1,4 @@
import { OrganizationUserStatusType } from "../../../admin-console/enums/organization-user-status-type";
import { OrganizationUserType } from "../../../admin-console/enums/organization-user-type";
import { OrganizationUserStatusType, OrganizationUserType } from "../../../admin-console/enums";
import { PermissionsApi } from "../../../admin-console/models/api/permissions.api";
import { SelectionReadOnlyResponse } from "../../../admin-console/models/response/selection-read-only.response";
import { KdfType } from "../../../enums";

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

@@ -15,7 +15,7 @@ import { SeatRequest } from "../../../models/request/seat.request";
import { StorageRequest } from "../../../models/request/storage.request";
import { VerifyBankRequest } from "../../../models/request/verify-bank.request";
import { ListResponse } from "../../../models/response/list.response";
import { OrganizationApiKeyType } from "../../enums/organization-api-key-type";
import { OrganizationApiKeyType } from "../../enums";
import { OrganizationCreateRequest } from "../../models/request/organization-create.request";
import { OrganizationKeysRequest } from "../../models/request/organization-keys.request";
import { OrganizationUpdateRequest } from "../../models/request/organization-update.request";

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

@@ -1,5 +1,5 @@
import { ListResponse } from "../../../models/response/list.response";
import { PolicyType } from "../../enums/policy-type";
import { PolicyType } from "../../enums";
import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options";
import { PolicyRequest } from "../../models/request/policy.request";
import { PolicyResponse } from "../../models/response/policy.response";

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

@@ -1,7 +1,7 @@
import { Observable } from "rxjs";
import { ListResponse } from "../../../models/response/list.response";
import { PolicyType } from "../../enums/policy-type";
import { PolicyType } from "../../enums";
import { PolicyData } from "../../models/data/policy.data";
import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options";
import { Policy } from "../../models/domain/policy";

8
libs/common/src/admin-console/enums/index.ts Normal file
View File

@@ -0,0 +1,8 @@
export * from "./organization-api-key-type.enum";
export * from "./organization-connection-type.enum";
export * from "./organization-user-status-type.enum";
export * from "./organization-user-type.enum";
export * from "./policy-type.enum";
export * from "./provider-user-status-type.enum";
export * from "./provider-user-type.enum";
export * from "./scim-provider-type.enum";

0
libs/common/src/admin-console/enums/organization-api-key-type.ts → libs/common/src/admin-console/enums/organization-api-key-type.enum.ts
View File

0
libs/common/src/admin-console/enums/organization-connection-type.ts → libs/common/src/admin-console/enums/organization-connection-type.enum.ts
View File

0
libs/common/src/admin-console/enums/organization-user-status-type.ts → libs/common/src/admin-console/enums/organization-user-status-type.enum.ts
View File

0
libs/common/src/admin-console/enums/organization-user-type.ts → libs/common/src/admin-console/enums/organization-user-type.enum.ts
View File

0
libs/common/src/admin-console/enums/policy-type.ts → libs/common/src/admin-console/enums/policy-type.enum.ts
View File

0
libs/common/src/admin-console/enums/provider-user-status-type.ts → libs/common/src/admin-console/enums/provider-user-status-type.enum.ts
View File

0
libs/common/src/admin-console/enums/provider-user-type.ts → libs/common/src/admin-console/enums/provider-user-type.enum.ts
View File

0
libs/common/src/admin-console/enums/scim-provider-type.ts → libs/common/src/admin-console/enums/scim-provider-type.enum.ts
View File

2
libs/common/src/admin-console/models/api/scim-config.api.ts
View File

@@ -1,5 +1,5 @@
import { BaseResponse } from "../../../models/response/base.response";
import { ScimProviderType } from "../../enums/scim-provider-type";
import { ScimProviderType } from "../../enums";
export class ScimConfigApi extends BaseResponse {
enabled: boolean;

3
libs/common/src/admin-console/models/data/organization.data.ts
View File

@@ -1,6 +1,5 @@
import { ProductType } from "../../../enums";
import { OrganizationUserStatusType } from "../../enums/organization-user-status-type";
import { OrganizationUserType } from "../../enums/organization-user-type";
import { OrganizationUserStatusType, OrganizationUserType } from "../../enums";
import { PermissionsApi } from "../api/permissions.api";
import { ProfileOrganizationResponse } from "../response/profile-organization.response";

2
libs/common/src/admin-console/models/data/policy.data.ts
View File

@@ -1,4 +1,4 @@
import { PolicyType } from "../../enums/policy-type";
import { PolicyType } from "../../enums";
import { PolicyResponse } from "../response/policy.response";
export class PolicyData {

3
libs/common/src/admin-console/models/data/provider.data.ts
View File

@@ -1,5 +1,4 @@
import { ProviderUserStatusType } from "../../enums/provider-user-status-type";
import { ProviderUserType } from "../../enums/provider-user-type";
import { ProviderUserStatusType, ProviderUserType } from "../../enums";
import { ProfileProviderResponse } from "../response/profile-provider.response";
export class ProviderData {

3
libs/common/src/admin-console/models/domain/organization.ts
View File

@@ -1,8 +1,7 @@
import { Jsonify } from "type-fest";
import { ProductType } from "../../../enums";
import { OrganizationUserStatusType } from "../../enums/organization-user-status-type";
import { OrganizationUserType } from "../../enums/organization-user-type";
import { OrganizationUserStatusType, OrganizationUserType } from "../../enums";
import { PermissionsApi } from "../api/permissions.api";
import { OrganizationData } from "../data/organization.data";

2
libs/common/src/admin-console/models/domain/policy.ts
View File

@@ -1,5 +1,5 @@
import Domain from "../../../models/domain/domain-base";
import { PolicyType } from "../../enums/policy-type";
import { PolicyType } from "../../enums";
import { PolicyData } from "../data/policy.data";
export class Policy extends Domain {

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

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

2
libs/common/src/admin-console/models/request/organization-connection.request.ts
View File

@@ -1,5 +1,5 @@
import { BillingSyncConfigRequest } from "../../../billing/models/request/billing-sync-config.request";
import { OrganizationConnectionType } from "../../enums/organization-connection-type";
import { OrganizationConnectionType } from "../../enums";
import { ScimConfigRequest } from "./scim-config.request";

3
libs/common/src/admin-console/models/request/organization-create.request.ts
View File

@@ -1,5 +1,4 @@
import { PaymentMethodType } from "../../../billing/enums/payment-method-type";
import { PlanType } from "../../../billing/enums/plan-type";
import { PaymentMethodType, PlanType } from "../../../billing/enums";
import { OrganizationKeysRequest } from "./organization-keys.request";

2
libs/common/src/admin-console/models/request/organization-upgrade.request.ts
View File

@@ -1,4 +1,4 @@
import { PlanType } from "../../../billing/enums/plan-type";
import { PlanType } from "../../../billing/enums";
import { OrganizationKeysRequest } from "./organization-keys.request";

2
libs/common/src/admin-console/models/request/organization/organization-sponsorship-create.request.ts
View File

@@ -1,4 +1,4 @@
import { PlanSponsorshipType } from "../../../../billing/enums/plan-sponsorship-type";
import { PlanSponsorshipType } from "../../../../billing/enums";
export class OrganizationSponsorshipCreateRequest {
sponsoredEmail: string;

2
libs/common/src/admin-console/models/request/organization/organization-sponsorship-redeem.request.ts
View File

@@ -1,4 +1,4 @@
import { PlanSponsorshipType } from "../../../../billing/enums/plan-sponsorship-type";
import { PlanSponsorshipType } from "../../../../billing/enums";
export class OrganizationSponsorshipRedeemRequest {
planSponsorshipType: PlanSponsorshipType;

2
libs/common/src/admin-console/models/request/policy.request.ts
View File

@@ -1,4 +1,4 @@
import { PolicyType } from "../../enums/policy-type";
import { PolicyType } from "../../enums";
export class PolicyRequest {
type: PolicyType;

2
libs/common/src/admin-console/models/request/provider/provider-user-invite.request.ts
View File

@@ -1,4 +1,4 @@
import { ProviderUserType } from "../../../enums/provider-user-type";
import { ProviderUserType } from "../../../enums";
export class ProviderUserInviteRequest {
emails: string[] = [];

2
libs/common/src/admin-console/models/request/provider/provider-user-update.request.ts
View File

@@ -1,4 +1,4 @@
import { ProviderUserType } from "../../../enums/provider-user-type";
import { ProviderUserType } from "../../../enums";
export class ProviderUserUpdateRequest {
type: ProviderUserType;

2
libs/common/src/admin-console/models/request/scim-config.request.ts
View File

@@ -1,4 +1,4 @@
import { ScimProviderType } from "../../enums/scim-provider-type";
import { ScimProviderType } from "../../enums";
export class ScimConfigRequest {
constructor(private enabled: boolean, private scimProvider: ScimProviderType = null) {}

2
libs/common/src/admin-console/models/response/organization-api-key-information.response.ts
View File

@@ -1,5 +1,5 @@
import { BaseResponse } from "../../../models/response/base.response";
import { OrganizationApiKeyType } from "../../enums/organization-api-key-type";
import { OrganizationApiKeyType } from "../../enums";
export class OrganizationApiKeyInformationResponse extends BaseResponse {
keyType: OrganizationApiKeyType;

2
libs/common/src/admin-console/models/response/organization-connection.response.ts
View File

@@ -1,6 +1,6 @@
import { BillingSyncConfigApi } from "../../../billing/models/api/billing-sync-config.api";
import { BaseResponse } from "../../../models/response/base.response";
import { OrganizationConnectionType } from "../../enums/organization-connection-type";
import { OrganizationConnectionType } from "../../enums";
import { ScimConfigApi } from "../api/scim-config.api";
/**API response config types for OrganizationConnectionResponse */

2
libs/common/src/admin-console/models/response/organization.response.ts
View File

@@ -1,4 +1,4 @@
import { PlanType } from "../../../billing/enums/plan-type";
import { PlanType } from "../../../billing/enums";
import { PlanResponse } from "../../../billing/models/response/plan.response";
import { BaseResponse } from "../../../models/response/base.response";

2
libs/common/src/admin-console/models/response/policy.response.ts
View File

@@ -1,5 +1,5 @@
import { BaseResponse } from "../../../models/response/base.response";
import { PolicyType } from "../../enums/policy-type";
import { PolicyType } from "../../enums";
export class PolicyResponse extends BaseResponse {
id: string;

3
libs/common/src/admin-console/models/response/profile-organization.response.ts
View File

@@ -1,7 +1,6 @@
import { ProductType } from "../../../enums";
import { BaseResponse } from "../../../models/response/base.response";
import { OrganizationUserStatusType } from "../../enums/organization-user-status-type";
import { OrganizationUserType } from "../../enums/organization-user-type";
import { OrganizationUserStatusType, OrganizationUserType } from "../../enums";
import { PermissionsApi } from "../api/permissions.api";
export class ProfileOrganizationResponse extends BaseResponse {

3
libs/common/src/admin-console/models/response/profile-provider.response.ts
View File

@@ -1,6 +1,5 @@
import { BaseResponse } from "../../../models/response/base.response";
import { ProviderUserStatusType } from "../../enums/provider-user-status-type";
import { ProviderUserType } from "../../enums/provider-user-type";
import { ProviderUserStatusType, ProviderUserType } from "../../enums";
import { PermissionsApi } from "../api/permissions.api";
export class ProfileProviderResponse extends BaseResponse {

3
libs/common/src/admin-console/models/response/provider/provider-user.response.ts
View File

@@ -1,6 +1,5 @@
import { BaseResponse } from "../../../../models/response/base.response";
import { ProviderUserStatusType } from "../../../enums/provider-user-status-type";
import { ProviderUserType } from "../../../enums/provider-user-type";
import { ProviderUserStatusType, ProviderUserType } from "../../../enums";
import { PermissionsApi } from "../../api/permissions.api";
export class ProviderUserResponse extends BaseResponse {

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

@@ -18,7 +18,7 @@ import { VerifyBankRequest } from "../../../models/request/verify-bank.request";
import { ListResponse } from "../../../models/response/list.response";
import { SyncService } from "../../../vault/abstractions/sync/sync.service.abstraction";
import { OrganizationApiServiceAbstraction } from "../../abstractions/organization/organization-api.service.abstraction";
import { OrganizationApiKeyType } from "../../enums/organization-api-key-type";
import { OrganizationApiKeyType } from "../../enums";
import { OrganizationCreateRequest } from "../../models/request/organization-create.request";
import { OrganizationKeysRequest } from "../../models/request/organization-keys.request";
import { OrganizationUpdateRequest } from "../../models/request/organization-update.request";

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

@@ -6,7 +6,7 @@ import { Utils } from "../../../misc/utils";
import { ListResponse } from "../../../models/response/list.response";
import { PolicyApiServiceAbstraction } from "../../abstractions/policy/policy-api.service.abstraction";
import { InternalPolicyService } from "../../abstractions/policy/policy.service.abstraction";
import { PolicyType } from "../../enums/policy-type";
import { PolicyType } from "../../enums";
import { PolicyData } from "../../models/data/policy.data";
import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options";
import { PolicyRequest } from "../../models/request/policy.request";

4
libs/common/src/admin-console/services/policy/policy.service.ts
View File

@@ -5,9 +5,7 @@ import { Utils } from "../../../misc/utils";
import { ListResponse } from "../../../models/response/list.response";
import { OrganizationService } from "../../abstractions/organization/organization.service.abstraction";
import { InternalPolicyService as InternalPolicyServiceAbstraction } from "../../abstractions/policy/policy.service.abstraction";
import { OrganizationUserStatusType } from "../../enums/organization-user-status-type";
import { OrganizationUserType } from "../../enums/organization-user-type";
import { PolicyType } from "../../enums/policy-type";
import { OrganizationUserStatusType, OrganizationUserType, PolicyType } from "../../enums";
import { PolicyData } from "../../models/data/policy.data";
import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options";
import { Organization } from "../../models/domain/organization";

2
libs/common/src/auth/services/key-connector.service.ts
View File

@@ -4,7 +4,7 @@ import { CryptoFunctionService } from "../../abstractions/cryptoFunction.service
import { LogService } from "../../abstractions/log.service";
import { StateService } from "../../abstractions/state.service";
import { OrganizationService } from "../../admin-console/abstractions/organization/organization.service.abstraction";
import { OrganizationUserType } from "../../admin-console/enums/organization-user-type";
import { OrganizationUserType } from "../../admin-console/enums";
import { Utils } from "../../misc/utils";
import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
import { KeysRequest } from "../../models/request/keys.request";

4
libs/common/src/billing/enums/index.ts Normal file
View File

@@ -0,0 +1,4 @@
export * from "./payment-method-type.enum";
export * from "./plan-sponsorship-type.enum";
export * from "./plan-type.enum";
export * from "./transaction-type.enum";

0
libs/common/src/billing/enums/payment-method-type.ts → libs/common/src/billing/enums/payment-method-type.enum.ts
View File

0
libs/common/src/billing/enums/plan-sponsorship-type.ts → libs/common/src/billing/enums/plan-sponsorship-type.enum.ts
View File

0
libs/common/src/billing/enums/plan-type.ts → libs/common/src/billing/enums/plan-type.enum.ts
View File

0
libs/common/src/billing/enums/transaction-type.ts → libs/common/src/billing/enums/transaction-type.enum.ts
View File

2
libs/common/src/billing/models/request/payment.request.ts
View File

@@ -1,4 +1,4 @@
import { PaymentMethodType } from "../../enums/payment-method-type";
import { PaymentMethodType } from "../../enums";
import { OrganizationTaxInfoUpdateRequest } from "./organization-tax-info-update.request";

3
libs/common/src/billing/models/response/billing.response.ts
View File

@@ -1,6 +1,5 @@
import { BaseResponse } from "../../../models/response/base.response";
import { PaymentMethodType } from "../../enums/payment-method-type";
import { TransactionType } from "../../enums/transaction-type";
import { PaymentMethodType, TransactionType } from "../../enums";
export class BillingResponse extends BaseResponse {
balance: number;

2
libs/common/src/billing/models/response/plan.response.ts
View File

@@ -1,6 +1,6 @@
import { ProductType } from "../../../enums";
import { BaseResponse } from "../../../models/response/base.response";
import { PlanType } from "../../enums/plan-type";
import { PlanType } from "../../enums";
export class PlanResponse extends BaseResponse {
type: PlanType;

3
libs/common/src/models/domain/provider.ts
View File

@@ -1,5 +1,4 @@
import { ProviderUserStatusType } from "../../admin-console/enums/provider-user-status-type";
import { ProviderUserType } from "../../admin-console/enums/provider-user-type";
import { ProviderUserStatusType, ProviderUserType } from "../../admin-console/enums";
import { ProviderData } from "../../admin-console/models/data/provider.data";
export class Provider {

2
libs/common/src/models/request/iap-check.request.ts
View File

@@ -1,4 +1,4 @@
import { PaymentMethodType } from "../../billing/enums/payment-method-type";
import { PaymentMethodType } from "../../billing/enums";
export class IapCheckRequest {
paymentMethodType: PaymentMethodType;

2
libs/common/src/services/api.service.ts
View File

@@ -2,7 +2,7 @@ import { ApiService as ApiServiceAbstraction } from "../abstractions/api.service
import { AppIdService } from "../abstractions/appId.service";
import { EnvironmentService } from "../abstractions/environment.service";
import { PlatformUtilsService } from "../abstractions/platformUtils.service";
import { OrganizationConnectionType } from "../admin-console/enums/organization-connection-type";
import { OrganizationConnectionType } from "../admin-console/enums";
import { CollectionRequest } from "../admin-console/models/request/collection.request";
import { OrganizationConnectionRequest } from "../admin-console/models/request/organization-connection.request";
import { OrganizationSponsorshipCreateRequest } from "../admin-console/models/request/organization/organization-sponsorship-create.request";

2
libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts
View File

@@ -2,7 +2,7 @@ import { CryptoService } from "../../abstractions/crypto.service";
import { StateService } from "../../abstractions/state.service";
import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "../../abstractions/vaultTimeout/vaultTimeoutSettings.service";
import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
import { PolicyType } from "../../admin-console/enums/policy-type";
import { PolicyType } from "../../admin-console/enums";
import { TokenService } from "../../auth/abstractions/token.service";
export class VaultTimeoutSettingsService implements VaultTimeoutSettingsServiceAbstraction {

2
libs/common/src/tools/generator/password/password-generation.service.ts
View File

@@ -3,7 +3,7 @@ import * as zxcvbn from "zxcvbn";
import { CryptoService } from "../../../abstractions/crypto.service";
import { StateService } from "../../../abstractions/state.service";
import { PolicyService } from "../../../admin-console/abstractions/policy/policy.service.abstraction";
import { PolicyType } from "../../../admin-console/enums/policy-type";
import { PolicyType } from "../../../admin-console/enums";
import { PasswordGeneratorPolicyOptions } from "../../../admin-console/models/domain/password-generator-policy-options";
import { EFFLongWordList } from "../../../misc/wordlist";
import { EncString } from "../../../models/domain/enc-string";