Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-12-26 17:37:36 +01:00
Code Issues Projects Releases Wiki Activity

org and user info

Browse Source
This commit is contained in:
Kyle Spearrin 2018-03-22 21:10:10 -04:00
parent 7075d8396d
commit e920c8e9d2
9 changed files with 159 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Admin/Controllers/OrganizationsController.cs
View File

@ -14,13 +14,16 @@ namespace Bit.Admin.Controllers
public class OrganizationsController : Controller
{
private readonly IOrganizationRepository _organizationRepository;
private readonly IOrganizationUserRepository _organizationUserRepository;
private readonly GlobalSettings _globalSettings;
public OrganizationsController(
IOrganizationRepository organizationRepository,
IOrganizationUserRepository organizationUserRepository,
GlobalSettings globalSettings)
{
_organizationRepository = organizationRepository;
_organizationUserRepository = organizationUserRepository;
_globalSettings = globalSettings;
}
@ -58,10 +61,12 @@ namespace Bit.Admin.Controllers
return RedirectToAction("Index");
}
return View(new OrganizationEditModel(organization, _globalSettings));
var users = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(id);
return View(new OrganizationEditModel(organization, users, _globalSettings));
}
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Edit(Guid id, OrganizationEditModel model)
{
var organization = await _organizationRepository.GetByIdAsync(id);

7
src/Admin/Controllers/UsersController.cs
View File

@ -14,13 +14,16 @@ namespace Bit.Admin.Controllers
public class UsersController : Controller
{
private readonly IUserRepository _userRepository;
private readonly ICipherRepository _cipherRepository;
private readonly GlobalSettings _globalSettings;
public UsersController(
IUserRepository userRepository,
ICipherRepository cipherRepository,
GlobalSettings globalSettings)
{
_userRepository = userRepository;
_cipherRepository = cipherRepository;
_globalSettings = globalSettings;
}
@ -55,10 +58,12 @@ namespace Bit.Admin.Controllers
return RedirectToAction("Index");
}
return View(new UserEditModel(user, _globalSettings));
var ciphers = await _cipherRepository.GetManyByUserIdAsync(id);
return View(new UserEditModel(user, ciphers, _globalSettings));
}
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Edit(Guid id, UserEditModel model)
{
var user = await _userRepository.GetByIdAsync(id);

17
src/Admin/Models/OrganizationEditModel.cs
View File

@ -1,6 +1,10 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using Bit.Core;
using Bit.Core.Enums;
using Bit.Core.Models.Data;
using Bit.Core.Models.Table;
using Bit.Core.Utilities;
@ -10,9 +14,13 @@ namespace Bit.Admin.Models
{
public OrganizationEditModel() { }
public OrganizationEditModel(Organization org, GlobalSettings globalSettings)
public OrganizationEditModel(Organization org, IEnumerable<OrganizationUserUserDetails> orgUsers,
GlobalSettings globalSettings)
{
Organization = org;
UserCount = orgUsers.Count();
Owners = string.Join(", ", orgUsers.Where(u => u.Type == OrganizationUserType.Owner).Select(u => u.Email));
Admins = string.Join(", ", orgUsers.Where(u => u.Type == OrganizationUserType.Admin).Select(u => u.Email));
BraintreeMerchantId = globalSettings.Braintree.MerchantId;
Name = org.Name;
@ -43,6 +51,9 @@ namespace Bit.Admin.Models
}
public Organization Organization { get; set; }
public string Owners { get; set; }
public string Admins { get; set; }
public int UserCount { 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; }
@ -66,7 +77,7 @@ namespace Bit.Admin.Models
public string BillingEmail { get; set; }
[Required]
[Display(Name = "Plan")]
public Core.Enums.PlanType? PlanType { get; set; }
public PlanType? PlanType { get; set; }
[Required]
[Display(Name = "Plan Name")]
public string Plan { get; set; }
@ -89,7 +100,7 @@ namespace Bit.Admin.Models
[Display(Name = "Max. Storage GB")]
public short? MaxStorageGb { get; set; }
[Display(Name = "Gateway")]
public Core.Enums.GatewayType? Gateway { get; set; }
public GatewayType? Gateway { get; set; }
[Display(Name = "Gateway Customer Id")]
public string GatewayCustomerId { get; set; }
[Display(Name = "Gateway Subscription Id")]

6
src/Admin/Models/UserEditModel.cs
View File

@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using Bit.Core;
using Bit.Core.Models.Table;
using Bit.Core.Utilities;
@ -10,9 +12,10 @@ namespace Bit.Admin.Models
{
public UserEditModel() { }
public UserEditModel(User user, GlobalSettings globalSettings)
public UserEditModel(User user, IEnumerable<Cipher> ciphers, GlobalSettings globalSettings)
{
User = user;
CipherCount = ciphers.Count();
BraintreeMerchantId = globalSettings.Braintree.MerchantId;
Name = user.Name;
@ -28,6 +31,7 @@ namespace Bit.Admin.Models
}
public User User { get; set; }
public int CipherCount { get; set; }
public string RandomLicenseKey => CoreHelpers.SecureRandomString(20);
public string OneYearExpirationDate => DateTime.Now.AddYears(1).ToString("yyyy-MM-ddTHH:mm");
public string BraintreeMerchantId { get; set; }

24
src/Admin/Views/Organizations/Edit.cshtml
View File

@ -1,6 +1,6 @@
@model OrganizationEditModel
@{
ViewData["Title"] = "Organization Edit: " + Model.Organization.Name;
ViewData["Title"] = "Organization: " + Model.Organization.Name;
}
@section Scripts {
@ -71,8 +71,28 @@
</script>
}
<h1>Edit Organization <small>@Model.Organization.Name</small></h1>
<h1>Organization <small>@Model.Organization.Name</small></h1>
<h2>Information</h2>
<dl class="row">
<dt class="col-sm-2">Id</dt>
<dd class="col-sm-10"><code>@Model.Organization.Id</code></dd>
<dt class="col-sm-2">Users</dt>
<dd class="col-sm-10">@Model.UserCount</dd>
<dt class="col-sm-2">Owners</dt>
<dd class="col-sm-10">@(string.IsNullOrWhiteSpace(Model.Owners) ? "None" : Model.Owners)</dd>
<dt class="col-sm-2">Admins</dt>
<dd class="col-sm-10">@(string.IsNullOrWhiteSpace(Model.Admins) ? "None" : Model.Admins)</dd>
<dt class="col-sm-2">Created</dt>
<dd class="col-sm-10">@Model.Organization.CreationDate.ToString()</dd>
<dt class="col-sm-2">Modified</dt>
<dd class="col-sm-10">@Model.Organization.RevisionDate.ToString()</dd>
</dl>
<form method="post">
<h2>General</h2>
<div class="row">

21
src/Admin/Views/Users/Edit.cshtml
View File

@ -1,6 +1,6 @@
@model UserEditModel
@{
ViewData["Title"] = "User Edit: " + Model.User.Email;
ViewData["Title"] = "User: " + Model.User.Email;
}
@section Scripts {
@ -54,8 +54,25 @@
</script>
}
<h1>Edit User <small>@Model.User.Email</small></h1>
<h1>User <small>@Model.User.Email</small></h1>
<h2>Information</h2>
<dl class="row">
<dt class="col-sm-2">Id</dt>
<dd class="col-sm-10"><code>@Model.User.Id</code></dd>
<dt class="col-sm-2">Items</dt>
<dd class="col-sm-10">@Model.CipherCount</dd>
<dt class="col-sm-2">Created</dt>
<dd class="col-sm-10">@Model.User.CreationDate.ToString()</dd>
<dt class="col-sm-2">Modified</dt>
<dd class="col-sm-10">@Model.User.RevisionDate.ToString()</dd>
<dt class="col-sm-2">Account Modified</dt>
<dd class="col-sm-10">@Model.User.AccountRevisionDate.ToString()</dd>
</dl>
<form method="post">
<h2>General</h2>
<div class="row">

6
src/Core/Repositories/SqlServer/OrganizationRepository.cs
View File

@ -55,11 +55,7 @@ namespace Bit.Core.Repositories.SqlServer
new { Name = name, UserEmail = userEmail, Paid = paid, Skip = skip, Take = take },
commandType: CommandType.StoredProcedure);
// Select distinct results by Id
return results
.GroupBy(c => c.Id)
.Select(g => g.First())
.ToList();
return results.ToList();
}
}

