nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-07 10:55:43 -05:00
Code Activity

return org props for groups. error on del password

Browse Source
This commit is contained in:
Kyle Spearrin
2017-06-08 09:46:00 -04:00
parent f352ec808f
commit 151eae2f05
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controllers/OrganizationsController.cs
View File

@ -230,8 +230,8 @@ namespace Bit.Api.Controllers
if(!await _userManager.CheckPasswordAsync(user, model.MasterPasswordHash)) if(!await _userManager.CheckPasswordAsync(user, model.MasterPasswordHash))
{ {
ModelState.AddModelError("MasterPasswordHash", "Invalid password.");
await Task.Delay(2000); await Task.Delay(2000);
throw new BadRequestException("MasterPasswordHash", "Invalid password.");
} }
else else
{ {

6
src/Core/Models/Api/Response/OrganizationResponseModel.cs
View File

@ -24,6 +24,9 @@ namespace Bit.Core.Models.Api
Plan = organization.Plan; Plan = organization.Plan;
PlanType = organization.PlanType; PlanType = organization.PlanType;
Seats = organization.Seats; Seats = organization.Seats;
MaxCollections = organization.MaxCollections;
UseGroups = organization.UseGroups;
UseDirectory = organization.UseDirectory;
} }
public string Id { get; set; } public string Id { get; set; }
@ -33,6 +36,9 @@ namespace Bit.Core.Models.Api
public string Plan { get; set; } public string Plan { get; set; }
public Enums.PlanType PlanType { get; set; } public Enums.PlanType PlanType { get; set; }
public short? Seats { get; set; } public short? Seats { get; set; }
public short? MaxCollections { get; set; }
public bool UseGroups { get; set; }
public bool UseDirectory { get; set; }
} }
public class OrganizationBillingResponseModel : OrganizationResponseModel public class OrganizationBillingResponseModel : OrganizationResponseModel