mirror of
https://github.com/bitwarden/browser
synced 2025-12-19 01:33:33 +00:00
* [AC-431] Add new organization invite process (#4841) * [AC-431] Added properties 'key' and 'keys' to OrganizationUserAcceptRequest * [AC-431] On organization accept added check for 'initOrganization' flag and send encrypt keys if true * [AC-431] Reverted changes on AcceptOrganizationComponent and OrganizationUserAcceptRequest * [AC-431] Created OrganizationUserAcceptInitRequest * [AC-431] Added method postOrganizationUserAcceptInit to OrganizationUserService * [AC-431] Created AcceptInitOrganizationComponent and added routing config. Added 'inviteInitAcceptedDesc' to messages * [AC-431] Remove blank line * [AC-431] Remove requirement for logging in again * [AC-431] Removed accept-init-organization.component.html * Update libs/common/src/abstractions/organization-user/organization-user.service.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * [AC-431] Sending collection name when initializing an org * [AC-431] Deleted component accept-init-organization and incorporated logic into accept-organization * Update libs/common/src/abstractions/organization-user/organization-user.service.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * [AC-431] Returning promise chains * [AC-431] Moved ReAuth check to org accept only * [AC-431] Fixed import issues --------- Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * [AC-434] Hide billing screen for reseller clients (#4955) * [AC-434] Retrieving ProviderType for each Org * [AC-434] Hide subscription details if user cannot manage billing * [AC-434] Renamed providerType to provider-type * [AC-434] Reverted change that showed Billing History and Payment Methods tabs * [AC-434] Hiding Secrets Manager enroll * [AC-434] Renamed Billing access variables to be more readable * Apply suggestions from code review Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * [AC-434] Reduce duplication in permission code * [AC-434] npm prettier * [AC-434] Changed selfhost subscription permission * [AC-434] Added canEditSubscription check for change plan buttons * [AC-434] Removed message displaying provider name in subscription * [AC-434] canEditSubscription logic depends on canViewSubscription * [AC-434] Hiding next charge value for users without billing edit permission * [AC-434] Changed canViewSubscription and canEditSubscription to be clearer * [AC-434] Altered BillingSubscriptionItemResponse.amount and BillingSubscriptionUpcomingInvoiceResponse.amount to nullable * [AC-434] Reverted change on BillingSubscriptionItemResponse.amount --------- Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Updated IsPaidOrgGuard reference from org.CanManageBilling to canEditSubscription --------- Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
86 lines
3.0 KiB
TypeScript
86 lines
3.0 KiB
TypeScript
import { BaseResponse } from "../../../models/response/base.response";
|
|
|
|
export class SubscriptionResponse extends BaseResponse {
|
|
storageName: string;
|
|
storageGb: number;
|
|
maxStorageGb: number;
|
|
subscription: BillingSubscriptionResponse;
|
|
upcomingInvoice: BillingSubscriptionUpcomingInvoiceResponse;
|
|
license: any;
|
|
expiration: string;
|
|
usingInAppPurchase: boolean;
|
|
|
|
constructor(response: any) {
|
|
super(response);
|
|
this.storageName = this.getResponseProperty("StorageName");
|
|
this.storageGb = this.getResponseProperty("StorageGb");
|
|
this.maxStorageGb = this.getResponseProperty("MaxStorageGb");
|
|
this.license = this.getResponseProperty("License");
|
|
this.expiration = this.getResponseProperty("Expiration");
|
|
this.usingInAppPurchase = this.getResponseProperty("UsingInAppPurchase");
|
|
const subscription = this.getResponseProperty("Subscription");
|
|
const upcomingInvoice = this.getResponseProperty("UpcomingInvoice");
|
|
this.subscription = subscription == null ? null : new BillingSubscriptionResponse(subscription);
|
|
this.upcomingInvoice =
|
|
upcomingInvoice == null
|
|
? null
|
|
: new BillingSubscriptionUpcomingInvoiceResponse(upcomingInvoice);
|
|
}
|
|
}
|
|
|
|
export class BillingSubscriptionResponse extends BaseResponse {
|
|
trialStartDate: string;
|
|
trialEndDate: string;
|
|
periodStartDate: string;
|
|
periodEndDate: string;
|
|
cancelledDate: string;
|
|
cancelAtEndDate: boolean;
|
|
status: string;
|
|
cancelled: boolean;
|
|
items: BillingSubscriptionItemResponse[] = [];
|
|
|
|
constructor(response: any) {
|
|
super(response);
|
|
this.trialEndDate = this.getResponseProperty("TrialStartDate");
|
|
this.trialEndDate = this.getResponseProperty("TrialEndDate");
|
|
this.periodStartDate = this.getResponseProperty("PeriodStartDate");
|
|
this.periodEndDate = this.getResponseProperty("PeriodEndDate");
|
|
this.cancelledDate = this.getResponseProperty("CancelledDate");
|
|
this.cancelAtEndDate = this.getResponseProperty("CancelAtEndDate");
|
|
this.status = this.getResponseProperty("Status");
|
|
this.cancelled = this.getResponseProperty("Cancelled");
|
|
const items = this.getResponseProperty("Items");
|
|
if (items != null) {
|
|
this.items = items.map((i: any) => new BillingSubscriptionItemResponse(i));
|
|
}
|
|
}
|
|
}
|
|
|
|
export class BillingSubscriptionItemResponse extends BaseResponse {
|
|
name: string;
|
|
amount: number;
|
|
quantity: number;
|
|
interval: string;
|
|
sponsoredSubscriptionItem: boolean;
|
|
|
|
constructor(response: any) {
|
|
super(response);
|
|
this.name = this.getResponseProperty("Name");
|
|
this.amount = this.getResponseProperty("Amount");
|
|
this.quantity = this.getResponseProperty("Quantity");
|
|
this.interval = this.getResponseProperty("Interval");
|
|
this.sponsoredSubscriptionItem = this.getResponseProperty("SponsoredSubscriptionItem");
|
|
}
|
|
}
|
|
|
|
export class BillingSubscriptionUpcomingInvoiceResponse extends BaseResponse {
|
|
date: string;
|
|
amount?: number;
|
|
|
|
constructor(response: any) {
|
|
super(response);
|
|
this.date = this.getResponseProperty("Date");
|
|
this.amount = this.getResponseProperty("Amount");
|
|
}
|
|
}
|