63
src/Sql/dbo/Stored Procedures/Organization_Search.sql
View File

@ -9,26 +9,49 @@ BEGIN
SET NOCOUNT ON
DECLARE @NameLikeSearch NVARCHAR(55) = '%' + @Name + '%'
SELECT
O.*
FROM
[dbo].[OrganizationView] O
INNER JOIN
[dbo].[OrganizationUser] OU ON O.[Id] = OU.[OrganizationId]
INNER JOIN
[dbo].[User] U ON U.[Id] = OU.[UserId]
WHERE
(@Name IS NULL OR O.[Name] LIKE @NameLikeSearch)
AND (@UserEmail IS NULL OR U.[Email] = @UserEmail)
AND
(
@Paid IS NULL OR
IF @UserEmail IS NOT NULL
BEGIN
SELECT
O.*
FROM
[dbo].[OrganizationView] O
INNER JOIN
[dbo].[OrganizationUser] OU ON O.[Id] = OU.[OrganizationId]
INNER JOIN
[dbo].[User] U ON U.[Id] = OU.[UserId]
WHERE
(@Name IS NULL OR O.[Name] LIKE @NameLikeSearch)
AND (@UserEmail IS NULL OR U.[Email] = @UserEmail)
AND
(
(@Paid = 1 AND O.[GatewaySubscriptionId] IS NOT NULL) OR
(@Paid = 0 AND O.[GatewaySubscriptionId] IS NULL)
@Paid IS NULL OR
(
(@Paid = 1 AND O.[GatewaySubscriptionId] IS NOT NULL) OR
(@Paid = 0 AND O.[GatewaySubscriptionId] IS NULL)
)
)
)
ORDER BY O.[CreationDate] DESC
OFFSET @Skip ROWS
FETCH NEXT @Take ROWS ONLY
ORDER BY O.[CreationDate] DESC
OFFSET @Skip ROWS
FETCH NEXT @Take ROWS ONLY
END
ELSE
BEGIN
SELECT
O.*
FROM
[dbo].[OrganizationView] O
WHERE
(@Name IS NULL OR O.[Name] LIKE @NameLikeSearch)
AND
(
@Paid IS NULL OR
(
(@Paid = 1 AND O.[GatewaySubscriptionId] IS NOT NULL) OR
(@Paid = 0 AND O.[GatewaySubscriptionId] IS NULL)
)
)
ORDER BY O.[CreationDate] DESC
OFFSET @Skip ROWS
FETCH NEXT @Take ROWS ONLY
END
END

