mirror of
https://github.com/bitwarden/server.git
synced 2025-06-11 21:50:33 -05:00

* Get limited life attachment download URL This change limits url download to a 1min lifetime. This requires moving to a new container to allow for non-public blob access. Clients will have to call GetAttachmentData api function to receive the download URL. For backwards compatibility, attachment URLs are still present, but will not work for attachments stored in non-public access blobs. * Make GlobalSettings interface for testing * Test LocalAttachmentStorageService equivalence * Remove comment * Add missing globalSettings using * Simplify default attachment container * Default to attachments containe for existing methods A new upload method will be made for uploading to attachments-v2. For compatibility for clients which don't use these new methods, we need to still use the old container. The new container will be used only for new uploads * Remove Default MetaData fixture. * Keep attachments container blob-level security for all instances * Close unclosed FileStream * Favor default value for noop services
138 lines
5.7 KiB
C#
138 lines
5.7 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.ComponentModel.DataAnnotations;
|
|
using Bit.Core.Enums;
|
|
using Bit.Core.Models.Business;
|
|
using Bit.Core.Models.Data;
|
|
using Bit.Core.Models.Table;
|
|
using Bit.Core.Utilities;
|
|
using Bit.Core.Settings;
|
|
|
|
namespace Bit.Admin.Models
|
|
{
|
|
public class OrganizationEditModel : OrganizationViewModel
|
|
{
|
|
public OrganizationEditModel() { }
|
|
|
|
public OrganizationEditModel(Organization org, IEnumerable<OrganizationUserUserDetails> orgUsers,
|
|
IEnumerable<Cipher> ciphers, IEnumerable<Collection> collections, IEnumerable<Group> groups,
|
|
IEnumerable<Policy> policies, BillingInfo billingInfo, GlobalSettings globalSettings)
|
|
: base(org, orgUsers, ciphers, collections, groups, policies)
|
|
{
|
|
BillingInfo = billingInfo;
|
|
BraintreeMerchantId = globalSettings.Braintree.MerchantId;
|
|
|
|
Name = org.Name;
|
|
BusinessName = org.BusinessName;
|
|
BillingEmail = org.BillingEmail;
|
|
PlanType = org.PlanType;
|
|
Plan = org.Plan;
|
|
Seats = org.Seats;
|
|
MaxCollections = org.MaxCollections;
|
|
UsePolicies = org.UsePolicies;
|
|
UseSso = org.UseSso;
|
|
UseGroups = org.UseGroups;
|
|
UseDirectory = org.UseDirectory;
|
|
UseEvents = org.UseEvents;
|
|
UseTotp = org.UseTotp;
|
|
Use2fa = org.Use2fa;
|
|
UseApi = org.UseApi;
|
|
SelfHost = org.SelfHost;
|
|
UsersGetPremium = org.UsersGetPremium;
|
|
MaxStorageGb = org.MaxStorageGb;
|
|
Gateway = org.Gateway;
|
|
GatewayCustomerId = org.GatewayCustomerId;
|
|
GatewaySubscriptionId = org.GatewaySubscriptionId;
|
|
Enabled = org.Enabled;
|
|
LicenseKey = org.LicenseKey;
|
|
ExpirationDate = org.ExpirationDate;
|
|
}
|
|
|
|
public BillingInfo BillingInfo { get; set; }
|
|
public string RandomLicenseKey => CoreHelpers.SecureRandomString(20);
|
|
public string FourteenDayExpirationDate => DateTime.Now.AddDays(14).ToString("yyyy-MM-ddTHH:mm");
|
|
public string BraintreeMerchantId { get; set; }
|
|
|
|
[Required]
|
|
[Display(Name = "Name")]
|
|
public string Name { get; set; }
|
|
[Display(Name = "Business Name")]
|
|
public string BusinessName { get; set; }
|
|
[Display(Name = "Billing Email")]
|
|
public string BillingEmail { get; set; }
|
|
[Required]
|
|
[Display(Name = "Plan")]
|
|
public PlanType? PlanType { get; set; }
|
|
[Required]
|
|
[Display(Name = "Plan Name")]
|
|
public string Plan { get; set; }
|
|
[Display(Name = "Seats")]
|
|
public short? Seats { get; set; }
|
|
[Display(Name = "Max. Collections")]
|
|
public short? MaxCollections { get; set; }
|
|
[Display(Name = "Policies")]
|
|
public bool UsePolicies { get; set; }
|
|
[Display(Name = "SSO")]
|
|
public bool UseSso { get; set; }
|
|
[Display(Name = "Groups")]
|
|
public bool UseGroups { get; set; }
|
|
[Display(Name = "Directory")]
|
|
public bool UseDirectory { get; set; }
|
|
[Display(Name = "Events")]
|
|
public bool UseEvents { get; set; }
|
|
[Display(Name = "TOTP")]
|
|
public bool UseTotp { get; set; }
|
|
[Display(Name = "2FA")]
|
|
public bool Use2fa { get; set; }
|
|
[Display(Name = "API")]
|
|
public bool UseApi{ get; set; }
|
|
[Display(Name = "Self Host")]
|
|
public bool SelfHost { get; set; }
|
|
[Display(Name = "Users Get Premium")]
|
|
public bool UsersGetPremium { get; set; }
|
|
[Display(Name = "Max. Storage GB")]
|
|
public short? MaxStorageGb { get; set; }
|
|
[Display(Name = "Gateway")]
|
|
public GatewayType? Gateway { get; set; }
|
|
[Display(Name = "Gateway Customer Id")]
|
|
public string GatewayCustomerId { get; set; }
|
|
[Display(Name = "Gateway Subscription Id")]
|
|
public string GatewaySubscriptionId { get; set; }
|
|
[Display(Name = "Enabled")]
|
|
public bool Enabled { get; set; }
|
|
[Display(Name = "License Key")]
|
|
public string LicenseKey { get; set; }
|
|
[Display(Name = "Expiration Date")]
|
|
public DateTime? ExpirationDate { get; set; }
|
|
|
|
public Organization ToOrganization(Organization existingOrganization)
|
|
{
|
|
existingOrganization.Name = Name;
|
|
existingOrganization.BusinessName = BusinessName;
|
|
existingOrganization.BillingEmail = BillingEmail?.ToLowerInvariant()?.Trim();
|
|
existingOrganization.PlanType = PlanType.Value;
|
|
existingOrganization.Plan = Plan;
|
|
existingOrganization.Seats = Seats;
|
|
existingOrganization.MaxCollections = MaxCollections;
|
|
existingOrganization.UsePolicies = UsePolicies;
|
|
existingOrganization.UseSso = UseSso;
|
|
existingOrganization.UseGroups = UseGroups;
|
|
existingOrganization.UseDirectory = UseDirectory;
|
|
existingOrganization.UseEvents = UseEvents;
|
|
existingOrganization.UseTotp = UseTotp;
|
|
existingOrganization.Use2fa = Use2fa;
|
|
existingOrganization.UseApi = UseApi;
|
|
existingOrganization.SelfHost = SelfHost;
|
|
existingOrganization.UsersGetPremium = UsersGetPremium;
|
|
existingOrganization.MaxStorageGb = MaxStorageGb;
|
|
existingOrganization.Gateway = Gateway;
|
|
existingOrganization.GatewayCustomerId = GatewayCustomerId;
|
|
existingOrganization.GatewaySubscriptionId = GatewaySubscriptionId;
|
|
existingOrganization.Enabled = Enabled;
|
|
existingOrganization.LicenseKey = LicenseKey;
|
|
existingOrganization.ExpirationDate = ExpirationDate;
|
|
return existingOrganization;
|
|
}
|
|
}
|
|
}
|