63
util/Setup/DbScripts/2018-03-21_00_AdminPortal.sql
View File

@ -42,27 +42,50 @@ BEGIN
SET NOCOUNT ON
DECLARE @NameLikeSearch NVARCHAR(55) = '%' + @Name + '%'
SELECT
O.*
FROM
[dbo].[OrganizationView] O
INNER JOIN
[dbo].[OrganizationUser] OU ON O.[Id] = OU.[OrganizationId]
INNER JOIN
[dbo].[User] U ON U.[Id] = OU.[UserId]
WHERE
(@Name IS NULL OR O.[Name] LIKE @NameLikeSearch)
AND (@UserEmail IS NULL OR U.[Email] = @UserEmail)
AND
(
@Paid IS NULL OR
IF @UserEmail IS NOT NULL
BEGIN
SELECT
O.*
FROM
[dbo].[OrganizationView] O
INNER JOIN
[dbo].[OrganizationUser] OU ON O.[Id] = OU.[OrganizationId]
INNER JOIN
[dbo].[User] U ON U.[Id] = OU.[UserId]
WHERE
(@Name IS NULL OR O.[Name] LIKE @NameLikeSearch)
AND (@UserEmail IS NULL OR U.[Email] = @UserEmail)
AND
(
(@Paid = 1 AND O.[GatewaySubscriptionId] IS NOT NULL) OR
(@Paid = 0 AND O.[GatewaySubscriptionId] IS NULL)
@Paid IS NULL OR
(
(@Paid = 1 AND O.[GatewaySubscriptionId] IS NOT NULL) OR
(@Paid = 0 AND O.[GatewaySubscriptionId] IS NULL)
)
)
)
ORDER BY O.[CreationDate] DESC
OFFSET @Skip ROWS
FETCH NEXT @Take ROWS ONLY
ORDER BY O.[CreationDate] DESC
OFFSET @Skip ROWS
FETCH NEXT @Take ROWS ONLY
END
ELSE
BEGIN
SELECT
O.*
FROM
[dbo].[OrganizationView] O
WHERE
(@Name IS NULL OR O.[Name] LIKE @NameLikeSearch)
AND
(
@Paid IS NULL OR
(
(@Paid = 1 AND O.[GatewaySubscriptionId] IS NOT NULL) OR
(@Paid = 0 AND O.[GatewaySubscriptionId] IS NULL)
)
)
ORDER BY O.[CreationDate] DESC
OFFSET @Skip ROWS
FETCH NEXT @Take ROWS ONLY
END
END
GO